esbuild 0.15.18 → 0.16.1

package/bin/esbuild

@@ -24,35 +24,35 @@ var fs = require("fs");
 var os = require("os");
 var path = require("path");
 var ESBUILD_BINARY_PATH = process.env.ESBUILD_BINARY_PATH || ESBUILD_BINARY_PATH;
-var packageDarwin_arm64 = "esbuild-darwin-arm64";
-var packageDarwin_x64 = "esbuild-darwin-64";
+var packageDarwin_arm64 = "@esbuild/darwin-arm64";
+var packageDarwin_x64 = "@esbuild/darwin-x64";
 var knownWindowsPackages = {
-  "win32 arm64 LE": "esbuild-windows-arm64",
-  "win32 ia32 LE": "esbuild-windows-32",
-  "win32 x64 LE": "esbuild-windows-64"
+  "win32 arm64 LE": "@esbuild/win32-arm64",
+  "win32 ia32 LE": "@esbuild/win32-ia32",
+  "win32 x64 LE": "@esbuild/win32-x64"
 };
 var knownUnixlikePackages = {
-  "android arm64 LE": "esbuild-android-arm64",
-  "darwin arm64 LE": "esbuild-darwin-arm64",
-  "darwin x64 LE": "esbuild-darwin-64",
-  "freebsd arm64 LE": "esbuild-freebsd-arm64",
-  "freebsd x64 LE": "esbuild-freebsd-64",
-  "linux arm LE": "esbuild-linux-arm",
-  "linux arm64 LE": "esbuild-linux-arm64",
-  "linux ia32 LE": "esbuild-linux-32",
-  "linux mips64el LE": "esbuild-linux-mips64le",
-  "linux ppc64 LE": "esbuild-linux-ppc64le",
-  "linux riscv64 LE": "esbuild-linux-riscv64",
-  "linux s390x BE": "esbuild-linux-s390x",
-  "linux x64 LE": "esbuild-linux-64",
+  "android arm64 LE": "@esbuild/android-arm64",
+  "darwin arm64 LE": "@esbuild/darwin-arm64",
+  "darwin x64 LE": "@esbuild/darwin-x64",
+  "freebsd arm64 LE": "@esbuild/freebsd-arm64",
+  "freebsd x64 LE": "@esbuild/freebsd-x64",
+  "linux arm LE": "@esbuild/linux-arm",
+  "linux arm64 LE": "@esbuild/linux-arm64",
+  "linux ia32 LE": "@esbuild/linux-ia32",
+  "linux mips64el LE": "@esbuild/linux-mips64el",
+  "linux ppc64 LE": "@esbuild/linux-ppc64",
+  "linux riscv64 LE": "@esbuild/linux-riscv64",
+  "linux s390x BE": "@esbuild/linux-s390x",
+  "linux x64 LE": "@esbuild/linux-x64",
   "linux loong64 LE": "@esbuild/linux-loong64",
-  "netbsd x64 LE": "esbuild-netbsd-64",
-  "openbsd x64 LE": "esbuild-openbsd-64",
-  "sunos x64 LE": "esbuild-sunos-64"
+  "netbsd x64 LE": "@esbuild/netbsd-x64",
+  "openbsd x64 LE": "@esbuild/openbsd-x64",
+  "sunos x64 LE": "@esbuild/sunos-x64"
 };
 var knownWebAssemblyFallbackPackages = {
   "android arm LE": "@esbuild/android-arm",
-  "android x64 LE": "esbuild-android-64"
+  "android x64 LE": "@esbuild/android-x64"
 };
 function pkgAndSubpathForCurrentPlatform() {
   let pkg;
@@ -190,7 +190,7 @@ for your current platform.`);
         "node_modules",
         ".cache",
         "esbuild",
-        `pnpapi-${pkg}-${"0.15.18"}-${path.basename(subpath)}`
+        `pnpapi-${pkg}-${"0.16.1"}-${path.basename(subpath)}`
       );
       if (!fs.existsSync(binTargetPath)) {
         fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });

package/install.js

@@ -24,32 +24,32 @@ var os = require("os");
 var path = require("path");
 var ESBUILD_BINARY_PATH = process.env.ESBUILD_BINARY_PATH || ESBUILD_BINARY_PATH;
 var knownWindowsPackages = {
-  "win32 arm64 LE": "esbuild-windows-arm64",
-  "win32 ia32 LE": "esbuild-windows-32",
-  "win32 x64 LE": "esbuild-windows-64"
+  "win32 arm64 LE": "@esbuild/win32-arm64",
+  "win32 ia32 LE": "@esbuild/win32-ia32",
+  "win32 x64 LE": "@esbuild/win32-x64"
 };
 var knownUnixlikePackages = {
-  "android arm64 LE": "esbuild-android-arm64",
-  "darwin arm64 LE": "esbuild-darwin-arm64",
-  "darwin x64 LE": "esbuild-darwin-64",
-  "freebsd arm64 LE": "esbuild-freebsd-arm64",
-  "freebsd x64 LE": "esbuild-freebsd-64",
-  "linux arm LE": "esbuild-linux-arm",
-  "linux arm64 LE": "esbuild-linux-arm64",
-  "linux ia32 LE": "esbuild-linux-32",
-  "linux mips64el LE": "esbuild-linux-mips64le",
-  "linux ppc64 LE": "esbuild-linux-ppc64le",
-  "linux riscv64 LE": "esbuild-linux-riscv64",
-  "linux s390x BE": "esbuild-linux-s390x",
-  "linux x64 LE": "esbuild-linux-64",
+  "android arm64 LE": "@esbuild/android-arm64",
+  "darwin arm64 LE": "@esbuild/darwin-arm64",
+  "darwin x64 LE": "@esbuild/darwin-x64",
+  "freebsd arm64 LE": "@esbuild/freebsd-arm64",
+  "freebsd x64 LE": "@esbuild/freebsd-x64",
+  "linux arm LE": "@esbuild/linux-arm",
+  "linux arm64 LE": "@esbuild/linux-arm64",
+  "linux ia32 LE": "@esbuild/linux-ia32",
+  "linux mips64el LE": "@esbuild/linux-mips64el",
+  "linux ppc64 LE": "@esbuild/linux-ppc64",
+  "linux riscv64 LE": "@esbuild/linux-riscv64",
+  "linux s390x BE": "@esbuild/linux-s390x",
+  "linux x64 LE": "@esbuild/linux-x64",
   "linux loong64 LE": "@esbuild/linux-loong64",
-  "netbsd x64 LE": "esbuild-netbsd-64",
-  "openbsd x64 LE": "esbuild-openbsd-64",
-  "sunos x64 LE": "esbuild-sunos-64"
+  "netbsd x64 LE": "@esbuild/netbsd-x64",
+  "openbsd x64 LE": "@esbuild/openbsd-x64",
+  "sunos x64 LE": "@esbuild/sunos-x64"
 };
 var knownWebAssemblyFallbackPackages = {
   "android arm LE": "@esbuild/android-arm",
-  "android x64 LE": "esbuild-android-64"
+  "android x64 LE": "@esbuild/android-x64"
 };
 function pkgAndSubpathForCurrentPlatform() {
   let pkg;
@@ -90,8 +90,8 @@ function validateBinaryVersion(...command) {
   const stdout = child_process.execFileSync(command.shift(), command, {
     stdio: "pipe"
   }).toString().trim();
-  if (stdout !== "0.15.18") {
-    throw new Error(`Expected ${JSON.stringify("0.15.18")} but got ${JSON.stringify(stdout)}`);
+  if (stdout !== "0.16.1") {
+    throw new Error(`Expected ${JSON.stringify("0.16.1")} but got ${JSON.stringify(stdout)}`);
   }
 }
 function isYarn() {
@@ -143,7 +143,7 @@ function installUsingNPM(pkg, subpath, binPath) {
   try {
     fs2.writeFileSync(path2.join(installDir, "package.json"), "{}");
     child_process.execSync(
-      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.15.18"}`,
+      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.16.1"}`,
       { cwd: installDir, stdio: "pipe", env }
     );
     const installedBinPath = path2.join(installDir, "node_modules", pkg, subpath);
