Skip to content

Bundle Pylance as part of an extension pack (not a hard dependency) #16077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kimadeline merged 4 commits into from
May 3, 2021
Merged

Bundle Pylance as part of an extension pack (not a hard dependency) #16077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b25efe3
extension pack
kimadeline Apr 28, 2021
34f5ee5
Undo package.json change
kimadeline Apr 29, 2021
b71e274
Add extension pack link at build time
kimadeline Apr 29, 2021
596cf14
Forgot to update all names
kimadeline Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/actions/build-vsix/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ runs:
- run: npm run addExtensionDependencies
shell: bash

- run: npm run addExtensionPackDependencies
Copy link
Member

@jakebailey jakebailey Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to use another gulp task rather than just having it be a part of the extension dependencies one?

Copy link
Author

@kimadeline kimadeline Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured we might want to keep them separate since it's messing with a different package.json key.

shell: bash

- run: npm run package
shell: bash
15 changes: 15 additions & 0 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
});
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,7 @@
"format-fix": "prettier --write 'src/**/*.ts' 'src/**/*.tsx' 'build/**/*.js' '.github/**/*.yml' gulpfile.js",
"clean": "gulp clean",
"addExtensionDependencies": "gulp addExtensionDependencies",
"addExtensionPackDependencies": "gulp addExtensionPackDependencies",
"updateBuildNumber": "gulp updateBuildNumber",
"verifyBundle": "gulp verifyBundle",
"webpack": "webpack"
Expand Down