From c28ced54902ce87c91e4b6259bc028c845135b62 Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Fri, 7 May 2021 16:16:24 -0700 Subject: [PATCH] Release 0.1.12 - Upgrade to Electron 12 --- CHANGELOG.md | 3 + azure-pipelines.yml | 18 +-- package-lock.json | 205 +++++++++++----------------------- package.json | 8 +- src/librarymanager/library.ts | 6 +- 5 files changed, 85 insertions(+), 155 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe94003..639deeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to the "vscode-circuitpython" extension will be documented in this file. +## [0.1.12] +- Electron Rebuild 12.0.4 + ## [0.1.11] - Fixed [#38](https://github.com/joedevivo/vscode-circuitpython/pull/37) issue with Apple Silicon native bindings diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 00ca795..502f441 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: '12.18.3' + versionSpec: '14.16.0' displayName: 'Install Node.js' - task: Npm@1 inputs: @@ -58,7 +58,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: '12.18.3' + versionSpec: '14.16.0' displayName: 'Install Node.js' - task: Npm@1 inputs: @@ -79,7 +79,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: '12.18.3' + versionSpec: '14.16.0' displayName: 'Install Node.js' - task: Npm@1 inputs: @@ -112,15 +112,15 @@ stages: jobs: - job: package pool: - name: Default - demands: - - agent.os -equals Darwin - - ARCH -equals arm64 - #vmImage: 'ubuntu-latest' + #name: Default + #demands: + # - agent.os -equals Darwin + # - ARCH -equals arm64 + vmImage: 'ubuntu-latest' steps: - task: NodeTool@0 inputs: - versionSpec: '12.18.3' + versionSpec: '14.16.0' displayName: 'Install Node.js' - task: Npm@1 inputs: diff --git a/package-lock.json b/package-lock.json index ce37e21..7ca4d8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "vscode-circuitpython", - "version": "0.1.10", + "version": "0.1.11", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.1.10", + "version": "0.1.11", "license": "MIT", "dependencies": { "@types/lodash": "^4.14.168", @@ -34,7 +34,7 @@ "@types/vscode": "^1.52.0", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "^2.34.0", - "electron": "11.3.0", + "electron": "12.0.4", "electron-builder": "^22.10.5", "electron-rebuild": "^2.3.5", "eslint": "^6.8.0", @@ -1302,34 +1302,13 @@ } }, "node_modules/azure-devops-node-api": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz", - "integrity": "sha512-pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz", + "integrity": "sha512-4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow==", "dev": true, "dependencies": { - "os": "0.1.1", - "tunnel": "0.0.4", - "typed-rest-client": "1.2.0", - "underscore": "1.8.3" - } - }, - "node_modules/azure-devops-node-api/node_modules/tunnel": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", - "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", - "dev": true, - "engines": { - "node": ">=0.6.11 <=0.7.0 || >=0.7.3" - } - }, - "node_modules/azure-devops-node-api/node_modules/typed-rest-client": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz", - "integrity": "sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==", - "dev": true, - "dependencies": { - "tunnel": "0.0.4", - "underscore": "1.8.3" + "tunnel": "0.0.6", + "typed-rest-client": "^1.8.4" } }, "node_modules/balanced-match": { @@ -3110,13 +3089,14 @@ } }, "node_modules/electron": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.3.0.tgz", - "integrity": "sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.4.tgz", + "integrity": "sha512-A8Lq3YMZ1CaO1z5z5nsyFxIwkgwXLHUwL2pf9MVUHpq7fv3XUewCMD98EnLL3DdtiyCvw5KMkeT1WGsZh8qFug==", "dev": true, + "hasInstallScript": true, "dependencies": { "@electron/get": "^1.0.1", - "@types/node": "^12.0.12", + "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, "bin": { @@ -3697,6 +3677,12 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/electron/node_modules/@types/node": { + "version": "14.14.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.44.tgz", + "integrity": "sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==", + "dev": true + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5563,9 +5549,9 @@ } }, "node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.pad": { "version": "4.5.1", @@ -9807,12 +9793,6 @@ "node": ">=8" } }, - "node_modules/os": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/os/-/os-0.1.1.tgz", - "integrity": "sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M=", - "dev": true - }, "node_modules/os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -11541,13 +11521,13 @@ } }, "node_modules/typed-rest-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.0.tgz", - "integrity": "sha512-Nu1MrdH6ECrRW5gHoRAdubgCs4oH6q5/J76jsEC8bVDfvVoVPkigukPalhMHPwb7ZvpsZqPptd5zpt/QdtrdBw==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz", + "integrity": "sha512-MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg==", "dependencies": { "qs": "^6.9.1", "tunnel": "0.0.6", - "underscore": "1.8.3" + "underscore": "^1.12.1" } }, "node_modules/typed-rest-client/node_modules/qs": { @@ -11606,9 +11586,9 @@ "dev": true }, "node_modules/underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" }, "node_modules/unique-string": { "version": "2.0.0", @@ -11866,12 +11846,12 @@ } }, "node_modules/vsce": { - "version": "1.84.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.84.0.tgz", - "integrity": "sha512-mRJDTMC/1GO7byz6dleY28CZo97cM1p0nU3EEMT5bGMpi5Yga3dKdgTvmwgSQF5BYWozNSNSqN1zih5SYzMZjA==", + "version": "1.88.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz", + "integrity": "sha512-FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw==", "dev": true, "dependencies": { - "azure-devops-node-api": "^7.2.0", + "azure-devops-node-api": "^10.2.2", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.1", "commander": "^6.1.0", @@ -11887,7 +11867,7 @@ "read": "^1.0.7", "semver": "^5.1.0", "tmp": "0.0.29", - "typed-rest-client": "1.2.0", + "typed-rest-client": "^1.8.4", "url-join": "^1.1.0", "yauzl": "^2.3.1", "yazl": "^2.2.2" @@ -11929,25 +11909,6 @@ "node": ">=0.4.0" } }, - "node_modules/vsce/node_modules/tunnel": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", - "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", - "dev": true, - "engines": { - "node": ">=0.6.11 <=0.7.0 || >=0.7.3" - } - }, - "node_modules/vsce/node_modules/typed-rest-client": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz", - "integrity": "sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==", - "dev": true, - "dependencies": { - "tunnel": "0.0.4", - "underscore": "1.8.3" - } - }, "node_modules/vscode-test": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.1.tgz", @@ -13415,33 +13376,13 @@ } }, "azure-devops-node-api": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz", - "integrity": "sha512-pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz", + "integrity": "sha512-4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow==", "dev": true, "requires": { - "os": "0.1.1", - "tunnel": "0.0.4", - "typed-rest-client": "1.2.0", - "underscore": "1.8.3" - }, - "dependencies": { - "tunnel": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", - "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", - "dev": true - }, - "typed-rest-client": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz", - "integrity": "sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==", - "dev": true, - "requires": { - "tunnel": "0.0.4", - "underscore": "1.8.3" - } - } + "tunnel": "0.0.6", + "typed-rest-client": "^1.8.4" } }, "balanced-match": { @@ -14939,14 +14880,22 @@ } }, "electron": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.3.0.tgz", - "integrity": "sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.4.tgz", + "integrity": "sha512-A8Lq3YMZ1CaO1z5z5nsyFxIwkgwXLHUwL2pf9MVUHpq7fv3XUewCMD98EnLL3DdtiyCvw5KMkeT1WGsZh8qFug==", "dev": true, "requires": { "@electron/get": "^1.0.1", - "@types/node": "^12.0.12", + "@types/node": "^14.6.2", "extract-zip": "^1.0.3" + }, + "dependencies": { + "@types/node": { + "version": "14.14.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.44.tgz", + "integrity": "sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==", + "dev": true + } } }, "electron-builder": { @@ -16937,9 +16886,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.pad": { "version": "4.5.1", @@ -19966,12 +19915,6 @@ } } }, - "os": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/os/-/os-0.1.1.tgz", - "integrity": "sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M=", - "dev": true - }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -21393,13 +21336,13 @@ "dev": true }, "typed-rest-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.0.tgz", - "integrity": "sha512-Nu1MrdH6ECrRW5gHoRAdubgCs4oH6q5/J76jsEC8bVDfvVoVPkigukPalhMHPwb7ZvpsZqPptd5zpt/QdtrdBw==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz", + "integrity": "sha512-MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg==", "requires": { "qs": "^6.9.1", "tunnel": "0.0.6", - "underscore": "1.8.3" + "underscore": "^1.12.1" }, "dependencies": { "qs": { @@ -21450,9 +21393,9 @@ "dev": true }, "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", + "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" }, "unique-string": { "version": "2.0.0", @@ -21667,12 +21610,12 @@ } }, "vsce": { - "version": "1.84.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.84.0.tgz", - "integrity": "sha512-mRJDTMC/1GO7byz6dleY28CZo97cM1p0nU3EEMT5bGMpi5Yga3dKdgTvmwgSQF5BYWozNSNSqN1zih5SYzMZjA==", + "version": "1.88.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz", + "integrity": "sha512-FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw==", "dev": true, "requires": { - "azure-devops-node-api": "^7.2.0", + "azure-devops-node-api": "^10.2.2", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.1", "commander": "^6.1.0", @@ -21688,7 +21631,7 @@ "read": "^1.0.7", "semver": "^5.1.0", "tmp": "0.0.29", - "typed-rest-client": "1.2.0", + "typed-rest-client": "^1.8.4", "url-join": "^1.1.0", "yauzl": "^2.3.1", "yazl": "^2.2.2" @@ -21714,22 +21657,6 @@ "requires": { "os-tmpdir": "~1.0.1" } - }, - "tunnel": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", - "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", - "dev": true - }, - "typed-rest-client": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz", - "integrity": "sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==", - "dev": true, - "requires": { - "tunnel": "0.0.4", - "underscore": "1.8.3" - } } } }, diff --git a/package.json b/package.json index 9c5497c..c199dd5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-circuitpython", "displayName": "CircuitPython", "description": "CircuitPython for Visual Studio Code", - "version": "0.1.11", + "version": "0.1.12", "publisher": "joedevivo", "license": "MIT", "qna": "https://github.com/joedevivo/vscode-circuitpython/discussions", @@ -14,7 +14,7 @@ "url": "https://github.com/joedevivo/vscode-circuitpython/issues" }, "engines": { - "vscode": "^1.55.0" + "vscode": "^1.56.0" }, "icon": "images/BlinkaOnDark.png", "categories": [ @@ -129,7 +129,7 @@ "watch": "tsc -watch -p ./", "pretest": "npm run compile && npm run lint", "test": "node ./out/test/runTest.js", - "electron-rebuild": "electron-rebuild -v 11.3.0", + "electron-rebuild": "electron-rebuild -v 12.0.4", "build-bindings": "node ./scripts/build-bindings.js", "install-bindings": "node ./scripts/install-bindings.js" }, @@ -144,7 +144,7 @@ "@types/vscode": "^1.52.0", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "^2.34.0", - "electron": "11.3.0", + "electron": "12.0.4", "electron-builder": "^22.10.5", "electron-rebuild": "^2.3.5", "eslint": "^6.8.0", diff --git a/src/librarymanager/library.ts b/src/librarymanager/library.ts index 626e415..bf04057 100644 --- a/src/librarymanager/library.ts +++ b/src/librarymanager/library.ts @@ -60,7 +60,7 @@ export class Library implements vscode.QuickPickItem { return new Promise((resolve, reject) => { let name: string = path.basename(file, ".py"); - let version: string = null; + let version: string = "unknown"; let repo: string = null; s.on("data", (data: string) => { @@ -89,7 +89,7 @@ export class Library implements vscode.QuickPickItem { let s: fs.ReadStream = fs.createReadStream(file); return new Promise((resolve, reject) => { let name: string = path.basename(file, ".mpy"); - let version: string = null; + let version: string = "unknown"; s.on("data", (data: string) => { let chunk: string = data.toString(); let start: number = chunk.search(/[\d*\.?]+\x0b__version__/); @@ -140,7 +140,7 @@ export class Library implements vscode.QuickPickItem { let potentials: Library[] = await Promise.all(modules); return new Promise((resolve, reject) => { - let version: string = null; + let version: string = "unknown"; let repo: string = null; potentials = potentials.filter((v, i, a) => {