ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update vscode-nls in notebook and samples, plus fix samples compilation (#4203)

Browse Source 
- Upate vscode-nls to 4.0.0 in notebook extension. Should be fix for Insiders build failure due to localization package failing
- Updated samples to remove as vscode-nls if not needed, or update if still needed
- Updated samples using `npm audit fix`
- Fixed compile errors in all the samples
This commit is contained in:
Kevin Cunnane
2019-02-26 12:45:45 -08:00
committed by GitHub
parent e289c06d8d
commit 109aafcbc0
14 changed files with 743 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/notebook/package.json
View File

@@ -297,7 +297,7 @@
"request": "^2.88.0", "request": "^2.88.0",
"temp-write": "^3.4.0", "temp-write": "^3.4.0",
"vscode-languageclient": "^5.3.0-next.1", "vscode-languageclient": "^5.3.0-next.1",
"vscode-nls": "2.0.2" "vscode-nls": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/mocha": "^5.2.5", "@types/mocha": "^5.2.5",

8
extensions/notebook/yarn.lock
View File

@@ -2450,10 +2450,10 @@ vscode-languageserver-types@3.14.0:
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
vscode-nls@2.0.2: vscode-nls@^4.0.0:
version "2.0.2" version "4.0.0"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
integrity sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto= integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
vscode@1.1.5: vscode@1.1.5:
version "1.1.5" version "1.1.5"

11
samples/extensionSamples/package-lock.json generated
View File

@@ -27,12 +27,6 @@
"through2": "^2.0.3" "through2": "^2.0.3"
} }
}, },
"@types/handlebars": {
"version": "4.0.40",
"resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.40.tgz",
"integrity": "sha512-sGWNtsjNrLOdKha2RV1UeF8+UbQnPSG7qbe5wwbni0mw4h2gHXyPFUMOC+xwGirIiiydM/HSqjDO4rk6NFB18w==",
"dev": true
},
"@types/mocha": { "@types/mocha": {
"version": "2.2.48", "version": "2.2.48",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz",
@@ -6437,11 +6431,6 @@
} }
} }
}, },
"vscode-nls": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
"integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
},
"vso-node-api": { "vso-node-api": {
"version": "6.5.0", "version": "6.5.0",
"resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.5.0.tgz", "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.5.0.tgz",

12
samples/extensionSamples/package.json
View File

@@ -5,7 +5,7 @@
"version": "0.1.0", "version": "0.1.0",
"publisher": "Microsoft", "publisher": "Microsoft",
"engines": { "engines": {
"vscode": "^1.19.0", "vscode": "^1.26.0",
"sqlops": "*" "sqlops": "*"
}, },
"license": "SEE LICENSE IN LICENSE.txt", "license": "SEE LICENSE IN LICENSE.txt",
@@ -171,11 +171,9 @@
}, },
"dependencies": { "dependencies": {
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"handlebars": "^4.0.11", "handlebars": "^4.0.11"
"vscode-nls": "2.0.2"
}, },
"devDependencies": { "devDependencies": {
"@types/handlebars": "^4.0.11",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
"@types/node": "^7.0.43", "@types/node": "^7.0.43",
"child-process-promise": "^2.2.1", "child-process-promise": "^2.2.1",
@@ -186,12 +184,12 @@
"gulp-tslint": "^6.0.2", "gulp-tslint": "^6.0.2",
"gulp-typescript": "^3.2.4", "gulp-typescript": "^3.2.4",
"should": "^13.2.1", "should": "^13.2.1",
"sqlops": "github:anthonydresser/sqlops-extension-sqlops",
"temp-write": "^3.4.0", "temp-write": "^3.4.0",
"tslint": "^3.14.0", "tslint": "^3.14.0",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"typescript": "^2.6.1", "typescript": "^2.6.1",
"vscode": "^1.1.6", "vsce": "1.36.2",
"sqlops": "github:anthonydresser/sqlops-extension-sqlops", "vscode": "^1.1.6"
"vsce": "1.36.2"
} }
} }

