From b25efe307f1f0e839b58194af5cfeda71270b046 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Wed, 28 Apr 2021 12:14:19 -0700 Subject: [PATCH 1/4] extension pack --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index de0b7c5775c1..cc93fa2636e6 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,13 @@ "Linters", "Formatters", "Other", - "Extension Packs", "Data Science", "Machine Learning", "Notebooks" ], + "extensionPack": [ + "ms-python.vscode-pylance" + ], "requiresWorkspaceTrust": "onStart", "activationEvents": [ "onLanguage:python", From 34f5ee5d9ed0eef791c0108abd823b0d83291800 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Wed, 28 Apr 2021 17:22:48 -0700 Subject: [PATCH 2/4] Undo package.json change --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index cc93fa2636e6..de0b7c5775c1 100644 --- a/package.json +++ b/package.json @@ -42,13 +42,11 @@ "Linters", "Formatters", "Other", + "Extension Packs", "Data Science", "Machine Learning", "Notebooks" ], - "extensionPack": [ - "ms-python.vscode-pylance" - ], "requiresWorkspaceTrust": "onStart", "activationEvents": [ "onLanguage:python", From b71e274a58fab792587f3f8814b426862b0c25f2 Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Wed, 28 Apr 2021 17:23:34 -0700 Subject: [PATCH 3/4] Add extension pack link at build time --- .github/actions/build-vsix/action.yml | 3 +++ gulpfile.js | 15 +++++++++++++++ package.json | 1 + 3 files changed, 19 insertions(+) diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml index a3b9d0312afe..318dd5b8da15 100644 --- a/.github/actions/build-vsix/action.yml +++ b/.github/actions/build-vsix/action.yml @@ -37,5 +37,8 @@ runs: - run: npm run addExtensionDependencies shell: bash + - run: npm run addExtensionPackDependencies + shell: bash + - run: npm run package shell: bash diff --git a/gulpfile.js b/gulpfile.js index 7ea0c9f9b4aa..9c7c16e9a28f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -81,6 +81,10 @@ gulp.task('addExtensionDependencies', async () => { await addExtensionDependencies(); }); +gulp.task('addExtensionPackDependencies', async () => { + await addExtensionPackDependencies(); +}); + async function addExtensionDependencies() { // Update the package.json to add extension dependencies at build time so that // extension dependencies need not be installed during development @@ -92,6 +96,17 @@ async function addExtensionDependencies() { await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8'); } +async function addExtensionPackDependencies() { + // Update the package.json to add extension pack dependencies at build time so that + // extension dependencies need not be installed during development + const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8'); + const packageJson = JSON.parse(packageJsonContents); + packageJson.extensionPack = ['ms-python.vscode-pylance'].concat( + packageJson.extensionPack ? packageJson.extensionPack : [], + ); + await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8'); +} + gulp.task('updateBuildNumber', async () => { await updateBuildNumber(argv); }); diff --git a/package.json b/package.json index de0b7c5775c1..12075874bda3 100644 --- a/package.json +++ b/package.json @@ -2050,6 +2050,7 @@ "format-fix": "prettier --write 'src/**/*.ts' 'src/**/*.tsx' 'build/**/*.js' '.github/**/*.yml' gulpfile.js", "clean": "gulp clean", "addExtensionDependencies": "gulp addExtensionDependencies", + "addExtensionPack": "gulp addExtensionPackDependencies", "updateBuildNumber": "gulp updateBuildNumber", "verifyBundle": "gulp verifyBundle", "webpack": "webpack" From 596cf14a1fb17a41df1a13b7d672103f03079cca Mon Sep 17 00:00:00 2001 From: Kim-Adeline Miguel Date: Wed, 28 Apr 2021 17:35:59 -0700 Subject: [PATCH 4/4] Forgot to update all names --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12075874bda3..1d3b03029875 100644 --- a/package.json +++ b/package.json @@ -2050,7 +2050,7 @@ "format-fix": "prettier --write 'src/**/*.ts' 'src/**/*.tsx' 'build/**/*.js' '.github/**/*.yml' gulpfile.js", "clean": "gulp clean", "addExtensionDependencies": "gulp addExtensionDependencies", - "addExtensionPack": "gulp addExtensionPackDependencies", + "addExtensionPackDependencies": "gulp addExtensionPackDependencies", "updateBuildNumber": "gulp updateBuildNumber", "verifyBundle": "gulp verifyBundle", "webpack": "webpack"