Upgrade esbuild (#680)

package.json

@@ -62,12 +62,12 @@
     "@types/node": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
-    "@vanilla-extract/esbuild-plugin": "^2.0.0",
-    "@vitest/coverage-istanbul": "^2.0.0",
+    "@vanilla-extract/esbuild-plugin": "^2.3.11",
+    "@vitest/coverage-istanbul": "^2.1.4",
     "concurrently": "^7.1.0",
     "del-cli": "^4.0.1",
-    "esbuild": "0.14.35",
-    "esbuild-node-externals": "^1.0.2",
+    "esbuild": "0.23.1",
+    "esbuild-node-externals": "^1.7.0",
     "eslint": "^7.23.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
@@ -102,6 +102,7 @@
     "@braintree/sanitize-url": "^6.0.0",
     "@types/react": "^18.0.26",
     "commander": "^9.4.0",
+    "esbuild": "0.23.1",
     "json5": "^1.0.2"
   },
   "lint-staged": {

packages/cli/package.json

@@ -26,7 +26,7 @@
   "scripts": {
     "build": "npm-run-all --parallel build:*",
     "build:types": "tsc",
-    "build:cli": "node ./scripts/bundle.js",
+    "build:cli": "node ./scripts/bundle.mjs",
     "clean": "rm -fr dist",
     "docker:build": "docker build . --tag mosaic-fs:latest",
     "docker:start": "docker run -it --rm --ipc=host -p 8080:8080 --mount source=docs,destination=/app/docs --network mosaic-net --name mosaic-fs mosaic-fs:latest",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@jpmorganchase/mosaic-types": "^0.1.0-beta.89",
-    "esbuild": "0.14.35",
+    "esbuild": "0.23.1",
     "esbuild-node-externals": "^1.0.2",
     "fast-glob": "^3.2.7",
     "@types/ws": "^8.5.7"

packages/cli/scripts/bundle.mjs

@@ -0,0 +1,44 @@
+import glob from 'fast-glob';
+import esbuild from 'esbuild';
+import { nodeExternalsPlugin } from 'esbuild-node-externals';
+
+const args = process.argv.slice(2);
+const watchEnabled = args[0] === 'watch';
+const packageName = process.env.npm_package_name;
+
+try {
+  const context = await esbuild.context({
+    entryPoints: glob.sync(['src/**/*.ts?(x)', 'src/*.ts?(x)'], {
+      ignore: ['**/__tests__', 'src/labs']
+    }),
+    outdir: './dist',
+    outExtension: { '.js': '.mjs' },
+    bundle: true,
+    sourcemap: false,
+    splitting: true,
+    minify: true,
+    format: 'esm',
+    target: ['es2022', 'node18'],
+    platform: 'node',
+    plugins: [nodeExternalsPlugin()]
+  });
+  await context.rebuild();
+  if (watchEnabled) {
+    await context.watch();
+  }
+  await context.serve();
+  context.dispose();
+} catch (e) {
+  if (e.errors && e.errors.length > 0) {
+    console.group(`!!!!!!! ${packageName} build errors !!!!!!!`);
+    console.error(e.errors);
+    console.groupEnd();
+  }
+
+  if (e.warnings && e.warnings.length > 0) {
+    console.group(`!!!!!!! ${packageName} build warnings !!!!!!!`);
+    console.error(e.warnings);
+    console.groupEnd();
+  }
+  process.exit(1);
+}

packages/components-labs/package.json

@@ -27,15 +27,15 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:components": "node ../../scripts/bundle.js",
+    "build:components": "node ../../scripts/bundle.mjs",
     "build:types": "tsc",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "@types/styled-components": "^5.1.26",
-    "@vanilla-extract/esbuild-plugin": "^2.0.2",
+    "@vanilla-extract/esbuild-plugin": "^2.3.11",
     "del-cli": "^4.0.1",
     "typescript": "^4.8.3"
   },

packages/components/package.json

@@ -29,11 +29,11 @@
   "scripts": {
     "build": "npm-run-all --parallel build:*",
     "build:types": "tsc",
-    "build:components": "node  ../../scripts/bundle.js",
+    "build:components": "node  ../../scripts/bundle.mjs",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
     "doc": "node ../../scripts/updateDocs.js",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "react": "^18.2.0",

packages/content-editor-plugin/package.json

@@ -28,11 +28,11 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ../../scripts/bundle.js",
+    "build:bundle": "node ../../scripts/bundle.mjs",
     "build:types": "tsc",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "typescript": "^4.8.3"

packages/create-site/package.json

@@ -11,10 +11,10 @@
   "main": "./dist/index.js",
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ./scripts/bundle.js",
+    "build:bundle": "node ./scripts/bundle.mjs",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "watch": "node ./scripts/bundle.js watch"
+    "watch": "node ./scripts/bundle.mjs watch"
   },
   "bin": {
     "mosaic-create-site": "./bin/mosaic-create-site.js"

packages/create-site/scripts/bundle.js → packages/create-site/scripts/bundle.mjs

@@ -1,36 +1,38 @@
-const esbuild = require('esbuild');
+import esbuild from 'esbuild';
 
 const args = process.argv.slice(2);
 const watchEnabled = args[0] === 'watch';
 const packageName = process.env.npm_package_name;
 
-const watchConfig = watchEnabled
-  ? {
-      onRebuild(error, result) {
-        if (error) console.error(`watch build failed for ${packageName}:`, error);
-        else console.log(`watch build succeeded for ${packageName}:`, result);
-      }
-    }
-  : false;
-
 try {
-  esbuild.build({
+  const context = await esbuild.context({
     entryPoints: ['src/create.ts', 'src/init.ts'],
     bundle: false,
     outdir: 'dist',
     outExtension: { '.js': '.mjs' },
     platform: 'node',
     format: 'esm',
-    watch: watchConfig
-  });
-  esbuild.build({
-    entryPoints: ['src/index.ts'],
-    bundle: false,
-    outdir: 'dist',
-    platform: 'node',
-    format: 'cjs',
-    watch: watchConfig
+    plugins: [
+      {
+        name: 'on-end',
+        setup(build) {
+          build.onEnd(({ errors = [] }) => {
+            if (errors.length) {
+              console.error(`build failed for ${packageName}:`, errors);
+            } else {
+              console.log(`build succeeded for ${packageName}:`);
+            }
+          });
+        }
+      }
+    ]
   });
+  await context.rebuild();
+  if (watchEnabled) {
+    await context.watch();
+  }
+  await context.serve();
+  context.dispose();
 } catch (e) {
   if (e.errors && e.errors.length > 0) {
     console.group(`!!!!!!! ${packageName} build errors !!!!!!!`);
@@ -43,6 +45,5 @@ try {
     console.error(e.warnings);
     console.groupEnd();
   }
-
   process.exit(1);
 }

packages/layouts/package.json

@@ -28,11 +28,11 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ../../scripts/bundle.js",
+    "build:bundle": "node ../../scripts/bundle.mjs",
     "build:types": "tsc",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "del-cli": "^4.0.1",

packages/open-api-component/package.json

@@ -28,11 +28,11 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ../../scripts/bundle.js",
+    "build:bundle": "node ../../scripts/bundle.mjs",
     "build:types": "tsc",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "del-cli": "^4.0.1",

packages/site-components/package.json

@@ -23,18 +23,18 @@
   },
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ../../scripts/bundle.js",
+    "build:bundle": "node ../../scripts/bundle.mjs",
     "build:types": "tsc",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ../../scripts/bundle.js watch"
+    "dev": "node ../../scripts/bundle.mjs watch"
   },
   "files": [
     "dist"
   ],
   "devDependencies": {
     "@types/styled-components": "^5.1.26",
-    "@vanilla-extract/esbuild-plugin": "^2.0.2",
+    "@vanilla-extract/esbuild-plugin": "^2.3.11",
     "del-cli": "^4.0.1",
     "next-router-mock": "^0.9.13",
     "typescript": "^4.8.3"

packages/site-preset-styles/package.json

@@ -19,14 +19,14 @@
   ],
   "scripts": {
     "build": "npm-run-all --parallel build:*",
-    "build:bundle": "node ./scripts/bundle.js",
+    "build:bundle": "node ./scripts/bundle.mjs",
     "clean": "npx del-cli 'dist/**' && find . -type d -empty -delete",
     "lint": "eslint --ignore-pattern \"**/__tests__/**\"",
-    "dev": "node ./scripts/bundle.js watch"
+    "dev": "node ./scripts/bundle.mjs watch"
   },
   "devDependencies": {
     "del-cli": "^4.0.1",
-    "esbuild": "0.14.35",
+    "esbuild": "0.23.1",
     "esbuild-node-externals": "^1.0.2"
   },
   "dependencies": {