6
samples/extensionSamples/src/typings/ref.d.ts vendored Normal file
View File

@@ -0,0 +1,6 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../../src/sql/sqlops.proposed.d.ts'/>

2
samples/serverReports/package.json
View File

@@ -6,7 +6,7 @@
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"engines": { "engines": {
"vscode": "^1.17.0", "vscode": "^1.26.0",
"sqlops": "*" "sqlops": "*"
}, },
"icon": "images/sqlserver.png", "icon": "images/sqlserver.png",

11
samples/sp_whoIsActive/package-lock.json generated
View File

@@ -27,12 +27,6 @@
"through2": "^2.0.3" "through2": "^2.0.3"
} }
}, },
"@types/handlebars": {
"version": "4.0.40",
"resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.40.tgz",
"integrity": "sha512-sGWNtsjNrLOdKha2RV1UeF8+UbQnPSG7qbe5wwbni0mw4h2gHXyPFUMOC+xwGirIiiydM/HSqjDO4rk6NFB18w==",
"dev": true
},
"@types/mocha": { "@types/mocha": {
"version": "2.2.48", "version": "2.2.48",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz",
@@ -7412,11 +7406,6 @@
} }
} }
}, },
"vscode-nls": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
"integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
},
"vso-node-api": { "vso-node-api": {
"version": "6.5.0", "version": "6.5.0",
"resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.5.0.tgz", "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.5.0.tgz",

8
samples/sp_whoIsActive/package.json
View File

@@ -6,7 +6,7 @@
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"engines": { "engines": {
"vscode": "^1.17.0", "vscode": "^1.26.0",
"sqlops": "*" "sqlops": "*"
}, },
"icon": "images/sqlserver.png", "icon": "images/sqlserver.png",
@@ -247,11 +247,9 @@
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"handlebars": "^4.0.11", "handlebars": "^4.0.11",
"openurl": "^1.1.1", "openurl": "^1.1.1",
"vscode-nls": "2.0.2",
"sqlops": "github:anthonydresser/sqlops-extension-sqlops" "sqlops": "github:anthonydresser/sqlops-extension-sqlops"
}, },
"devDependencies": { "devDependencies": {
"@types/handlebars": "^4.0.11",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
"@types/node": "^7.0.43", "@types/node": "^7.0.43",
"child-process-promise": "^2.2.1", "child-process-promise": "^2.2.1",
@@ -266,7 +264,7 @@
"tslint": "^3.14.0", "tslint": "^3.14.0",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"typescript": "^2.6.1", "typescript": "^2.6.1",
"vscode": "^1.1.6", "vsce": "1.36.2",
"vsce": "1.36.2" "vscode": "^1.1.6"
} }
} }

2
samples/sp_whoIsActive/src/controllers/mainController.ts
View File

@@ -50,4 +50,4 @@ export default class MainController extends ControllerBase {
}); });
}); });
} }
} }

1685
samples/sqlservices/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

13
samples/sqlservices/package.json
View File

