esbuild 0.14.7 → 0.14.8

package/bin/esbuild

@@ -39,6 +39,7 @@ var knownUnixlikePackages = {
   "linux ia32 LE": "esbuild-linux-32",
   "linux mips64el LE": "esbuild-linux-mips64le",
   "linux ppc64 LE": "esbuild-linux-ppc64le",
+  "linux s390x BE": "esbuild-linux-s390x",
   "linux x64 LE": "esbuild-linux-64",
   "netbsd x64 LE": "esbuild-netbsd-64",
   "openbsd x64 LE": "esbuild-openbsd-64",

package/install.js

@@ -55,6 +55,7 @@ var knownUnixlikePackages = {
   "linux ia32 LE": "esbuild-linux-32",
   "linux mips64el LE": "esbuild-linux-mips64le",
   "linux ppc64 LE": "esbuild-linux-ppc64le",
+  "linux s390x BE": "esbuild-linux-s390x",
   "linux x64 LE": "esbuild-linux-64",
   "netbsd x64 LE": "esbuild-netbsd-64",
   "openbsd x64 LE": "esbuild-openbsd-64",
@@ -92,8 +93,8 @@ var isToPathJS = true;
 function validateBinaryVersion(...command) {
   command.push("--version");
   const stdout = child_process.execFileSync(command.shift(), command).toString().trim();
-  if (stdout !== "0.14.7") {
-    throw new Error(`Expected ${JSON.stringify("0.14.7")} but got ${JSON.stringify(stdout)}`);
+  if (stdout !== "0.14.8") {
+    throw new Error(`Expected ${JSON.stringify("0.14.8")} but got ${JSON.stringify(stdout)}`);
   }
 }
 function isYarn() {
@@ -144,7 +145,7 @@ function installUsingNPM(pkg, subpath, binPath) {
   fs2.mkdirSync(installDir);
   try {
     fs2.writeFileSync(path2.join(installDir, "package.json"), "{}");
-    child_process.execSync(`npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.14.7"}`, { cwd: installDir, stdio: "pipe", env });
+    child_process.execSync(`npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.14.8"}`, { cwd: installDir, stdio: "pipe", env });
     const installedBinPath = path2.join(installDir, "node_modules", pkg, subpath);
     fs2.renameSync(installedBinPath, binPath);
   } finally {
@@ -193,7 +194,7 @@ function maybeOptimizePackage(binPath) {
   }
 }
 async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
-  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.14.7"}.tgz`;
+  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.14.8"}.tgz`;
   console.error(`[esbuild] Trying to download ${JSON.stringify(url)}`);
   try {
     fs2.writeFileSync(binPath, extractFileFromTarGzip(await fetch(url), subpath));

package/lib/main.d.ts

@@ -260,6 +260,8 @@ export interface Plugin {
 
 export interface PluginBuild {
   initialOptions: BuildOptions;
+  resolve(path: string, options?: ResolveOptions): Promise<ResolveResult>;
+
   onStart(callback: () =>
     (OnStartResult | null | void | Promise<OnStartResult | null | void>)): void;
   onEnd(callback: (result: BuildResult) =>
@@ -285,6 +287,26 @@ export interface PluginBuild {
   };
 }
 
+export interface ResolveOptions {
+  importer?: string;
+  namespace?: string;
+  resolveDir?: string;
+  kind?: ImportKind;
+  pluginData?: any;
+}
+
+export interface ResolveResult {
+  errors: Message[];
+  warnings: Message[];
+
+  path: string;
+  external: boolean;
+  sideEffects: boolean;
+  namespace: string;
+  suffix: string;
+  pluginData: any;
+}
+
 export interface OnStartResult {
   errors?: PartialMessage[];
   warnings?: PartialMessage[];

package/lib/main.js

@@ -576,7 +576,6 @@ function createChannel(streamIn) {
   let pluginCallbacks = /* @__PURE__ */ new Map();
   let watchCallbacks = /* @__PURE__ */ new Map();
   let serveCallbacks = /* @__PURE__ */ new Map();
-  let nextServeID = 0;
   let isClosed = false;
   let nextRequestID = 0;
   let nextBuildKey = 0;
@@ -653,7 +652,7 @@ function createChannel(streamIn) {
           sendResponse(id, {});
           break;
         }
-        case "start": {
+        case "on-start": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -661,7 +660,7 @@ function createChannel(streamIn) {
             sendResponse(id, await callback(request));
           break;
         }
-        case "resolve": {
+        case "on-resolve": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -669,7 +668,7 @@ function createChannel(streamIn) {
             sendResponse(id, await callback(request));
           break;
         }
-        case "load": {
+        case "on-load": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -678,21 +677,21 @@ function createChannel(streamIn) {
           break;
         }
         case "serve-request": {
-          let callbacks = serveCallbacks.get(request.serveID);
+          let callbacks = serveCallbacks.get(request.key);
           if (callbacks && callbacks.onRequest)
             callbacks.onRequest(request.args);
           sendResponse(id, {});
           break;
         }
         case "serve-wait": {
-          let callbacks = serveCallbacks.get(request.serveID);
+          let callbacks = serveCallbacks.get(request.key);
           if (callbacks)
             callbacks.onWait(request.error);
           sendResponse(id, {});
           break;
         }
         case "watch-rebuild": {
-          let callback = watchCallbacks.get(request.watchID);
+          let callback = watchCallbacks.get(request.key);
           try {
             if (callback)
               callback(null, request.args);
@@ -714,8 +713,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.14.7") {
-        throw new Error(`Cannot start service: Host version "${"0.14.7"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.14.8") {
+        throw new Error(`Cannot start service: Host version "${"0.14.8"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -731,7 +730,7 @@ function createChannel(streamIn) {
         callback(null, packet.value);
     }
   };
-  let handlePlugins = async (initialOptions, plugins, buildKey, stash) => {
+  let handlePlugins = async (initialOptions, plugins, buildKey, stash, refs) => {
     let onStartCallbacks = [];
     let onEndCallbacks = [];
     let onResolveCallbacks = {};
@@ -739,12 +738,13 @@ function createChannel(streamIn) {
     let nextCallbackID = 0;
     let i = 0;
     let requestPlugins = [];
+    let isSetupDone = false;
     plugins = [...plugins];
     for (let item of plugins) {
       let keys = {};
       if (typeof item !== "object")
         throw new Error(`Plugin at index ${i} must be an object`);
-      let name = getFlag(item, keys, "name", mustBeString);
+      const name = getFlag(item, keys, "name", mustBeString);
       if (typeof name !== "string" || name === "")
         throw new Error(`Plugin at index ${i} is missing a name`);
       try {
@@ -758,8 +758,55 @@ function createChannel(streamIn) {
           onLoad: []
         };
         i++;
+        let resolve = (path3, options = {}) => {
+          if (!isSetupDone)
+            throw new Error('Cannot call "resolve" before plugin setup has completed');
+          if (typeof path3 !== "string")
+            throw new Error(`The path to resolve must be a string`);
+          let keys2 = Object.create(null);
+          let importer = getFlag(options, keys2, "importer", mustBeString);
+          let namespace = getFlag(options, keys2, "namespace", mustBeString);
+          let resolveDir = getFlag(options, keys2, "resolveDir", mustBeString);
+          let kind = getFlag(options, keys2, "kind", mustBeString);
+          let pluginData = getFlag(options, keys2, "pluginData", canBeAnything);
+          checkForInvalidFlags(options, keys2, "in resolve() call");
+          return new Promise((resolve2, reject) => {
+            const request = {
+              command: "resolve",
+              path: path3,
+              key: buildKey,
+              pluginName: name
+            };
+            if (importer != null)
+              request.importer = importer;
+            if (namespace != null)
+              request.namespace = namespace;
+            if (resolveDir != null)
+              request.resolveDir = resolveDir;
+            if (kind != null)
+              request.kind = kind;
+            if (pluginData != null)
+              request.pluginData = stash.store(pluginData);
+            sendRequest(refs, request, (error, response) => {
+              if (error !== null)
+                reject(new Error(error));
+              else
+                resolve2({
+                  errors: replaceDetailsInMessages(response.errors, stash),
+                  warnings: replaceDetailsInMessages(response.warnings, stash),
+                  path: response.path,
+                  external: response.external,
+                  sideEffects: response.sideEffects,
+                  namespace: response.namespace,
+                  suffix: response.suffix,
+                  pluginData: stash.load(response.pluginData)
+                });
+            });
+          });
+        };
         let promise = setup({
           initialOptions,
+          resolve,
           onStart(callback2) {
             let registeredText = `This error came from the "onStart" callback registered here:`;
             let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onStart");
@@ -807,7 +854,7 @@ function createChannel(streamIn) {
     }
     const callback = async (request) => {
       switch (request.command) {
-        case "start": {
+        case "on-start": {
           let response = { errors: [], warnings: [] };
           await Promise.all(onStartCallbacks.map(async ({ name, callback: callback2, note }) => {
             try {
@@ -830,7 +877,7 @@ function createChannel(streamIn) {
           }));
           return response;
         }
-        case "resolve": {
+        case "on-resolve": {
           let response = {}, name = "", callback2, note;
           for (let id of request.ids) {
             try {
@@ -890,7 +937,7 @@ function createChannel(streamIn) {
           }
           return response;
         }
-        case "load": {
+        case "on-load": {
           let response = {}, name = "", callback2, note;
           for (let id of request.ids) {
             try {
@@ -962,6 +1009,7 @@ function createChannel(streamIn) {
         })().then(done);
       };
     }
+    isSetupDone = true;
     let refCount = 0;
     return {
       ok: true,
@@ -979,24 +1027,23 @@ function createChannel(streamIn) {
       }
     };
   };
-  let buildServeData = (refs, options, request) => {
+  let buildServeData = (refs, options, request, key) => {
     let keys = {};
     let port = getFlag(options, keys, "port", mustBeInteger);
     let host = getFlag(options, keys, "host", mustBeString);
     let servedir = getFlag(options, keys, "servedir", mustBeString);
     let onRequest = getFlag(options, keys, "onRequest", mustBeFunction);
-    let serveID = nextServeID++;
     let onWait;
     let wait = new Promise((resolve, reject) => {
       onWait = (error) => {
-        serveCallbacks.delete(serveID);
+        serveCallbacks.delete(key);
         if (error !== null)
           reject(new Error(error));
         else
           resolve();
       };
     });
-    request.serve = { serveID };
+    request.serve = {};
     checkForInvalidFlags(options, keys, `in serve() call`);
     if (port !== void 0)
       request.serve.port = port;
@@ -1004,14 +1051,14 @@ function createChannel(streamIn) {
       request.serve.host = host;
     if (servedir !== void 0)
       request.serve.servedir = servedir;
-    serveCallbacks.set(serveID, {
+    serveCallbacks.set(key, {
       onRequest,
       onWait
     });
     return {
       wait,
       stop() {
-        sendRequest(refs, { command: "serve-stop", serveID }, () => {
+        sendRequest(refs, { command: "serve-stop", key }, () => {
         });
       }
     };
@@ -1051,7 +1098,7 @@ function createChannel(streamIn) {
     if (plugins && plugins.length > 0) {
       if (streamIn.isSync)
         return handleError(new Error("Cannot use plugins in synchronous API calls"), "");
-      handlePlugins(options, plugins, key, details).then((result) => {
+      handlePlugins(options, plugins, key, details, refs).then((result) => {
         if (!result.ok) {
           handleError(result.error, result.pluginName);
         } else {
@@ -1139,7 +1186,7 @@ function createChannel(streamIn) {
     };
     if (requestPlugins)
       request.plugins = requestPlugins;
-    let serve2 = serveOptions && buildServeData(refs, serveOptions, request);
+    let serve2 = serveOptions && buildServeData(refs, serveOptions, request, key);
     let rebuild;
     let stop;
     let copyResponseToResult = (response, result) => {
@@ -1160,13 +1207,13 @@ function createChannel(streamIn) {
         if (result.errors.length > 0) {
           return callback2(failureErrorWithLog("Build failed", result.errors, result.warnings), null);
         }
-        if (response.rebuildID !== void 0) {
+        if (response.rebuild) {
           if (!rebuild) {
             let isDisposed = false;
             rebuild = () => new Promise((resolve, reject) => {
               if (isDisposed || isClosed)
                 throw new Error("Cannot rebuild");
-              sendRequest(refs, { command: "rebuild", rebuildID: response.rebuildID }, (error2, response2) => {
+              sendRequest(refs, { command: "rebuild", key }, (error2, response2) => {
                 if (error2) {
                   const message = { pluginName: "", text: error2, location: null, notes: [], detail: void 0 };
                   return callback2(failureErrorWithLog("Build failed", [message], []), null);
@@ -1184,14 +1231,14 @@ function createChannel(streamIn) {
               if (isDisposed)
                 return;
               isDisposed = true;
-              sendRequest(refs, { command: "rebuild-dispose", rebuildID: response.rebuildID }, () => {
+              sendRequest(refs, { command: "rebuild-dispose", key }, () => {
               });
               refs.unref();
             };
           }
           result.rebuild = rebuild;
         }
-        if (response.watchID !== void 0) {
+        if (response.watch) {
           if (!stop) {
             let isStopped = false;
             refs.ref();
@@ -1199,13 +1246,13 @@ function createChannel(streamIn) {
               if (isStopped)
                 return;
               isStopped = true;
-              watchCallbacks.delete(response.watchID);
-              sendRequest(refs, { command: "watch-stop", watchID: response.watchID }, () => {
+              watchCallbacks.delete(key);
+              sendRequest(refs, { command: "watch-stop", key }, () => {
               });
               refs.unref();
             };
             if (watch) {
-              watchCallbacks.set(response.watchID, (serviceStopError, watchResponse) => {
+              watchCallbacks.set(key, (serviceStopError, watchResponse) => {
                 if (serviceStopError) {
                   if (watch.onRebuild)
                     watch.onRebuild(serviceStopError, null);
@@ -1612,6 +1659,7 @@ var knownUnixlikePackages = {
   "linux ia32 LE": "esbuild-linux-32",
   "linux mips64el LE": "esbuild-linux-mips64le",
   "linux ppc64 LE": "esbuild-linux-ppc64le",
+  "linux s390x BE": "esbuild-linux-s390x",
   "linux x64 LE": "esbuild-linux-64",
   "netbsd x64 LE": "esbuild-netbsd-64",
   "openbsd x64 LE": "esbuild-openbsd-64",
@@ -1696,7 +1744,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.14.7";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.14.8";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.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.
@@ -1755,7 +1803,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.14.7";
+var version = "0.14.8";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -1864,7 +1912,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.14.7"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.14.8"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -1973,7 +2021,7 @@ var runServiceSync = (callback) => {
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.14.7"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.14.8"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -1989,7 +2037,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.14.7" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.14.8" },
     transferList: [workerPort],
     execArgv: []
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.14.7",
+  "version": "0.14.8",
   "description": "An extremely fast JavaScript and CSS bundler and minifier.",
   "repository": "https://github.com/evanw/esbuild",
   "scripts": {
@@ -12,23 +12,24 @@
     "esbuild": "bin/esbuild"
   },
   "optionalDependencies": {
-    "esbuild-android-arm64": "0.14.7",
-    "esbuild-darwin-64": "0.14.7",
-    "esbuild-darwin-arm64": "0.14.7",
-    "esbuild-freebsd-64": "0.14.7",
-    "esbuild-freebsd-arm64": "0.14.7",
-    "esbuild-linux-32": "0.14.7",
-    "esbuild-linux-64": "0.14.7",
-    "esbuild-linux-arm": "0.14.7",
-    "esbuild-linux-arm64": "0.14.7",
-    "esbuild-linux-mips64le": "0.14.7",
-    "esbuild-linux-ppc64le": "0.14.7",
-    "esbuild-netbsd-64": "0.14.7",
-    "esbuild-openbsd-64": "0.14.7",
-    "esbuild-sunos-64": "0.14.7",
-    "esbuild-windows-32": "0.14.7",
-    "esbuild-windows-64": "0.14.7",
-    "esbuild-windows-arm64": "0.14.7"
+    "esbuild-android-arm64": "0.14.8",
+    "esbuild-darwin-64": "0.14.8",
+    "esbuild-darwin-arm64": "0.14.8",
+    "esbuild-freebsd-64": "0.14.8",
+    "esbuild-freebsd-arm64": "0.14.8",
+    "esbuild-linux-32": "0.14.8",
+    "esbuild-linux-64": "0.14.8",
+    "esbuild-linux-arm": "0.14.8",
+    "esbuild-linux-arm64": "0.14.8",
+    "esbuild-linux-mips64le": "0.14.8",
+    "esbuild-linux-ppc64le": "0.14.8",
+    "esbuild-linux-s390x": "0.14.8",
+    "esbuild-netbsd-64": "0.14.8",
+    "esbuild-openbsd-64": "0.14.8",
+    "esbuild-sunos-64": "0.14.8",
+    "esbuild-windows-32": "0.14.8",
+    "esbuild-windows-64": "0.14.8",
+    "esbuild-windows-arm64": "0.14.8"
   },
   "license": "MIT"
 }