Skip to content

Commit a90d745

Browse files
committed
Fix: revert VSCode extension to using npm.
pnpm isn't supported by vsce if using imports (see microsoft/vscode-vsce#421).
1 parent 2a0dedf commit a90d745

File tree

5 files changed

+7883
-4729
lines changed

5 files changed

+7883
-4729
lines changed

builder/src/main.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ fn run_install(dev: bool) -> io::Result<()> {
345345
true,
346346
)?;
347347
patch_client_libs()?;
348-
run_script("pnpm", &["install"], "../extensions/VSCode", true)?;
348+
run_script("npm", &["install"], "../extensions/VSCode", true)?;
349349
run_cmd!(
350350
cargo fetch --manifest-path=../builder/Cargo.toml;
351351
cargo fetch;
@@ -366,14 +366,14 @@ fn run_install(dev: bool) -> io::Result<()> {
366366
fn run_update() -> io::Result<()> {
367367
run_script("pnpm", &["update"], "../client", true)?;
368368
patch_client_libs()?;
369-
run_script("pnpm", &["update"], "../extensions/VSCode", true)?;
369+
run_script("npm", &["update"], "../extensions/VSCode", true)?;
370370
run_cmd!(
371371
cargo update --manifest-path=../builder/Cargo.toml;
372372
cargo update;
373373
)?;
374374
// Simply display outdated dependencies, but don't consider them an error.
375375
run_script("pnpm", &["outdated"], "../client", false)?;
376-
run_script("pnpm", &["outdated"], "../extensions/VSCode", false)?;
376+
run_script("npm", &["outdated"], "../extensions/VSCode", false)?;
377377
run_cmd!(
378378
cargo outdated --manifest-path=../builder/Cargo.toml;
379379
cargo outdated;
@@ -413,7 +413,7 @@ fn run_build() -> io::Result<()> {
413413
// Clean out all bundled files before the rebuild.
414414
remove_dir_all_if_exists("../client/static/bundled")?;
415415
run_client_build(false, false)?;
416-
run_script("pnpm", &["run", "compile"], "../extensions/VSCode", true)?;
416+
run_script("npm", &["run", "compile"], "../extensions/VSCode", true)?;
417417
Ok(())
418418
}
419419

@@ -554,13 +554,6 @@ fn run_postrelease(target: &str) -> io::Result<()> {
554554
"../extensions/VSCode/server",
555555
None,
556556
)?;
557-
// `vsce` requires a `package.json`.
558-
run_script(
559-
"npx",
560-
&["json5", "-o", "package.json", "package.json5"],
561-
"../extensions/VSCode",
562-
true,
563-
)?;
564557
run_script(
565558
"npx",
566559
&["vsce", "package", "--target", vsce_target],

0 commit comments

Comments
 (0)