esbuild 0.11.16 → 0.11.20

package/install.js

@@ -1,9 +1,11 @@
 var __defProp = Object.defineProperty;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __objSpread = (a, b) => {
+var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
     if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
@@ -14,13 +16,14 @@ var __objSpread = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const zlib = require("zlib");
 const https = require("https");
 const child_process = require("child_process");
-const version = "0.11.16";
+const version = "0.11.20";
 const binPath = path.join(__dirname, "bin", "esbuild");
 async function installBinaryFromPackage(name, fromPath, toPath) {
   const cachePath = getCachePath(name);
@@ -150,7 +153,7 @@ function installUsingNPM(name, file) {
   const installDir = path.join(os.tmpdir(), "esbuild-" + Math.random().toString(36).slice(2));
   fs.mkdirSync(installDir, {recursive: true});
   fs.writeFileSync(path.join(installDir, "package.json"), "{}");
-  const env = __objSpread(__objSpread({}, process.env), {npm_config_global: void 0});
+  const env = __spreadProps(__spreadValues({}, process.env), {npm_config_global: void 0});
   child_process.execSync(`npm install --loglevel=error --prefer-offline --no-audit --progress=false ${name}@${version}`, {cwd: installDir, stdio: "pipe", env});
   const buffer = fs.readFileSync(path.join(installDir, "node_modules", name, file));
   try {
@@ -235,6 +238,7 @@ const knownUnixlikePackages = {
   "darwin x64 LE": "esbuild-darwin-64",
   "freebsd arm64 LE": "esbuild-freebsd-arm64",
   "freebsd x64 LE": "esbuild-freebsd-64",
+  "openbsd x64 LE": "esbuild-openbsd-64",
   "linux arm LE": "esbuild-linux-arm",
   "linux arm64 LE": "esbuild-linux-arm64",
   "linux ia32 LE": "esbuild-linux-32",

package/lib/main.d.ts

@@ -190,9 +190,9 @@ export interface Plugin {
 export interface PluginBuild {
   initialOptions: BuildOptions;
   onStart(callback: () =>
-    (OnStartResult | null | undefined | Promise<OnStartResult | null | undefined>)): void;
+    (OnStartResult | null | void | Promise<OnStartResult | null | void>)): void;
   onEnd(callback: (result: BuildResult) =>
-    (undefined | Promise<undefined>)): void;
+    (void | Promise<void>)): void;
   onResolve(options: OnResolveOptions, callback: (args: OnResolveArgs) =>
     (OnResolveResult | null | undefined | Promise<OnResolveResult | null | undefined>)): void;
   onLoad(options: OnLoadOptions, callback: (args: OnLoadArgs) =>

package/lib/main.js

@@ -1,9 +1,11 @@
 var __defProp = Object.defineProperty;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __objSpread = (a, b) => {
+var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
     if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
@@ -14,6 +16,7 @@ var __objSpread = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
@@ -251,7 +254,7 @@ function pushLogFlags(flags, options, keys, isTTY2, logLevelDefault) {
   let color = getFlag(options, keys, "color", mustBeBoolean);
   let logLevel = getFlag(options, keys, "logLevel", mustBeString);
   let logLimit = getFlag(options, keys, "logLimit", mustBeInteger);
-  if (color)
+  if (color !== void 0)
     flags.push(`--color=${color}`);
   else if (isTTY2)
     flags.push(`--color=true`);
@@ -683,8 +686,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.11.16") {
-        throw new Error(`Cannot start service: Host version "${"0.11.16"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.11.20") {
+        throw new Error(`Cannot start service: Host version "${"0.11.20"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -909,15 +912,15 @@ function createChannel(streamIn) {
           throw new Error(`Invalid command: ` + request.command);
       }
     };
-    let runOnEndCallbacks = (result, done) => done();
+    let runOnEndCallbacks = (result, logPluginError, done) => done();
     if (onEndCallbacks.length > 0) {
-      runOnEndCallbacks = (result, done) => {
+      runOnEndCallbacks = (result, logPluginError, done) => {
         (async () => {
           for (const {name, callback: callback2, note} of onEndCallbacks) {
             try {
               await callback2(result);
             } catch (e) {
-              result.errors.push(extractErrorMessageV8(e, streamIn, stash, note && note(), name));
+              result.errors.push(await new Promise((resolve) => logPluginError(e, name, note && note(), resolve)));
             }
           }
         })().then(done);
@@ -992,15 +995,20 @@ function createChannel(streamIn) {
         plugins = value;
       }
     }
-    let handleError = (e, pluginName) => {
+    let logPluginError = (e, pluginName, note, done) => {
       let flags = [];
       try {
         pushLogFlags(flags, options, {}, isTTY2, buildLogLevelDefault);
       } catch (e2) {
       }
-      const error = extractErrorMessageV8(e, streamIn, details, void 0, pluginName);
-      sendRequest(refs, {command: "error", flags, error}, () => {
-        error.detail = details.load(error.detail);
+      const message = extractErrorMessageV8(e, streamIn, details, note, pluginName);
+      sendRequest(refs, {command: "error", flags, error: message}, () => {
+        message.detail = details.load(message.detail);
+        done(message);
+      });
+    };
+    let handleError = (e, pluginName) => {
+      logPluginError(e, pluginName, void 0, (error) => {
         callback(failureErrorWithLog("Build failed", [error], []), null);
       });
     };
@@ -1012,9 +1020,10 @@ function createChannel(streamIn) {
           handleError(result.error, result.pluginName);
         } else {
           try {
-            buildOrServeContinue(__objSpread(__objSpread({}, args), {
+            buildOrServeContinue(__spreadProps(__spreadValues({}, args), {
               key,
               details,
+              logPluginError,
               requestPlugins: result.requestPlugins,
               runOnEndCallbacks: result.runOnEndCallbacks,
               pluginRefs: result.pluginRefs
@@ -1026,11 +1035,12 @@ function createChannel(streamIn) {
       }, (e) => handleError(e, ""));
     } else {
       try {
-        buildOrServeContinue(__objSpread(__objSpread({}, args), {
+        buildOrServeContinue(__spreadProps(__spreadValues({}, args), {
           key,
           details,
+          logPluginError,
           requestPlugins: null,
-          runOnEndCallbacks: (result, done) => done(),
+          runOnEndCallbacks: (result, logPluginError2, done) => done(),
           pluginRefs: null
         }));
       } catch (e) {
@@ -1048,6 +1058,7 @@ function createChannel(streamIn) {
     callback,
     key,
     details,
+    logPluginError,
     requestPlugins,
     runOnEndCallbacks,
     pluginRefs
@@ -1109,7 +1120,7 @@ function createChannel(streamIn) {
         warnings: replaceDetailsInMessages(response.warnings, details)
       };
       copyResponseToResult(response, result);
-      runOnEndCallbacks(result, () => {
+      runOnEndCallbacks(result, logPluginError, () => {
         if (result.errors.length > 0) {
           return callback2(failureErrorWithLog("Build failed", result.errors, result.warnings), null);
         }
@@ -1168,13 +1179,13 @@ function createChannel(streamIn) {
                   errors: replaceDetailsInMessages(watchResponse.errors, details),
                   warnings: replaceDetailsInMessages(watchResponse.warnings, details)
                 };
-                runOnEndCallbacks(result2, () => {
+                copyResponseToResult(watchResponse, result2);
+                runOnEndCallbacks(result2, logPluginError, () => {
                   if (result2.errors.length > 0) {
                     if (watch.onRebuild)
                       watch.onRebuild(failureErrorWithLog("Build failed", result2.errors, result2.warnings), null);
                     return;
                   }
-                  copyResponseToResult(watchResponse, result2);
                   if (watchResponse.rebuildID !== void 0)
                     result2.rebuild = rebuild;
                   result2.stop = stop;
@@ -1538,6 +1549,11 @@ var esbuildCommandAndArgs = () => {
   if (process.env.ESBUILD_BINARY_PATH) {
     return [path.resolve(process.env.ESBUILD_BINARY_PATH), []];
   }
+  if (path.basename(__filename) !== "main.js" || path.basename(__dirname) !== "lib") {
+    throw new Error(`The esbuild JavaScript API cannot be bundled. Please mark the "esbuild" package as external so it's not included in the bundle.
+
+More information: The file containing the code for esbuild's JavaScript API (${__filename}) does not appear to be inside the esbuild package on the file system, which usually means that the esbuild package was bundled into another file. This is problematic because the API needs to run a binary executable inside the esbuild package which is located using a relative path from the API code to the executable. If the esbuild package is bundled, the relative path will be incorrect and the executable won't be found.`);
+  }
   if (false) {
     return ["node", [path.join(__dirname, "..", "bin", "esbuild")]];
   }
@@ -1597,7 +1613,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.11.16";
+var version = "0.11.20";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -1685,7 +1701,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.11.16"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.11.20"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -1783,7 +1799,7 @@ var runServiceSync = (callback) => {
     isBrowser: false
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.11.16"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.11.20"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.11.16",
+  "version": "0.11.20",
   "description": "An extremely fast JavaScript bundler and minifier.",
   "repository": "https://github.com/evanw/esbuild",
   "scripts": {