@@ -194,7 +194,7 @@ function maybeOptimizePackage(binPath) {
   }
 }
 async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
-  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.15.18"}.tgz`;
+  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.16.1"}.tgz`;
   console.error(`[esbuild] Trying to download ${JSON.stringify(url)}`);
   try {
     fs2.writeFileSync(binPath, extractFileFromTarGzip(await fetch(url), subpath));

package/lib/main.d.ts

@@ -193,8 +193,8 @@ export interface OutputFile {
   path: string;
   /** "text" as bytes */
   contents: Uint8Array;
-  /** "contents" as text */
-  text: string;
+  /** "contents" as text (changes automatically with "contents") */
+  get text(): string;
 }
 
 export interface BuildInvalidate {

package/lib/main.js

@@ -175,26 +175,30 @@ var ByteBuffer = class {
 };
 var encodeUTF8;
 var decodeUTF8;
+var encodeInvariant;
 if (typeof TextEncoder !== "undefined" && typeof TextDecoder !== "undefined") {
   let encoder = new TextEncoder();
   let decoder = new TextDecoder();
   encodeUTF8 = (text) => encoder.encode(text);
   decodeUTF8 = (bytes) => decoder.decode(bytes);
+  encodeInvariant = 'new TextEncoder().encode("")';
 } else if (typeof Buffer !== "undefined") {
-  encodeUTF8 = (text) => {
-    let buffer = Buffer.from(text);
-    if (!(buffer instanceof Uint8Array)) {
-      buffer = new Uint8Array(buffer);
-    }
-    return buffer;
-  };
+  encodeUTF8 = (text) => Buffer.from(text);
   decodeUTF8 = (bytes) => {
     let { buffer, byteOffset, byteLength } = bytes;
     return Buffer.from(buffer, byteOffset, byteLength).toString();
   };
+  encodeInvariant = 'Buffer.from("")';
 } else {
   throw new Error("No UTF-8 codec found");
 }
+if (!(encodeUTF8("") instanceof Uint8Array))
+  throw new Error(`Invariant violation: "${encodeInvariant} instanceof Uint8Array" is incorrectly false
+
+This indicates that your JavaScript environment is broken. You cannot use
+esbuild in this environment because esbuild relies on this invariant. This
+is not a problem with esbuild. You need to fix your environment instead.
+`);
 function readUInt32LE(buffer, offset) {
   return buffer[offset++] | buffer[offset++] << 8 | buffer[offset++] << 16 | buffer[offset++] << 24;
 }
@@ -206,10 +210,11 @@ function writeUInt32LE(buffer, value, offset) {
 }
 
 // lib/shared/common.ts
+var quote = JSON.stringify;
 var buildLogLevelDefault = "warning";
 var transformLogLevelDefault = "silent";
 function validateTarget(target) {
-  target += "";
+  validateStringValue(target, "target");
   if (target.indexOf(",") >= 0)
     throw new Error(`Invalid target: ${target}`);
   return target;
@@ -238,13 +243,13 @@ function getFlag(object, keys, key, mustBeFn) {
     return void 0;
   let mustBe = mustBeFn(value);
   if (mustBe !== null)
-    throw new Error(`"${key}" must be ${mustBe}`);
+    throw new Error(`${quote(key)} must be ${mustBe}`);
   return value;
 }
 function checkForInvalidFlags(object, keys, where) {
   for (let key in object) {
     if (!(key in keys)) {
-      throw new Error(`Invalid option ${where}: "${key}"`);
+      throw new Error(`Invalid option ${where}: ${quote(key)}`);
     }
   }
 }
@@ -264,12 +269,12 @@ function validateMangleCache(mangleCache) {
   let validated;
   if (mangleCache !== void 0) {
     validated = /* @__PURE__ */ Object.create(null);
-    for (let key of Object.keys(mangleCache)) {
+    for (let key in mangleCache) {
       let value = mangleCache[key];
       if (typeof value === "string" || value === false) {
         validated[key] = value;
       } else {
-        throw new Error(`Expected ${JSON.stringify(key)} in mangle cache to map to either a string or false`);
+        throw new Error(`Expected ${quote(key)} in mangle cache to map to either a string or false`);
       }
     }
   }
@@ -286,6 +291,12 @@ function pushLogFlags(flags, options, keys, isTTY2, logLevelDefault) {
   flags.push(`--log-level=${logLevel || logLevelDefault}`);
   flags.push(`--log-limit=${logLimit || 0}`);
 }
+function validateStringValue(value, what, key) {
+  if (typeof value !== "string") {
+    throw new Error(`Expected value for ${what}${key !== void 0 ? " " + quote(key) : ""} to be a string, got ${typeof value} instead`);
+  }
+  return value;
+}
 function pushCommonFlags(flags, options, keys) {
   let legalComments = getFlag(options, keys, "legalComments", mustBeString);
   let sourceRoot = getFlag(options, keys, "sourceRoot", mustBeString);
@@ -350,7 +361,7 @@ function pushCommonFlags(flags, options, keys) {
     flags.push(`--ignore-annotations`);
   if (drop)
     for (let what of drop)
-      flags.push(`--drop:${what}`);
+      flags.push(`--drop:${validateStringValue(what, "drop")}`);
   if (mangleProps)
     flags.push(`--mangle-props=${mangleProps.source}`);
   if (reserveProps)
@@ -373,26 +384,29 @@ function pushCommonFlags(flags, options, keys) {
     for (let key in define) {
       if (key.indexOf("=") >= 0)
         throw new Error(`Invalid define: ${key}`);
-      flags.push(`--define:${key}=${define[key]}`);
+      flags.push(`--define:${key}=${validateStringValue(define[key], "define", key)}`);
     }
   }
   if (logOverride) {
     for (let key in logOverride) {
       if (key.indexOf("=") >= 0)
         throw new Error(`Invalid log override: ${key}`);
-      flags.push(`--log-override:${key}=${logOverride[key]}`);
+      flags.push(`--log-override:${key}=${validateStringValue(logOverride[key], "log override", key)}`);
     }
   }
   if (supported) {
     for (let key in supported) {
       if (key.indexOf("=") >= 0)
         throw new Error(`Invalid supported: ${key}`);
-      flags.push(`--supported:${key}=${supported[key]}`);
+      const value = supported[key];
+      if (typeof value !== "boolean")
+        throw new Error(`Expected value for supported ${quote(key)} to be a boolean, got ${typeof value} instead`);
+      flags.push(`--supported:${key}=${value}`);
     }
   }
   if (pure)
     for (let fn of pure)
-      flags.push(`--pure:${fn}`);
+      flags.push(`--pure:${validateStringValue(fn, "pure")}`);
   if (keepNames)
     flags.push(`--keep-names`);
 }
@@ -474,7 +488,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   if (resolveExtensions) {
     let values = [];
     for (let value of resolveExtensions) {
-      value += "";
+      validateStringValue(value, "resolve extension");
       if (value.indexOf(",") >= 0)
         throw new Error(`Invalid resolve extension: ${value}`);
       values.push(value);
@@ -492,7 +506,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   if (mainFields) {
     let values = [];
     for (let value of mainFields) {
-      value += "";
+      validateStringValue(value, "main field");
       if (value.indexOf(",") >= 0)
         throw new Error(`Invalid main field: ${value}`);
       values.push(value);
@@ -502,7 +516,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   if (conditions) {
     let values = [];
     for (let value of conditions) {
-      value += "";
+      validateStringValue(value, "condition");
       if (value.indexOf(",") >= 0)
         throw new Error(`Invalid condition: ${value}`);
       values.push(value);
@@ -511,53 +525,53 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   }
   if (external)
     for (let name of external)
-      flags.push(`--external:${name}`);
+      flags.push(`--external:${validateStringValue(name, "external")}`);
   if (alias) {
     for (let old in alias) {
       if (old.indexOf("=") >= 0)
         throw new Error(`Invalid package name in alias: ${old}`);
-      flags.push(`--alias:${old}=${alias[old]}`);
+      flags.push(`--alias:${old}=${validateStringValue(alias[old], "alias", old)}`);
     }
   }
   if (banner) {
     for (let type in banner) {
       if (type.indexOf("=") >= 0)
         throw new Error(`Invalid banner file type: ${type}`);
-      flags.push(`--banner:${type}=${banner[type]}`);
+      flags.push(`--banner:${type}=${validateStringValue(banner[type], "banner", type)}`);
     }
   }
   if (footer) {
     for (let type in footer) {
       if (type.indexOf("=") >= 0)
         throw new Error(`Invalid footer file type: ${type}`);
-      flags.push(`--footer:${type}=${footer[type]}`);
+      flags.push(`--footer:${type}=${validateStringValue(footer[type], "footer", type)}`);
     }
   }
   if (inject)
     for (let path3 of inject)
-      flags.push(`--inject:${path3}`);
+      flags.push(`--inject:${validateStringValue(path3, "inject")}`);
   if (loader) {
     for (let ext in loader) {
       if (ext.indexOf("=") >= 0)
         throw new Error(`Invalid loader extension: ${ext}`);
-      flags.push(`--loader:${ext}=${loader[ext]}`);
+      flags.push(`--loader:${ext}=${validateStringValue(loader[ext], "loader", ext)}`);
     }
   }
   if (outExtension) {
     for (let ext in outExtension) {
       if (ext.indexOf("=") >= 0)
         throw new Error(`Invalid out extension: ${ext}`);
-      flags.push(`--out-extension:${ext}=${outExtension[ext]}`);
+      flags.push(`--out-extension:${ext}=${validateStringValue(outExtension[ext], "out extension", ext)}`);
     }
   }
   if (entryPoints) {
     if (Array.isArray(entryPoints)) {
       for (let entryPoint of entryPoints) {
-        entries.push(["", entryPoint + ""]);
+        entries.push(["", validateStringValue(entryPoint, "entry point")]);
       }
     } else {
-      for (let [key, value] of Object.entries(entryPoints)) {
-        entries.push([key + "", value + ""]);
+      for (let key in entryPoints) {
+        entries.push([key, validateStringValue(entryPoints[key], "entry point", key)]);
       }
     }
   }
@@ -573,7 +587,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
     if (loader2)
       flags.push(`--loader=${loader2}`);
     if (resolveDir)
-      stdinResolveDir = resolveDir + "";
+      stdinResolveDir = resolveDir;
     if (typeof contents === "string")
       stdinContents = encodeUTF8(contents);
     else if (contents instanceof Uint8Array)
@@ -718,8 +732,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.15.18") {
-        throw new Error(`Cannot start service: Host version "${"0.15.18"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.16.1") {
+        throw new Error(`Cannot start service: Host version "${"0.16.1"}" does not match binary version ${quote(binaryVersion)}`);
       }
       return;
     }
@@ -1201,7 +1215,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
       let setup = getFlag(item, keys, "setup", mustBeFunction);
       if (typeof setup !== "function")
         throw new Error(`Plugin is missing a setup function`);
-      checkForInvalidFlags(item, keys, `on plugin ${JSON.stringify(name)}`);
+      checkForInvalidFlags(item, keys, `on plugin ${quote(name)}`);
       let plugin = {
         name,
         onResolve: [],
@@ -1238,6 +1252,8 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
             request.resolveDir = resolveDir;
           if (kind != null)
             request.kind = kind;
+          else
+            throw new Error(`Must specify "kind" when calling "resolve"`);
           if (pluginData != null)
             request.pluginData = details.store(pluginData);
           sendRequest(refs, request, (error, response) => {
@@ -1276,7 +1292,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           let keys2 = {};
           let filter = getFlag(options, keys2, "filter", mustBeRegExp);
           let namespace = getFlag(options, keys2, "namespace", mustBeString);
-          checkForInvalidFlags(options, keys2, `in onResolve() call for plugin ${JSON.stringify(name)}`);
+          checkForInvalidFlags(options, keys2, `in onResolve() call for plugin ${quote(name)}`);
           if (filter == null)
             throw new Error(`onResolve() call is missing a filter`);
           let id = nextCallbackID++;
@@ -1289,7 +1305,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           let keys2 = {};
           let filter = getFlag(options, keys2, "filter", mustBeRegExp);
           let namespace = getFlag(options, keys2, "namespace", mustBeString);
-          checkForInvalidFlags(options, keys2, `in onLoad() call for plugin ${JSON.stringify(name)}`);
+          checkForInvalidFlags(options, keys2, `in onLoad() call for plugin ${quote(name)}`);
           if (filter == null)
             throw new Error(`onLoad() call is missing a filter`);
           let id = nextCallbackID++;
@@ -1312,11 +1328,11 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
         let result = await callback();
         if (result != null) {
           if (typeof result !== "object")
-            throw new Error(`Expected onStart() callback in plugin ${JSON.stringify(name)} to return an object`);
+            throw new Error(`Expected onStart() callback in plugin ${quote(name)} to return an object`);
           let keys = {};
           let errors = getFlag(result, keys, "errors", mustBeArray);
           let warnings = getFlag(result, keys, "warnings", mustBeArray);
-          checkForInvalidFlags(result, keys, `from onStart() callback in plugin ${JSON.stringify(name)}`);
+          checkForInvalidFlags(result, keys, `from onStart() callback in plugin ${quote(name)}`);
           if (errors != null)
             response.errors.push(...sanitizeMessages(errors, "errors", details, name));
           if (warnings != null)
@@ -1343,7 +1359,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
         });
         if (result != null) {
           if (typeof result !== "object")
-            throw new Error(`Expected onResolve() callback in plugin ${JSON.stringify(name)} to return an object`);
+            throw new Error(`Expected onResolve() callback in plugin ${quote(name)} to return an object`);
           let keys = {};
           let pluginName = getFlag(result, keys, "pluginName", mustBeString);
           let path3 = getFlag(result, keys, "path", mustBeString);
@@ -1356,7 +1372,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           let warnings = getFlag(result, keys, "warnings", mustBeArray);
           let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
           let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
-          checkForInvalidFlags(result, keys, `from onResolve() callback in plugin ${JSON.stringify(name)}`);
+          checkForInvalidFlags(result, keys, `from onResolve() callback in plugin ${quote(name)}`);
           response.id = id2;
           if (pluginName != null)
             response.pluginName = pluginName;
@@ -1402,7 +1418,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
         });
         if (result != null) {
           if (typeof result !== "object")
-            throw new Error(`Expected onLoad() callback in plugin ${JSON.stringify(name)} to return an object`);
+            throw new Error(`Expected onLoad() callback in plugin ${quote(name)} to return an object`);
           let keys = {};
           let pluginName = getFlag(result, keys, "pluginName", mustBeString);
           let contents = getFlag(result, keys, "contents", mustBeStringOrUint8Array);
@@ -1413,7 +1429,7 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           let warnings = getFlag(result, keys, "warnings", mustBeArray);
           let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
           let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
-          checkForInvalidFlags(result, keys, `from onLoad() callback in plugin ${JSON.stringify(name)}`);
+          checkForInvalidFlags(result, keys, `from onLoad() callback in plugin ${quote(name)}`);
           response.id = id2;
           if (pluginName != null)
             response.pluginName = pluginName;
@@ -1647,7 +1663,7 @@ function sanitizeStringArray(values, property) {
   const result = [];
   for (const value of values) {
     if (typeof value !== "string")
-      throw new Error(`${JSON.stringify(property)} must be an array of strings`);
+      throw new Error(`${quote(property)} must be an array of strings`);
     result.push(value);
   }
   return result;
@@ -1673,35 +1689,35 @@ var fs = require("fs");
 var os = require("os");
 var path = require("path");
 var ESBUILD_BINARY_PATH = process.env.ESBUILD_BINARY_PATH || ESBUILD_BINARY_PATH;
-var packageDarwin_arm64 = "esbuild-darwin-arm64";
-var packageDarwin_x64 = "esbuild-darwin-64";
+var packageDarwin_arm64 = "@esbuild/darwin-arm64";
+var packageDarwin_x64 = "@esbuild/darwin-x64";
 var knownWindowsPackages = {
-  "win32 arm64 LE": "esbuild-windows-arm64",
-  "win32 ia32 LE": "esbuild-windows-32",
-  "win32 x64 LE": "esbuild-windows-64"
+  "win32 arm64 LE": "@esbuild/win32-arm64",
+  "win32 ia32 LE": "@esbuild/win32-ia32",
+  "win32 x64 LE": "@esbuild/win32-x64"
 };
 var knownUnixlikePackages = {
-  "android arm64 LE": "esbuild-android-arm64",
-  "darwin arm64 LE": "esbuild-darwin-arm64",
-  "darwin x64 LE": "esbuild-darwin-64",
-  "freebsd arm64 LE": "esbuild-freebsd-arm64",
-  "freebsd x64 LE": "esbuild-freebsd-64",
-  "linux arm LE": "esbuild-linux-arm",
-  "linux arm64 LE": "esbuild-linux-arm64",
-  "linux ia32 LE": "esbuild-linux-32",
-  "linux mips64el LE": "esbuild-linux-mips64le",
-  "linux ppc64 LE": "esbuild-linux-ppc64le",
-  "linux riscv64 LE": "esbuild-linux-riscv64",
-  "linux s390x BE": "esbuild-linux-s390x",
-  "linux x64 LE": "esbuild-linux-64",
+  "android arm64 LE": "@esbuild/android-arm64",
+  "darwin arm64 LE": "@esbuild/darwin-arm64",
+  "darwin x64 LE": "@esbuild/darwin-x64",
+  "freebsd arm64 LE": "@esbuild/freebsd-arm64",
+  "freebsd x64 LE": "@esbuild/freebsd-x64",
+  "linux arm LE": "@esbuild/linux-arm",
+  "linux arm64 LE": "@esbuild/linux-arm64",
+  "linux ia32 LE": "@esbuild/linux-ia32",
+  "linux mips64el LE": "@esbuild/linux-mips64el",
+  "linux ppc64 LE": "@esbuild/linux-ppc64",
+  "linux riscv64 LE": "@esbuild/linux-riscv64",
+  "linux s390x BE": "@esbuild/linux-s390x",
+  "linux x64 LE": "@esbuild/linux-x64",
   "linux loong64 LE": "@esbuild/linux-loong64",
-  "netbsd x64 LE": "esbuild-netbsd-64",
-  "openbsd x64 LE": "esbuild-openbsd-64",
-  "sunos x64 LE": "esbuild-sunos-64"
+  "netbsd x64 LE": "@esbuild/netbsd-x64",
+  "openbsd x64 LE": "@esbuild/openbsd-x64",
+  "sunos x64 LE": "@esbuild/sunos-x64"
 };
 var knownWebAssemblyFallbackPackages = {
   "android arm LE": "@esbuild/android-arm",
-  "android x64 LE": "esbuild-android-64"
+  "android x64 LE": "@esbuild/android-x64"
 };
 function pkgAndSubpathForCurrentPlatform() {
   let pkg;
@@ -1839,7 +1855,7 @@ for your current platform.`);
         "node_modules",
         ".cache",
         "esbuild",
-        `pnpapi-${pkg}-${"0.15.18"}-${path.basename(subpath)}`
+        `pnpapi-${pkg}-${"0.16.1"}-${path.basename(subpath)}`
       );
       if (!fs.existsSync(binTargetPath)) {
         fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
@@ -1871,7 +1887,7 @@ if (process.env.ESBUILD_WORKER_THREADS !== "0") {
   }
 }
 var _a;
-var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.15.18";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.16.1";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.basename(__dirname) !== "lib")) {
     throw new Error(
@@ -1938,7 +1954,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.15.18";
+var version = "0.16.1";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -2049,7 +2065,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.15.18"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.16.1"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -2163,7 +2179,7 @@ var runServiceSync = (callback) => {
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.15.18"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.16.1"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -2179,7 +2195,7 @@ var workerThreadService = null;
 var startWorkerThreadService = (worker_threads2) => {
   let { port1: mainPort, port2: workerPort } = new worker_threads2.MessageChannel();
   let worker = new worker_threads2.Worker(__filename, {
-    workerData: { workerPort, defaultWD, esbuildVersion: "0.15.18" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.16.1" },
     transferList: [workerPort],
     execArgv: []
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.15.18",
+  "version": "0.16.1",
   "description": "An extremely fast JavaScript and CSS bundler and minifier.",
   "repository": "https://github.com/evanw/esbuild",
   "scripts": {
@@ -15,28 +15,28 @@
     "esbuild": "bin/esbuild"
   },
   "optionalDependencies": {
-    "@esbuild/android-arm": "0.15.18",
-    "@esbuild/linux-loong64": "0.15.18",
-    "esbuild-android-64": "0.15.18",
-    "esbuild-android-arm64": "0.15.18",
-    "esbuild-darwin-64": "0.15.18",
-    "esbuild-darwin-arm64": "0.15.18",
-    "esbuild-freebsd-64": "0.15.18",
-    "esbuild-freebsd-arm64": "0.15.18",
-    "esbuild-linux-32": "0.15.18",
-    "esbuild-linux-64": "0.15.18",
-    "esbuild-linux-arm": "0.15.18",
-    "esbuild-linux-arm64": "0.15.18",
-    "esbuild-linux-mips64le": "0.15.18",
-    "esbuild-linux-ppc64le": "0.15.18",
-    "esbuild-linux-riscv64": "0.15.18",
-    "esbuild-linux-s390x": "0.15.18",
-    "esbuild-netbsd-64": "0.15.18",
-    "esbuild-openbsd-64": "0.15.18",
-    "esbuild-sunos-64": "0.15.18",
-    "esbuild-windows-32": "0.15.18",
-    "esbuild-windows-64": "0.15.18",
-    "esbuild-windows-arm64": "0.15.18"
+    "@esbuild/android-arm": "0.16.1",
+    "@esbuild/android-arm64": "0.16.1",
+    "@esbuild/android-x64": "0.16.1",
+    "@esbuild/darwin-arm64": "0.16.1",
+    "@esbuild/darwin-x64": "0.16.1",
+    "@esbuild/freebsd-arm64": "0.16.1",
+    "@esbuild/freebsd-x64": "0.16.1",
+    "@esbuild/linux-arm": "0.16.1",
+    "@esbuild/linux-arm64": "0.16.1",
+    "@esbuild/linux-ia32": "0.16.1",
+    "@esbuild/linux-loong64": "0.16.1",
+    "@esbuild/linux-mips64el": "0.16.1",
+    "@esbuild/linux-ppc64": "0.16.1",
+    "@esbuild/linux-riscv64": "0.16.1",
+    "@esbuild/linux-s390x": "0.16.1",
+    "@esbuild/linux-x64": "0.16.1",
+    "@esbuild/netbsd-x64": "0.16.1",
+    "@esbuild/openbsd-x64": "0.16.1",
+    "@esbuild/sunos-x64": "0.16.1",
+    "@esbuild/win32-arm64": "0.16.1",
+    "@esbuild/win32-ia32": "0.16.1",
+    "@esbuild/win32-x64": "0.16.1"
   },
   "license": "MIT"
 }