diff --git a/package-lock.json b/package-lock.json index 82694e2870..623dbcfb68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1093,7 +1093,7 @@ "requires": { "assert-plus": "1.0.0", "jsprim": "1.4.1", - "sshpk": "1.14.1" + "sshpk": "1.14.2" } }, "inflight": { @@ -1448,7 +1448,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", - "dev": true, "requires": { "browser-stdout": "1.3.0", "commander": "2.11.0", @@ -1823,6 +1822,11 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", @@ -1857,9 +1861,9 @@ "dev": true }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", + "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -1868,6 +1872,7 @@ "ecc-jsbn": "0.1.1", "getpass": "0.1.7", "jsbn": "0.1.1", + "safer-buffer": "2.1.2", "tweetnacl": "0.14.5" } }, @@ -2127,9 +2132,9 @@ "dev": true }, "url-parse": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", - "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz", + "integrity": "sha512-x95Td74QcvICAA0+qERaVkRpTGKyBHHYdwL2LXZm5t/gBtCB9KQSO/0zQgSTYEV1p0WcvSg79TLNPSvd5IDJMQ==", "requires": { "querystringify": "2.0.0", "requires-port": "1.0.0" @@ -2266,27 +2271,8 @@ "request": "2.87.0", "semver": "5.5.0", "source-map-support": "0.5.6", - "url-parse": "1.4.0", + "url-parse": "1.4.1", "vinyl-source-stream": "1.1.2" - }, - "dependencies": { - "mocha": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", - "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - } - } } }, "vscode-jsonrpc": { @@ -2295,26 +2281,26 @@ "integrity": "sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==" }, "vscode-languageclient": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz", - "integrity": "sha512-V2fWd+2vm8wmShjgciBxovMzSXMzBFtQo2R6OIW5kJIynds6x0J3SwMNa3QKAmhsCDy3WmBwnplBGtyGNNnvPA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.2.1.tgz", + "integrity": "sha512-zeixIe2MiKPHiSNjEUmRhWFiNCGUwUNvefBiA9diZc7fXE8DX+AhfwpsOLYauO8Q8C6gW8f9OQvy3Vn2hBvY4g==", "requires": { - "vscode-languageserver-protocol": "3.7.2" + "vscode-languageserver-protocol": "3.8.1" } }, "vscode-languageserver-protocol": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz", - "integrity": "sha512-VVJwIA/FPl/FnVtrns0FPK6TLi/ET7n1Yo6tCrm6aG7+yAVwIGWdpTmKE+nbP8wEMMbHCkIabk63IJvfz2HNRg==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz", + "integrity": "sha512-KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ==", "requires": { "vscode-jsonrpc": "3.6.2", - "vscode-languageserver-types": "3.7.2" + "vscode-languageserver-types": "3.8.1" } }, "vscode-languageserver-types": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz", - "integrity": "sha512-L9D2RA+PDS2CiyhLQY5ZrOmyRvXyjc4Ha8s9PqS6mIgGxj00R5Xx2vLKBnAOVfrawJXYZST+2hioMks6SQVU7A==" + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.1.tgz", + "integrity": "sha512-O8IBrxSBp2AJALIZBwT2Gd6gX67MMtwCwnfzT9T3QynE+dqikoj7x3kOb3fdIjd9hIoAB2yc38XcJJDw8H1cpw==" }, "vso-node-api": { "version": "6.1.2-preview", diff --git a/package.json b/package.json index 9868de7620..9fe3717750 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "publisher": "ms-vscode", "description": "Develop PowerShell scripts in Visual Studio Code!", "engines": { - "vscode": "^1.19.0" + "vscode": "^1.22.0" }, "license": "SEE LICENSE IN LICENSE.txt", "homepage": "https://github.com/PowerShell/vscode-powershell/blob/master/README.md", @@ -38,7 +38,7 @@ ], "dependencies": { "vscode": "^1.1.18", - "vscode-languageclient": "^4.1.4" + "vscode-languageclient": "^4.2.1" }, "devDependencies": { "@types/mocha": "^2.2.32", diff --git a/src/features/NewFileOrProject.ts b/src/features/NewFileOrProject.ts index e8e3e5efc1..1a4f2f5083 100644 --- a/src/features/NewFileOrProject.ts +++ b/src/features/NewFileOrProject.ts @@ -97,19 +97,19 @@ export class NewFileOrProjectFeature implements IFeature { if (!includeInstalledModules) { templates = - [{ + [({ label: this.loadIcon, description: "Load additional templates from installed modules", template: undefined, - }] + } as ITemplateQuickPickItem)] .concat(templates); } else { templates = - [{ + [({ label: this.loadIcon, description: "Refresh template list", template: undefined, - }] + } as ITemplateQuickPickItem)] .concat(templates); } diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1 index 333d214367..690d54c6fc 100644 --- a/vscode-powershell.build.ps1 +++ b/vscode-powershell.build.ps1 @@ -119,10 +119,44 @@ task Package { Move-Item -Force .\PowerShell-$($script:ExtensionVersion).vsix .\PowerShell-insiders.vsix } +task V2Process { + # Throwing this in so that we can get v2 builds going. This should be refactored later. + try { + if (!$script:psesBuildScriptPath) { + throw "PSES path required." + } + + # grab 2.0 PSRL bits + Write-Host "`n### Grabbing 2.0 bits" + Push-Location ..\PowerShellEditorServices + git remote add patrick https://github.com/SeeminglyScience/PowerShellEditorServices.git + git fetch --all + git checkout integrate-psreadline-2 + Invoke-Build Build + Pop-Location + + Write-Host "`n### Copying PowerShellEditorServices module files" -ForegroundColor Green + Copy-Item -Recurse -Force ..\PowerShellEditorServices\module\* .\modules + + Write-Host "`n### Packaging PowerShell-insiders.vsix`n" -ForegroundColor Green + exec { & node ./node_modules/vsce/out/vsce package } + + # Change the package to have a static name for automation purposes + Move-Item -Force .\PowerShell-$($script:ExtensionVersion).vsix .\PowerShell-v2-insiders.vsix + } + catch { + Write-Host "tried to build v2 but failed because of: `n`n$_" + } + +} + task UploadArtifacts -If { $env:AppVeyor } { Push-AppveyorArtifact .\PowerShell-insiders.vsix + if (Test-Path .\PowerShell-v2-insiders.vsix) { + Push-AppveyorArtifact .\PowerShell-v2-insiders.vsix + } } # The default task is to run the entire CI build -task . GetExtensionVersion, CleanAll, BuildAll, Test, Package, UploadArtifacts +task . GetExtensionVersion, CleanAll, BuildAll, Test, Package, V2Process, UploadArtifacts