From ebe45e35cdcc9dec0e164863de93c27b19287f84 Mon Sep 17 00:00:00 2001 From: tjquillan Date: Tue, 8 Jun 2021 20:02:10 -0700 Subject: [PATCH 1/3] Properly address #125 This commit reworks the python rules in .vscodeignore to be compatible with vsce 1.92.0 and above. --- .vscodeignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index 9ba1521..6983a1a 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -14,5 +14,5 @@ src/** .prettierrc.json # Python -python/** -!python/scripts/**.py \ No newline at end of file +python/* +!python/scripts/ \ No newline at end of file From fd089292179ec0ef7fbe5bdf39c86a36039a98cf Mon Sep 17 00:00:00 2001 From: tjquillan Date: Tue, 8 Jun 2021 20:05:36 -0700 Subject: [PATCH 2/3] Bump vsce to 1.93.0 --- package-lock.json | 55 ++++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0698c9..2c6a35b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "prettier": "^2.3.0", "ts-loader": "^9.2.2", "typescript": "^4.3.2", - "vsce": "~1.91.0", + "vsce": "^1.93.0", "vscode-test": "^1.5.0", "webpack": "^5.38.1", "webpack-cli": "^4.7.0" @@ -4478,15 +4478,15 @@ "dev": true }, "node_modules/tmp": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz", - "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, "dependencies": { - "os-tmpdir": "~1.0.1" + "rimraf": "^3.0.0" }, "engines": { - "node": ">=0.4.0" + "node": ">=8.17.0" } }, "node_modules/to-fast-properties": { @@ -4697,9 +4697,9 @@ "dev": true }, "node_modules/vsce": { - "version": "1.91.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz", - "integrity": "sha512-y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ==", + "version": "1.93.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.93.0.tgz", + "integrity": "sha512-RgmxwybXenP6tTF0PLh97b/RRLp1RkzjAHNya3QAfv1EZVg+lfoBiAaXogpmOGjYr8OskkqP5tIa3D/Q6X9lrw==", "dev": true, "dependencies": { "azure-devops-node-api": "^10.2.2", @@ -4708,16 +4708,16 @@ "commander": "^6.1.0", "denodeify": "^1.2.1", "glob": "^7.0.6", + "ignore": "^5.1.8", "leven": "^3.1.0", "lodash": "^4.17.15", "markdown-it": "^10.0.0", "mime": "^1.3.4", - "minimatch": "^3.0.3", "osenv": "^0.1.3", "parse-semver": "^1.1.1", "read": "^1.0.7", "semver": "^5.1.0", - "tmp": "0.0.29", + "tmp": "^0.2.1", "typed-rest-client": "^1.8.4", "url-join": "^1.1.0", "yauzl": "^2.3.1", @@ -4780,6 +4780,15 @@ "node": ">=4" } }, + "node_modules/vsce/node_modules/ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/vsce/node_modules/semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -8604,12 +8613,12 @@ "dev": true }, "tmp": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz", - "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, "requires": { - "os-tmpdir": "~1.0.1" + "rimraf": "^3.0.0" } }, "to-fast-properties": { @@ -8774,9 +8783,9 @@ "dev": true }, "vsce": { - "version": "1.91.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz", - "integrity": "sha512-y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ==", + "version": "1.93.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.93.0.tgz", + "integrity": "sha512-RgmxwybXenP6tTF0PLh97b/RRLp1RkzjAHNya3QAfv1EZVg+lfoBiAaXogpmOGjYr8OskkqP5tIa3D/Q6X9lrw==", "dev": true, "requires": { "azure-devops-node-api": "^10.2.2", @@ -8785,16 +8794,16 @@ "commander": "^6.1.0", "denodeify": "^1.2.1", "glob": "^7.0.6", + "ignore": "^5.1.8", "leven": "^3.1.0", "lodash": "^4.17.15", "markdown-it": "^10.0.0", "mime": "^1.3.4", - "minimatch": "^3.0.3", "osenv": "^0.1.3", "parse-semver": "^1.1.1", "read": "^1.0.7", "semver": "^5.1.0", - "tmp": "0.0.29", + "tmp": "^0.2.1", "typed-rest-client": "^1.8.4", "url-join": "^1.1.0", "yauzl": "^2.3.1", @@ -8842,6 +8851,12 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", diff --git a/package.json b/package.json index 4afb35a..c87c770 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "prettier": "^2.3.0", "ts-loader": "^9.2.2", "typescript": "^4.3.2", - "vsce": "~1.91.0", + "vsce": "^1.93.0", "vscode-test": "^1.5.0", "webpack": "^5.38.1", "webpack-cli": "^4.7.0" From b7bff7723b5b25288e63d34d436d714006d1735a Mon Sep 17 00:00:00 2001 From: tjquillan Date: Wed, 9 Jun 2021 07:39:39 -0700 Subject: [PATCH 3/3] Add .husky to .vscodeignore and general cleanup node_modules and .github were also added despite the fact that they seem to already be ignored for some reason as adding them will prevent them being included if vsce behavior changes in the future --- .vscodeignore | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index 6983a1a..623f590 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,7 +1,9 @@ -.vscode/** -.vscode-test/** -out/** -src/** +.github/ +.vscode/ +.vscode-test/ +node_modules/ +out/ +src/ .gitignore .yarnrc **/tsconfig.json @@ -9,6 +11,9 @@ src/** **/*.map **/*.ts +# Husky +.husky/ + # Prettier .prettierignore .prettierrc.json