Update esbuild to 0.18.6 (#1092)

Author: msujew

.eslintignore

@@ -1,2 +1,3 @@
 *.js
+*.mjs
 *.monarch.ts

package-lock.json

@@ -24,15 +24,16 @@
     "@types/vscode": "~1.67.0",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
-    "@vitest/coverage-c8": "~0.28.4",
-    "@vitest/ui": "~0.28.4",
+    "@vitest/coverage-c8": "~0.32.2",
+    "@vitest/ui": "~0.32.2",
     "concurrently": "^7.6.0",
+    "esbuild": "^0.18.6",
     "eslint": "^8.33.0",
     "eslint-plugin-header": "^3.1.1",
     "editorconfig": "~1.0.2",
     "shx": "^0.3.4",
     "typescript": "~5.0.4",
-    "vitest": "~0.28.4"
+    "vitest": "~0.32.2"
   },
   "volta": {
     "node": "16.19.0",

package.json

@@ -18,6 +18,6 @@
     "devDependencies": {
         "@types/express": "^4.17.17",
         "shx": "^0.3.4",
-        "esbuild": "^0.16.14"
+        "esbuild": "^0.18.6"
     }
 }

packages/generator-langium/templates/web/.package.json

@@ -1,6 +1,9 @@
 //@ts-check
+import * as esbuild from 'esbuild';
+
 const watch = process.argv.includes('--watch');
 const minify = process.argv.includes('--minify');
+
 const success = watch ? 'Watch build succeeded' : 'Build succeeded';
 
 function getTime() {
@@ -12,22 +15,33 @@ function padZeroes(i) {
     return i.toString().padStart(2, '0');
 }
 
-require('esbuild').build({
-    // Two entry points, one for the extension, one for the language server
+const plugins = [{
+    name: 'watch-plugin',
+    setup(build) {
+        build.onEnd(result => {
+            if (result.errors.length === 0) {
+                console.log(getTime() + success);
+            }
+        });
+    },
+}];
+
+const ctx = await esbuild.context({
     entryPoints: ['src/extension.ts', 'src/language-server/main.ts'],
     outdir: 'out',
     bundle: true,
+    target: "es6",
     loader: { '.ts': 'ts' },
-    external: ['vscode'], // the vscode-module is created on-the-fly and must be excluded.
-    platform: 'node', // VSCode extensions run in a node process
+    external: ['vscode'],
+    platform: 'node',
     sourcemap: !minify,
-    watch: watch ? {
-        onRebuild(error) {
-            if (error) console.error(`${getTime()}Watch build failed`)
-            else console.log(`${getTime()}${success}`)
-        }
-    } : false,
-    minify
-})
-    .then(() => console.log(`${getTime()}${success}`))
-    .catch(() => process.exit(1));
+    minify,
+    plugins
+});
+
+if (watch) {
+    await ctx.watch();
+} else {
+    await ctx.rebuild();
+    ctx.dispose();
+}

packages/langium-vscode/esbuild.js renamed to packages/langium-vscode/esbuild.mjs

@@ -65,10 +65,10 @@
   "scripts": {
     "prepare": "npm run copy:schema",
     "copy:schema": "shx cp ../langium-cli/langium-config-schema.json ./data",
-    "vscode:prepublish": "npm run clean && tsc --noEmit && npm run lint && node esbuild.js --minify && npm run copy:schema",
+    "vscode:prepublish": "npm run clean && tsc --noEmit && npm run lint && node esbuild.mjs --minify && npm run copy:schema",
     "clean": "shx rm -rf out",
-    "build": "node esbuild.js && tsc --noEmit",
-    "watch": "node esbuild.js --watch",
+    "build": "node esbuild.mjs && tsc --noEmit",
+    "watch": "node esbuild.mjs --watch",
     "lint": "eslint src --ext ts"
   },
   "dependencies": {

packages/langium-vscode/package.json

@@ -16,6 +16,7 @@ export default defineConfig({
         },
         deps: {
             interopDefault: true
-        }
+        },
+        include: ['**/*.test.ts']
     }
 });