Merge pull request #75 from fujidana/switch-to-pnpm/esbuild

hildjj · web-flow · commit 85d4b7ac382a · 2025-07-18T10:02:33.000-06:00
Switch to pnpm/esbuild
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -11,16 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 22
-          cache: npm
+          cache: pnpm
 
       - name: Install
-        run: npm install
+        run: pnpm install
 
       - name: Lint
-        run: npm run lint
+        run: pnpm run lint
 
       - name: Package
-        run: npm run package
+        run: pnpm run package
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 *.vsix
 /node_modules
 out/
+dist/
+.vscode-test/
 PUBLISHING
 tsconfig.tsbuildinfo
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+enable-pre-post-scripts = true
diff --git a/.vscode-test.mjs b/.vscode-test.mjs
@@ -0,0 +1,5 @@
+import { defineConfig } from '@vscode/test-cli';
+
+export default defineConfig({
+	files: 'out/test/**/*.test.js',
+});
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -4,6 +4,8 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"dbaeumer.vscode-eslint"
+		"dbaeumer.vscode-eslint",
+		"connor4312.esbuild-problem-matchers",
+		"ms-vscode.extension-test-runner"
 	]
-}
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,12 +8,12 @@
 			"name": "Launch Client",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}"
+				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/dist/**/*.js"
 			],
-			"preLaunchTask": "watch:webpack"
+			"preLaunchTask": "${defaultBuildTask}"
 		},
 		{
 			"type": "node",
@@ -22,7 +22,7 @@
 			"port": 6009,
 			"restart": true,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/dist/**/*.js"
 			]
 		}
 	],
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,14 @@
 {
     "files.exclude": {
         "**/.git": true,
-        "**/.DS_Store": true
-    }
-}
+        "**/.DS_Store": true,
+        "out": false, // set this to true to hide the "out" folder with the compiled JS files
+        "dist": false // set this to true to hide the "dist" folder with the compiled JS files
+    },
+    "search.exclude": {
+        "out": true, // set this to false to include "out" folder in search results
+        "dist": true // set this to false to include "dist" folder in search results
+    },
+    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
+    "typescript.tsc.autoDetect": "off"
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -23,46 +23,42 @@
 			]
 		},
 		{
-			"label": "watch:webpack",
+			"label": "npm: watch:esbuild",
 			"type": "npm",
-			"script": "watch:webpack",
+			"script": "watch:esbuild",
 			"isBackground": true,
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
+			"group": "build",
 			"presentation": {
-				"panel": "dedicated",
+				"group": "watch",
 				"reveal": "never"
 			},
-			"problemMatcher": [
-				"$ts-webpack-watch"
-			]
+			"problemMatcher": "$esbuild-watch"
 		},
 		{
-			"label": "watch:tsc-no-emit",
+			"label": "npm: watch:tsc",
 			"type": "npm",
-			"script": "watch:tsc-no-emit",
+			"script": "watch:tsc",
 			"isBackground": true,
 			"group": "build",
 			"presentation": {
-				"panel": "dedicated",
+				"group": "watch",
 				"reveal": "never"
 			},
-			"problemMatcher": [
-				"$tsc-watch"
-			]
+			"problemMatcher": "$tsc-watch"
 		},
 		{
 			"label": "watch",
 			"dependsOn": [
-				"watch:tsc-no-emit",
-				"watch:webpack"
+				"npm: watch:tsc",
+				"npm: watch:esbuild"
 			],
 			"presentation": {
 				"reveal": "never"
 			},
-			"group": "build"
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
 		}
 	]
 }
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,11 +1,14 @@
 .github/
 .gitignore
 .vscode/**
+.vscode-test/**
 **/*.map
 **/*.ts
+**/.vscode-test.*
 **/*.vsix
 **/*webpack.config.js
-**/out/test/**
+esbuild.js
+**/out/**
 **/src/**
 **/test/**
 **/tsconfig.json
@@ -14,4 +17,5 @@ eslint.config.mjs
 images/*.svg
 node_modules/**
 pnpm-lock.yaml
+pnpm-workspace.yaml
 PUBLISHING
diff --git a/client/client.ts b/client/client.ts
@@ -13,7 +13,7 @@ let client: LanguageClient = undefined;
 export function activate(context: ExtensionContext): void {
   // The server is implemented in node
   const serverModule
-    = context.asAbsolutePath(path.join("out", "server.js"));
+    = context.asAbsolutePath(path.join("dist", "server.js"));
 
   // The debug options for the server
   const debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
diff --git a/esbuild.js b/esbuild.js
@@ -0,0 +1,58 @@
+const esbuild = require("esbuild");
+
+const production = process.argv.includes('--production');
+const watch = process.argv.includes('--watch');
+
+/**
+ * @type {import('esbuild').Plugin}
+ */
+const esbuildProblemMatcherPlugin = {
+	name: 'esbuild-problem-matcher',
+
+	setup(build) {
+		build.onStart(() => {
+			console.log('[watch] build started');
+		});
+		build.onEnd((result) => {
+			result.errors.forEach(({ text, location }) => {
+				console.error(`✘ [ERROR] ${text}`);
+				console.error(`    ${location.file}:${location.line}:${location.column}:`);
+			});
+			console.log('[watch] build finished');
+		});
+	},
+};
+
+async function main() {
+	const ctx = await esbuild.context({
+		entryPoints: {
+			"server": "./server/server.ts",
+			"client": "./client/index.ts",
+			"child": "./node_modules/@peggyjs/from-mem/lib/child.js",
+		},
+		bundle: true,
+		format: 'cjs',
+		minify: production,
+		sourcemap: !production,
+		sourcesContent: false,
+		platform: 'node',
+		outdir: './dist',
+		external: ['vscode'],
+		logLevel: 'silent',
+		plugins: [
+			/* add to the end of plugins array */
+			esbuildProblemMatcherPlugin,
+		],
+	});
+	if (watch) {
+		await ctx.watch();
+	} else {
+		await ctx.rebuild();
+		await ctx.dispose();
+	}
+}
+
+main().catch(e => {
+	console.error(e);
+	process.exit(1);
+});
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -7,8 +7,13 @@ export default [
   {
     ignores: [
       "out/**",
+      "dist/**",
       "vendor/**",
       "package-lock.json",
+      "esbuild.js",
+      "test/*.test.ts",
+      ".vscode-test.mjs",
+      ".vscode-test/**",
     ],
   },
   ...commonjs,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/extension.test.ts b/test/extension.test.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/webpack.config.js b/webpack.config.js