@@ -88,25 +88,26 @@
"postinstall": "node ./node_modules/vscode/bin/install && node ./node_modules/sqlops/bin/install && gulp copytypings" "postinstall": "node ./node_modules/vscode/bin/install && node ./node_modules/sqlops/bin/install && gulp copytypings"
}, },
"dependencies": { "dependencies": {
"vscode-nls": "^3.2.2",
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"handlebars": "^4.0.11" "handlebars": "^4.0.11",
"vscode-nls": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^7.0.43", "@types/node": "^7.0.43",
"braces": "^2.3.2",
"child-process-promise": "^2.2.1", "child-process-promise": "^2.2.1",
"del": "^3.0.0", "del": "^3.0.0",
"gulp": "^4.0.0", "gulp": "^4.0.0",
"gulp-color": "0.0.1", "gulp-color": "0.0.1",
"gulp-sourcemaps": "^2.6.4", "gulp-sourcemaps": "^2.6.5",
"gulp-tslint": "^6.0.2", "gulp-tslint": "^6.0.2",
"gulp-typescript": "^3.2.4", "gulp-typescript": "^3.2.4",
"sqlops": "github:anthonydresser/sqlops-extension-sqlops", "sqlops": "github:anthonydresser/sqlops-extension-sqlops",
"tslint": "^3.14.0", "tslint": "^3.14.0",
"typescript": "^2.6.1", "typescript": "^2.6.1",
"vscode": "^1.1.18", "url-parse": "^1.4.4",
"@types/handlebars": "^4.0.11", "vsce": "^1.57.1",
"vsce": "1.36.2" "vscode": "^1.1.30"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

7
samples/sqlservices/src/controllers/mainController.ts
View File

@@ -148,7 +148,8 @@ export default class MainController implements vscode.Disposable {
await view.initializeModel(formWrapper); await view.initializeModel(formWrapper);
} }
private async getTabContent(view: sqlops.ModelView, customButton1: sqlops.window.Button, customButton2: sqlops.window.Button, componentWidth: number | string): Promise<void> { private async getTabContent(view: sqlops.ModelView, customButton1: sqlops.window.Button, customButton2: sqlops.window.Button, componentWidth: number | string
): Promise<void> {
let inputBox = view.modelBuilder.inputBox() let inputBox = view.modelBuilder.inputBox()
.withProperties({ .withProperties({
multiline: true, multiline: true,
@@ -181,8 +182,6 @@ export default class MainController implements vscode.Disposable {
label: '-' label: '-'
}).component(); }).component();
let button2 = view.modelBuilder.button()
.component();
button.onDidClick(e => { button.onDidClick(e => {
backupFilesInputBox.value = 'Button clicked'; backupFilesInputBox.value = 'Button clicked';
}); });
@@ -209,7 +208,7 @@ export default class MainController implements vscode.Disposable {
name: 'radioButtonOptions', name: 'radioButtonOptions',
label: 'Option 1', label: 'Option 1',
checked: true checked: true
//width: 300 // width: 300
}).component(); }).component();
let radioButton2 = view.modelBuilder.radioButton() let radioButton2 = view.modelBuilder.radioButton()
.withProperties({ .withProperties({

2
samples/sqlservices/src/controllers/treeDataProvider.ts
View File

@@ -255,7 +255,7 @@ export class TreeNode implements sqlops.TreeComponentItem {
export class TreeDataProvider implements sqlops.TreeComponentDataProvider<TreeNode> { export class TreeDataProvider implements sqlops.TreeComponentDataProvider<TreeNode> {
private _onDidChangeTreeData = new vscode.EventEmitter<TreeNode>(); private _onDidChangeTreeData = new vscode.EventEmitter<TreeNode>();
constructor(private _root: TreeNode) { constructor(private _root: TreeNode) {
if(this._root) { if (this._root) {
this._root.onTreeChange(node => { this._root.onTreeChange(node => {
this._onDidChangeTreeData.fire(node); this._onDidChangeTreeData.fire(node);
}); });

3
samples/sqlservices/tslint.json
View File

@@ -18,7 +18,6 @@
true, true,
"tabs" "tabs"
], ],
"interface-name": true,
"jsdoc-format": true, "jsdoc-format": true,
"label-position": true, "label-position": true,
"label-undefined": true, "label-undefined": true,
@@ -36,7 +35,6 @@
"no-console": [ "no-console": [
true, true,
"debug", "debug",
"info",
"time", "time",
"timeEnd", "timeEnd",
"trace" "trace"
@@ -50,7 +48,6 @@
"no-eval": true, "no-eval": true,
"no-inferrable-types": false, "no-inferrable-types": false,
"no-internal-module": true, "no-internal-module": true,
"no-null-keyword": true,
"no-require-imports": false, "no-require-imports": false,
"no-shadowed-variable": true, "no-shadowed-variable": true,
"no-string-literal": false, "no-string-literal": false,