From 650681cb1d33bd91b70696e4f919b7441019a0a5 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 14:44:14 +0000 Subject: [PATCH 1/6] moved local functions moved local functions to top for readability and fixed missing semicolon local function at the end tslint exception for chai --- .gitignore | 2 + test/unitTests/assets.test.ts | 82 ++++++++++++++-------------- test/unitTests/common.test.ts | 4 ++ test/unitTests/processPicker.test.ts | 2 +- 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index ac05adb0c..4aabef6c6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ obj/ bin/ test/**/.vscode .logs/ + +\.DS_Store diff --git a/test/unitTests/assets.test.ts b/test/unitTests/assets.test.ts index cb8bddec0..3218c9747 100644 --- a/test/unitTests/assets.test.ts +++ b/test/unitTests/assets.test.ts @@ -11,14 +11,6 @@ import { AssetGenerator } from '../../src/assets'; import { parse } from 'jsonc-parser'; import { should } from 'chai'; -function createMockWorkspaceFolder(rootPath: string) : vscode.WorkspaceFolder { - return { - uri: vscode.Uri.file(rootPath), - name: undefined, - index: undefined - } -} - suite("Asset generation: project.json", () => { suiteSetup(() => should()); @@ -95,38 +87,6 @@ suite("Asset generation: project.json", () => { }); }); -function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true): protocol.WorkspaceInformationResponse { - return { - DotNet: { - Projects: [ - { - Path: projectPath, - Name: '', - ProjectSearchPaths: [], - Configurations: [ - { - Name: 'Debug', - CompilationOutputPath: '', - CompilationOutputAssemblyFile: compilationOutputAssemblyFile, - CompilationOutputPdbFile: '', - EmitEntryPoint: emitEntryPoint - } - ], - Frameworks: [ - { - Name: '', - FriendlyName: '', - ShortName: targetFrameworkShortName - } - ], - SourceFiles: [] - } - ], - RuntimePath: '' - } - }; -} - suite("Asset generation: csproj", () => { suiteSetup(() => should()); @@ -203,6 +163,46 @@ suite("Asset generation: csproj", () => { }); }); +function createMockWorkspaceFolder(rootPath: string): vscode.WorkspaceFolder { + return { + uri: vscode.Uri.file(rootPath), + name: undefined, + index: undefined + }; +} + +function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true): protocol.WorkspaceInformationResponse { + return { + DotNet: { + Projects: [ + { + Path: projectPath, + Name: '', + ProjectSearchPaths: [], + Configurations: [ + { + Name: 'Debug', + CompilationOutputPath: '', + CompilationOutputAssemblyFile: compilationOutputAssemblyFile, + CompilationOutputPdbFile: '', + EmitEntryPoint: emitEntryPoint + } + ], + Frameworks: [ + { + Name: '', + FriendlyName: '', + ShortName: targetFrameworkShortName + } + ], + SourceFiles: [] + } + ], + RuntimePath: '' + } + }; +} + function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: string, targetFrameworkShortName: string, isExe: boolean = true): protocol.WorkspaceInformationResponse { return { MsBuild: { @@ -229,4 +229,4 @@ function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: st ], } }; -} +} \ No newline at end of file diff --git a/test/unitTests/common.test.ts b/test/unitTests/common.test.ts index fbfe309e8..2641c28f1 100644 --- a/test/unitTests/common.test.ts +++ b/test/unitTests/common.test.ts @@ -72,24 +72,28 @@ suite("Common", () => { test("same paths", () => { let subfolder: string = ["C:", "temp", "VS", "dotnetProject"].join(path.sep); let folder: string= ["C:", "temp", "VS", "dotnetProject"].join(path.sep); + // tslint:disable-next-line:no-unused-expression isSubfolderOf(subfolder, folder).should.be.true; }); test("correct subfolder", () => { let subfolder: string = ["C:", "temp", "VS"].join(path.sep); let folder: string= ["C:", "temp", "VS", "dotnetProject"].join(path.sep); + // tslint:disable-next-line:no-unused-expression isSubfolderOf(subfolder, folder).should.be.true; }); test("longer subfolder", () => { let subfolder: string = ["C:", "temp", "VS", "a", "b", "c"].join(path.sep); let folder: string= ["C:", "temp", "VS"].join(path.sep); + // tslint:disable-next-line:no-unused-expression isSubfolderOf(subfolder, folder).should.be.false; }); test("Different drive", () => { let subfolder: string = ["C:", "temp", "VS"].join(path.sep); let folder: string= ["E:", "temp", "VS"].join(path.sep); + // tslint:disable-next-line:no-unused-expression isSubfolderOf(subfolder, folder).should.be.false; }); }); diff --git a/test/unitTests/processPicker.test.ts b/test/unitTests/processPicker.test.ts index 736536b16..f8189d0fa 100644 --- a/test/unitTests/processPicker.test.ts +++ b/test/unitTests/processPicker.test.ts @@ -198,7 +198,7 @@ function GetWindowsDockerLaunchJSONWithArrayArgs() { pipeArgs: ["-i", "exec", "1234567"], quoteArgs: false }; -}; +} function GetWindowsDockerLaunchJSONWithStringArgsAndDebuggerCommand() { return { From 6ffaf894f884c7abac6d37c7ab89f422e60c27e4 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 18:47:40 +0000 Subject: [PATCH 2/6] use genral tslint chai rules --- gulpfile.js | 2 +- package-lock.json | 41 +++++++++++++++++++++-------------- package.json | 7 +++--- test/unitTests/common.test.ts | 8 +++---- tslint.json | 9 ++++---- 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index e261748bb..070cece8e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -170,7 +170,7 @@ gulp.task('tslint', () => { gulp.src(allTypeScript) .pipe(tslint({ program: require('tslint').Linter.createProgram("./tsconfig.json"), - rulesDirectory: "node_modules/tslint-microsoft-contrib" + rulesDirectory: ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai"] })) .pipe(tslint.report(lintReporter, { summarizeFailureOutput: false, diff --git a/package-lock.json b/package-lock.json index 891644d76..2cbee84e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@types/chai": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.5.tgz", - "integrity": "sha512-ZC4tZU+3rDblhVy9cUQp5u+Zw9M0geGY8tzUQgc+4CMIWQLUFpgvrHhaYrSq1TK2m0DjaYIp9yJPyTHN+qhBZg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.8.tgz", + "integrity": "sha512-m812CONwdZn/dMzkIJEY0yAs4apyTkTORgfB2UsMOxgkUbC205AHnm4T8I0I5gPg9MHrFc1dJ35iS75c0CJkjg==", "dev": true }, "@types/chai-arrays": { @@ -16,7 +16,7 @@ "integrity": "sha512-/kgYvj5Pwiv/bOlJ6c5GlRF/W6lUGSLrpQGl/7Gg6w7tvBYcf0iF91+wwyuwDYGO2zM0wNpcoPixZVif8I/r6g==", "dev": true, "requires": { - "@types/chai": "4.0.5" + "@types/chai": "4.0.8" } }, "@types/fs-extra": { @@ -25,16 +25,16 @@ "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==", "dev": true, "requires": { - "@types/node": "8.0.53" + "@types/node": "8.0.57" } }, "@types/mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha512-XA4vNO6GCBz8Smq0hqSRo4yRWMqr4FPQrWjhJt6nKskzly4/p87SfuJMFYGRyYb6jo2WNIQU2FDBsY5r1BibUA==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz", + "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==", "dev": true, "requires": { - "@types/node": "8.0.53" + "@types/node": "8.0.57" } }, "@types/mocha": { @@ -44,9 +44,9 @@ "dev": true }, "@types/node": { - "version": "8.0.53", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz", - "integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ==", + "version": "8.0.57", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.57.tgz", + "integrity": "sha512-ZxrhcBxlZA7tn0HFf7ebUYfR9aHyBgjyavBLzyrYMYuAMbONBPY4S5O35562iV2FfwnZCjQky3gTDy1B3jSZ2Q==", "dev": true }, "@types/semver": { @@ -3724,7 +3724,7 @@ "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "dev": true, "requires": { - "@types/node": "8.0.53" + "@types/node": "8.0.57" } }, "path-dirname": { @@ -4741,6 +4741,15 @@ } } }, + "tslint-no-unused-expression-chai": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.0.3.tgz", + "integrity": "sha512-jKqhimj5gKl96ngeKxSVG1nOE7wmKRiHXD3kKpi+GG+5CmXJevD0ogsThZ8uSQCBIELFLVqXpZ43PpLniWu7jw==", + "dev": true, + "requires": { + "tsutils": "2.12.2" + } + }, "tsutils": { "version": "2.12.2", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz", @@ -4786,9 +4795,9 @@ } }, "typescript": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz", - "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", + "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", "dev": true }, "uc.micro": { diff --git a/package.json b/package.json index db19ccc32..8e11ab0fc 100644 --- a/package.json +++ b/package.json @@ -54,12 +54,12 @@ "yauzl": "^2.5.0" }, "devDependencies": { - "@types/chai": "^4.0.5", + "@types/chai": "^4.0.8", "@types/chai-arrays": "^1.0.2", "@types/fs-extra": "^4.0.5", - "@types/mkdirp": "^0.5.1", + "@types/mkdirp": "^0.5.2", "@types/mocha": "^2.2.32", - "@types/node": "^8.0.53", + "@types/node": "^8.0.57", "@types/semver": "^5.3.30", "@types/tmp": "0.0.33", "async-file": "^2.0.2", @@ -76,6 +76,7 @@ "plist": "^2.0.1", "tslint": "^5.8.0", "tslint-microsoft-contrib": "^5.0.1", + "tslint-no-unused-expression-chai": "0.0.3", "typescript": "^2.0.3", "vsce": "^1.32.0", "vscode": "^1.1.8" diff --git a/test/unitTests/common.test.ts b/test/unitTests/common.test.ts index 2641c28f1..585752ba5 100644 --- a/test/unitTests/common.test.ts +++ b/test/unitTests/common.test.ts @@ -72,28 +72,28 @@ suite("Common", () => { test("same paths", () => { let subfolder: string = ["C:", "temp", "VS", "dotnetProject"].join(path.sep); let folder: string= ["C:", "temp", "VS", "dotnetProject"].join(path.sep); - // tslint:disable-next-line:no-unused-expression + isSubfolderOf(subfolder, folder).should.be.true; }); test("correct subfolder", () => { let subfolder: string = ["C:", "temp", "VS"].join(path.sep); let folder: string= ["C:", "temp", "VS", "dotnetProject"].join(path.sep); - // tslint:disable-next-line:no-unused-expression + isSubfolderOf(subfolder, folder).should.be.true; }); test("longer subfolder", () => { let subfolder: string = ["C:", "temp", "VS", "a", "b", "c"].join(path.sep); let folder: string= ["C:", "temp", "VS"].join(path.sep); - // tslint:disable-next-line:no-unused-expression + isSubfolderOf(subfolder, folder).should.be.false; }); test("Different drive", () => { let subfolder: string = ["C:", "temp", "VS"].join(path.sep); let folder: string= ["E:", "temp", "VS"].join(path.sep); - // tslint:disable-next-line:no-unused-expression + isSubfolderOf(subfolder, folder).should.be.false; }); }); diff --git a/tslint.json b/tslint.json index cc2e6adc5..9905ff033 100644 --- a/tslint.json +++ b/tslint.json @@ -1,13 +1,14 @@ { "rules": { - "no-unused-expression": true, + "no-unused-expression-chai": true, "no-unused-variable": true, "no-duplicate-variable": true, "no-var-keyword": true, "promise-must-complete": true, "curly": true, "semicolon": true, - "indent": [true, "spaces", 4], - "file-header": [true, ".*"] - } + "indent": [ true, "spaces", 4 ], + "file-header": [ true, ".*" ] + }, + "rulesDirectory": ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai"] } \ No newline at end of file From 0bf87c9dfba9a35b459400c0efc405671e5952d0 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 20:12:37 +0000 Subject: [PATCH 3/6] fix path to custom chai rules --- gulpfile.js | 3 ++- tslint.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 070cece8e..fbe57ba36 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -170,7 +170,8 @@ gulp.task('tslint', () => { gulp.src(allTypeScript) .pipe(tslint({ program: require('tslint').Linter.createProgram("./tsconfig.json"), - rulesDirectory: ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai"] + configuration: "./tslint.json", + rulesDirectory: ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai/rules"] })) .pipe(tslint.report(lintReporter, { summarizeFailureOutput: false, diff --git a/tslint.json b/tslint.json index 9905ff033..067bfdcde 100644 --- a/tslint.json +++ b/tslint.json @@ -10,5 +10,5 @@ "indent": [ true, "spaces", 4 ], "file-header": [ true, ".*" ] }, - "rulesDirectory": ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai"] + "rulesDirectory": ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai/rules"] } \ No newline at end of file From acf3079e91c4c09773a956d03e250b442eaa453d Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 20:37:21 +0000 Subject: [PATCH 4/6] revert type packae versions --- .gitignore | 2 +- package.json | 6 +++--- tslint.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4aabef6c6..cc32df3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ bin/ test/**/.vscode .logs/ -\.DS_Store +\.DS_Store \ No newline at end of file diff --git a/package.json b/package.json index 8e11ab0fc..cb4bbb01d 100644 --- a/package.json +++ b/package.json @@ -54,12 +54,12 @@ "yauzl": "^2.5.0" }, "devDependencies": { - "@types/chai": "^4.0.8", + "@types/chai": "^4.0.5", "@types/chai-arrays": "^1.0.2", "@types/fs-extra": "^4.0.5", - "@types/mkdirp": "^0.5.2", + "@types/mkdirp": "^0.5.1", "@types/mocha": "^2.2.32", - "@types/node": "^8.0.57", + "@types/node": "^8.0.53", "@types/semver": "^5.3.30", "@types/tmp": "0.0.33", "async-file": "^2.0.2", diff --git a/tslint.json b/tslint.json index 067bfdcde..c03188cfb 100644 --- a/tslint.json +++ b/tslint.json @@ -7,8 +7,8 @@ "promise-must-complete": true, "curly": true, "semicolon": true, - "indent": [ true, "spaces", 4 ], - "file-header": [ true, ".*" ] + "indent": [true, "spaces", 4], + "file-header": [true, ".*"] }, "rulesDirectory": ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai/rules"] } \ No newline at end of file From ad676793102ef8c4e4ae247f8ddd03747335c830 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 20:47:31 +0000 Subject: [PATCH 5/6] simplify gulp file --- gulpfile.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index fbe57ba36..fe5792cae 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -170,8 +170,7 @@ gulp.task('tslint', () => { gulp.src(allTypeScript) .pipe(tslint({ program: require('tslint').Linter.createProgram("./tsconfig.json"), - configuration: "./tslint.json", - rulesDirectory: ["node_modules/tslint-microsoft-contrib", "node_modules/tslint-no-unused-expression-chai/rules"] + configuration: "./tslint.json" })) .pipe(tslint.report(lintReporter, { summarizeFailureOutput: false, From 6801fba32d8407665227ce3b184cf042692c3f43 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2017 21:03:15 +0000 Subject: [PATCH 6/6] force chai types to 4.0.8 --- package-lock.json | 222 ++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 107 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2cbee84e4..7db166b95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,12 +20,12 @@ } }, "@types/fs-extra": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.5.tgz", - "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.6.tgz", + "integrity": "sha512-SVQDcOe1t7qSRzJFjkMx4V/0hc3TcGX/f51Dxx3Q/rpeg7nvFiort6QJTpJATOZH/YqhzJ1xt0qjvotxOJiCkQ==", "dev": true, "requires": { - "@types/node": "8.0.57" + "@types/node": "8.0.58" } }, "@types/mkdirp": { @@ -34,7 +34,7 @@ "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==", "dev": true, "requires": { - "@types/node": "8.0.57" + "@types/node": "8.0.58" } }, "@types/mocha": { @@ -44,9 +44,9 @@ "dev": true }, "@types/node": { - "version": "8.0.57", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.57.tgz", - "integrity": "sha512-ZxrhcBxlZA7tn0HFf7ebUYfR9aHyBgjyavBLzyrYMYuAMbONBPY4S5O35562iV2FfwnZCjQky3gTDy1B3jSZ2Q==", + "version": "8.0.58", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.58.tgz", + "integrity": "sha512-V746iUU7eHNdzQipoACuguDlVhC7IHK8CES1jSkuFt352wwA84BCWPXaGekBd7R5XdNK5ReHONDVKxlL9IreAw==", "dev": true }, "@types/semver": { @@ -78,9 +78,9 @@ } }, "ajv": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz", - "integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz", + "integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI=", "dev": true, "requires": { "co": "4.6.0", @@ -119,14 +119,6 @@ "dev": true, "requires": { "sprintf-js": "1.0.3" - }, - "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - } } }, "arr-diff": { @@ -185,9 +177,9 @@ "dev": true }, "array-slice": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz", - "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", "dev": true }, "array-union": { @@ -876,9 +868,9 @@ } }, "es-abstract": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz", - "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz", + "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==", "dev": true, "requires": { "es-to-primitive": "1.1.1", @@ -930,6 +922,14 @@ "split": "0.3.3", "stream-combiner": "0.0.4", "through": "2.3.8" + }, + "dependencies": { + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + } } }, "execa": { @@ -1167,9 +1167,9 @@ "dev": true }, "fs-extra": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", - "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", "requires": { "graceful-fs": "4.1.11", "jsonfile": "4.0.0", @@ -1394,7 +1394,7 @@ "dev": true, "requires": { "homedir-polyfill": "1.0.1", - "ini": "1.3.4", + "ini": "1.3.5", "is-windows": "0.2.0", "which": "1.3.0" }, @@ -1516,7 +1516,7 @@ "chalk": "1.1.3", "deprecated": "0.0.1", "gulp-util": "3.0.8", - "interpret": "1.0.4", + "interpret": "1.1.0", "liftoff": "2.3.0", "minimist": "1.2.0", "orchestrator": "0.3.8", @@ -1560,7 +1560,7 @@ "requires": { "gulp-util": "3.0.8", "multimatch": "2.1.0", - "streamfilter": "1.0.5" + "streamfilter": "1.0.7" } }, "gulp-gunzip": { @@ -1650,12 +1650,6 @@ "path-is-absolute": "1.0.1" } }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "mocha": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", @@ -2000,14 +1994,6 @@ "gulp-util": "3.0.8", "map-stream": "0.0.7", "through": "2.3.8" - }, - "dependencies": { - "map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", - "dev": true - } } }, "gulp-untar": { @@ -2372,9 +2358,9 @@ } }, "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, "has-gulplog": { @@ -2519,15 +2505,15 @@ "dev": true }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "interpret": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", - "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", "dev": true }, "is": { @@ -2662,13 +2648,13 @@ "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", "dev": true, "requires": { - "is-path-inside": "1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", - "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { "path-is-inside": "1.0.2" @@ -2995,12 +2981,6 @@ "strip-bom": "3.0.0" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3207,9 +3187,9 @@ "dev": true }, "map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", "dev": true }, "markdown-it": { @@ -3300,9 +3280,9 @@ } }, "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, "mime-db": { @@ -3387,6 +3367,12 @@ "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", "dev": true }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "supports-color": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", @@ -3431,9 +3417,9 @@ "dev": true }, "natives": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", - "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz", + "integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==", "dev": true }, "node.extend": { @@ -3503,6 +3489,12 @@ "supports-color": "4.5.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "supports-color": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", @@ -3557,7 +3549,7 @@ "dev": true, "requires": { "array-each": "1.0.1", - "array-slice": "1.0.0", + "array-slice": "1.1.0", "for-own": "1.0.0", "isobject": "3.0.1" }, @@ -3724,7 +3716,7 @@ "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "dev": true, "requires": { - "@types/node": "8.0.57" + "@types/node": "8.0.58" } }, "path-dirname": { @@ -3779,14 +3771,6 @@ "dev": true, "requires": { "pify": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } } }, "pathval": { @@ -4133,7 +4117,7 @@ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "ajv": "5.5.0", + "ajv": "5.5.1", "har-schema": "2.0.0" } }, @@ -4385,6 +4369,12 @@ "through": "2.3.8" } }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, "sshpk": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", @@ -4437,9 +4427,9 @@ "dev": true }, "streamfilter": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz", - "integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.7.tgz", + "integrity": "sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==", "dev": true, "requires": { "readable-stream": "2.3.3" @@ -4490,7 +4480,7 @@ "dev": true, "requires": { "define-properties": "1.1.2", - "es-abstract": "1.9.0", + "es-abstract": "1.10.0", "function-bind": "1.1.1" } }, @@ -4669,9 +4659,9 @@ } }, "tslib": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz", - "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz", + "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=", "dev": true }, "tslint": { @@ -4689,8 +4679,8 @@ "minimatch": "3.0.4", "resolve": "1.5.0", "semver": "5.4.1", - "tslib": "1.8.0", - "tsutils": "2.12.2" + "tslib": "1.8.1", + "tsutils": "2.13.0" }, "dependencies": { "ansi-styles": { @@ -4713,6 +4703,12 @@ "supports-color": "4.5.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "supports-color": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", @@ -4747,16 +4743,16 @@ "integrity": "sha512-jKqhimj5gKl96ngeKxSVG1nOE7wmKRiHXD3kKpi+GG+5CmXJevD0ogsThZ8uSQCBIELFLVqXpZ43PpLniWu7jw==", "dev": true, "requires": { - "tsutils": "2.12.2" + "tsutils": "2.13.0" } }, "tsutils": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz", - "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.13.0.tgz", + "integrity": "sha512-FuWzNJbMsp3gcZMbI3b5DomhW4Ia41vMxjN63nKWI0t7f+I3UmHfRl0TrXJTwI2LUduDG+eR1Mksp3pvtlyCFQ==", "dev": true, "requires": { - "tslib": "1.8.0" + "tslib": "1.8.1" } }, "tunnel": { @@ -4946,7 +4942,7 @@ "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", "dev": true, "requires": { - "natives": "1.1.0" + "natives": "1.1.1" } }, "readable-stream": { @@ -5034,18 +5030,18 @@ } }, "vsce": { - "version": "1.33.2", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.33.2.tgz", - "integrity": "sha1-NkX2mq+YTiL3TqSdNfON0Y1m/18=", + "version": "1.35.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.35.0.tgz", + "integrity": "sha512-haTQ17f/fD46XjsdZSnDDmHtPuq9dOpQCz4ZI8DZ3gDkkyP260JFR+Brp1TTMK6Hm9pT7bi7DeH3YPkK8PJAiA==", "dev": true, "requires": { "cheerio": "1.0.0-rc.2", - "commander": "2.11.0", + "commander": "2.9.0", "denodeify": "1.2.1", "glob": "7.1.2", "lodash": "4.17.4", "markdown-it": "8.4.0", - "mime": "1.4.1", + "mime": "1.6.0", "minimatch": "3.0.4", "osenv": "0.1.4", "parse-semver": "1.1.1", @@ -5058,12 +5054,6 @@ "yazl": "2.4.3" }, "dependencies": { - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", @@ -5082,9 +5072,9 @@ } }, "vscode": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.8.tgz", - "integrity": "sha512-kT6sIA1AEKR5M+us2fXk5dxwV9SR/IEdLHNmVW4/dl1wNBHoEvgIo1qMQwHNxPVTQmw70KTGZ9UVeVb8FbpNFA==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.10.tgz", + "integrity": "sha512-MvFXXSGuhw0Q6GC6dQrnRc0ES+63wpttGIoYGBMQnoS9JFCCNC/rWfX0lBCHJyuKL2Q8CYg0ROsMEHbHVwEtVw==", "dev": true, "requires": { "glob": "7.1.2", @@ -5104,9 +5094,9 @@ } }, "vscode-debugprotocol": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz", - "integrity": "sha1-28EOjX2VsQJyehmvPw/O9+JSsI4=" + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.25.0.tgz", + "integrity": "sha512-e1EUy/5npqa0NlAwRCUu8A9LnVRf6tkwiPQcCLyUFCC9o2GxcAqH5Va4mqXDoxQ58ar3zODivKQeRb3z1KH7WA==" }, "vscode-extension-telemetry": { "version": "0.0.8", diff --git a/package.json b/package.json index cb4bbb01d..395bbd3a9 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "yauzl": "^2.5.0" }, "devDependencies": { - "@types/chai": "^4.0.5", + "@types/chai": "4.0.8", "@types/chai-arrays": "^1.0.2", "@types/fs-extra": "^4.0.5", "@types/mkdirp": "^0.5.1",