From 0365d0fd7b98ed7cd2e8448b34f8c0d96c776bf9 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Fri, 10 May 2024 10:33:45 -0400 Subject: [PATCH 1/3] delete unused `isWatch` variable from esbuild scripts - was unused after we switched to `wireit` in this commit: https://github.com/SpyglassMC/Spyglass/commit/448369fc94f489365942476f06e2f761f7e3b24e#diff-1342b86e09bdfcf472e71098b2b77d4d9c1fda2cb89e8f633acc90ee1ae00f05 --- packages/playground/esbuild.js | 1 - packages/vscode-extension/esbuild.mjs | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/playground/esbuild.js b/packages/playground/esbuild.js index 654392b95..53865e729 100755 --- a/packages/playground/esbuild.js +++ b/packages/playground/esbuild.js @@ -8,7 +8,6 @@ try { } const isDev = mode !== 'prod' - const isWatch = mode === 'watch' console.info('Start building...') const result = await esbuild.build({ entryPoints: ['./out/index.js'], diff --git a/packages/vscode-extension/esbuild.mjs b/packages/vscode-extension/esbuild.mjs index c711506df..a9035d02e 100755 --- a/packages/vscode-extension/esbuild.mjs +++ b/packages/vscode-extension/esbuild.mjs @@ -8,7 +8,6 @@ try { } const isDev = mode !== 'prod' - const isWatch = mode === 'watch' console.info('Start building...') const result = await esbuild.build({ entryPoints: ['./out/extension.mjs', '../language-server/lib/server.js'], From 02952bf383d5b6dc278c0be1b6b62be9f88cdcf6 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Fri, 10 May 2024 10:34:51 -0400 Subject: [PATCH 2/3] format esbuild scripts --- packages/playground/esbuild.js | 4 ++-- packages/vscode-extension/esbuild.mjs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/playground/esbuild.js b/packages/playground/esbuild.js index 53865e729..febd9556d 100755 --- a/packages/playground/esbuild.js +++ b/packages/playground/esbuild.js @@ -23,11 +23,11 @@ try { logResult(result) } catch (e) { console.error(e) - process.exitCode = 1; + process.exitCode = 1 } /** - * @param {esbuild.BuildResult} result + * @param {esbuild.BuildResult} result */ function logResult(result) { if (result.errors.length === 0) { diff --git a/packages/vscode-extension/esbuild.mjs b/packages/vscode-extension/esbuild.mjs index a9035d02e..eaa573198 100755 --- a/packages/vscode-extension/esbuild.mjs +++ b/packages/vscode-extension/esbuild.mjs @@ -24,11 +24,11 @@ try { logResult(result) } catch (e) { console.error(e) - process.exitCode = 1; + process.exitCode = 1 } /** - * @param {esbuild.BuildResult} result + * @param {esbuild.BuildResult} result */ function logResult(result) { if (result.errors.length === 0) { From 3f4cc126ab8f096988b45aed2904dca024f08bab Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Fri, 10 May 2024 10:40:39 -0400 Subject: [PATCH 3/3] fix breakpoints not binding due to specifying `prod` esbuild script --- packages/playground/package.json | 2 +- packages/vscode-extension/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/playground/package.json b/packages/playground/package.json index 41889989f..27c15e335 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -13,7 +13,7 @@ "deploy": "node deploy.js", "release": "echo TODO", "release:dry": "echo TODO", - "watch": "npm run build --watch" + "watch": "npm run build:dev --watch" }, "wireit": { "build": { diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json index 23b2245ca..d90feb9ff 100644 --- a/packages/vscode-extension/package.json +++ b/packages/vscode-extension/package.json @@ -11,7 +11,7 @@ "build:dev": "wireit", "release": "echo \"DO NOT PUBLISH\"", "release:dry": "echo \"DO NOT PUBLISH (DRY)\"", - "watch": "npm run build --watch" + "watch": "npm run build:dev --watch" }, "wireit": { "build": {