esbuild 0.16.17 → 0.17.0

package/bin/esbuild

@@ -198,7 +198,7 @@ for your current platform.`);
         "node_modules",
         ".cache",
         "esbuild",
-        `pnpapi-${pkg.replace("/", "-")}-${"0.16.17"}-${path.basename(subpath)}`
+        `pnpapi-${pkg.replace("/", "-")}-${"0.17.0"}-${path.basename(subpath)}`
       );
       if (!fs.existsSync(binTargetPath)) {
         fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });

package/install.js

@@ -126,8 +126,8 @@ which means the "esbuild" binary executable can't be run. You can either:
     }
     throw err;
   }
-  if (stdout !== "0.16.17") {
-    throw new Error(`Expected ${JSON.stringify("0.16.17")} but got ${JSON.stringify(stdout)}`);
+  if (stdout !== "0.17.0") {
+    throw new Error(`Expected ${JSON.stringify("0.17.0")} but got ${JSON.stringify(stdout)}`);
   }
 }
 function isYarn() {
@@ -179,7 +179,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.16.17"}`,
+      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.17.0"}`,
       { cwd: installDir, stdio: "pipe", env }
     );
     const installedBinPath = path2.join(installDir, "node_modules", pkg, subpath);
@@ -230,7 +230,7 @@ function maybeOptimizePackage(binPath) {
   }
 }
 async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
-  const url = `https://registry.npmjs.org/${pkg}/-/${pkg.replace("@esbuild/", "")}-${"0.16.17"}.tgz`;
+  const url = `https://registry.npmjs.org/${pkg}/-/${pkg.replace("@esbuild/", "")}-${"0.17.0"}.tgz`;
   console.error(`[esbuild] Trying to download ${JSON.stringify(url)}`);
   try {
     fs2.writeFileSync(binPath, extractFileFromTarGzip(await fetch(url), subpath));

package/lib/main.d.ts

@@ -132,8 +132,6 @@ export interface BuildOptions extends CommonOptions {
   banner?: { [type: string]: string };
   /** Documentation: https://esbuild.github.io/api/#footer */
   footer?: { [type: string]: string };
-  /** Documentation: https://esbuild.github.io/api/#incremental */
-  incremental?: boolean;
   /** Documentation: https://esbuild.github.io/api/#entry-points */
   entryPoints?: string[] | Record<string, string>;
   /** Documentation: https://esbuild.github.io/api/#stdin */
@@ -144,12 +142,6 @@ export interface BuildOptions extends CommonOptions {
   absWorkingDir?: string;
   /** Documentation: https://esbuild.github.io/api/#node-paths */
   nodePaths?: string[]; // The "NODE_PATH" variable from Node.js
-  /** Documentation: https://esbuild.github.io/api/#watch */
-  watch?: boolean | WatchMode;
-}
-
-export interface WatchMode {
-  onRebuild?: (error: BuildFailure | null, result: BuildResult | null) => void;
 }
 
 export interface StdinOptions {
@@ -199,28 +191,15 @@ export interface OutputFile {
   readonly text: string;
 }
 
-export interface BuildInvalidate {
-  (): Promise<BuildIncremental>;
-  dispose(): void;
-}
-
-export interface BuildIncremental extends BuildResult {
-  rebuild: BuildInvalidate;
-}
-
-export interface BuildResult {
+export interface BuildResult<SpecificOptions extends BuildOptions = BuildOptions> {
   errors: Message[];
   warnings: Message[];
   /** Only when "write: false" */
-  outputFiles?: OutputFile[];
-  /** Only when "incremental: true" */
-  rebuild?: BuildInvalidate;
-  /** Only when "watch: true" */
-  stop?: () => void;
+  outputFiles: OutputFile[] | (SpecificOptions['write'] extends false ? never : undefined);
   /** Only when "metafile: true" */
-  metafile?: Metafile;
+  metafile: Metafile | (SpecificOptions['metafile'] extends true ? never : undefined);
   /** Only when "mangleCache" is present */
-  mangleCache?: Record<string, string | false>;
+  mangleCache: Record<string, string | false> | (SpecificOptions['mangleCache'] extends Object ? never : undefined);
 }
 
 export interface BuildFailure extends Error {
@@ -233,6 +212,8 @@ export interface ServeOptions {
   port?: number;
   host?: string;
   servedir?: string;
+  keyfile?: string
+  certfile?: string
   onRequest?: (args: ServeOnRequestArgs) => void;
 }
 
@@ -249,8 +230,6 @@ export interface ServeOnRequestArgs {
 export interface ServeResult {
   port: number;
   host: string;
-  wait: Promise<void>;
-  stop: () => void;
 }
 
 export interface TransformOptions extends CommonOptions {
@@ -274,14 +253,14 @@ export interface TransformOptions extends CommonOptions {
   footer?: string;
 }
 
-export interface TransformResult {
+export interface TransformResult<SpecificOptions extends TransformOptions = TransformOptions> {
   code: string;
   map: string;
   warnings: Message[];
   /** Only when "mangleCache" is present */
-  mangleCache?: Record<string, string | false>;
+  mangleCache: Record<string, string | false> | (SpecificOptions['mangleCache'] extends Object ? never : undefined);
   /** Only when "legalComments" is "external" */
-  legalComments?: string;
+  legalComments: string | (SpecificOptions['legalComments'] extends 'external' ? never : undefined);
 }
 
 export interface TransformFailure extends Error {
@@ -301,7 +280,7 @@ export interface PluginBuild {
   onStart(callback: () =>
     (OnStartResult | null | void | Promise<OnStartResult | null | void>)): void;
   onEnd(callback: (result: BuildResult) =>
-    (void | Promise<void>)): void;
+    (OnEndResult | null | void | Promise<OnEndResult | null | void>)): void;
   onResolve(options: OnResolveOptions, callback: (args: OnResolveArgs) =>
     (OnResolveResult | null | undefined | Promise<OnResolveResult | null | undefined>)): void;
   onLoad(options: OnLoadOptions, callback: (args: OnLoadArgs) =>
@@ -309,7 +288,7 @@ export interface PluginBuild {
 
   // This is a full copy of the esbuild library in case you need it
   esbuild: {
-    serve: typeof serve,
+    context: typeof context,
     build: typeof build,
     buildSync: typeof buildSync,
     transform: typeof transform,
@@ -349,6 +328,11 @@ export interface OnStartResult {
   warnings?: PartialMessage[];
 }
 
+export interface OnEndResult {
+  errors?: PartialMessage[];
+  warnings?: PartialMessage[];
+}
+
 export interface OnResolveOptions {
   filter: RegExp;
   namespace?: string;
@@ -478,6 +462,16 @@ export interface AnalyzeMetafileOptions {
   verbose?: boolean;
 }
 
+export interface WatchOptions {
+}
+
+export interface BuildContext<SpecificOptions extends BuildOptions = BuildOptions> {
+  rebuild(): Promise<BuildResult<SpecificOptions>>
+  watch(options?: WatchOptions): void
+  serve(options?: ServeOptions): Promise<ServeResult>
+  dispose(): Promise<void>
+}
+
 /**
  * This function invokes the "esbuild" command-line tool for you. It returns a
  * promise that either resolves with a "BuildResult" object or rejects with a
@@ -488,22 +482,20 @@ export interface AnalyzeMetafileOptions {
  *
  * Documentation: https://esbuild.github.io/api/#build-api
  */
-export declare function build(options: BuildOptions & { write: false }): Promise<BuildResult & { outputFiles: OutputFile[] }>;
-export declare function build(options: BuildOptions & { incremental: true, metafile: true }): Promise<BuildIncremental & { metafile: Metafile }>;
-export declare function build(options: BuildOptions & { incremental: true }): Promise<BuildIncremental>;
-export declare function build(options: BuildOptions & { metafile: true }): Promise<BuildResult & { metafile: Metafile }>;
+export declare function build<SpecificOptions extends BuildOptions>(options: SpecificOptions): Promise<BuildResult<SpecificOptions>>;
 export declare function build(options: BuildOptions): Promise<BuildResult>;
 
 /**
- * This function is similar to "build" but it serves the resulting files over
- * HTTP on a localhost address with the specified port.
+ * This is the advanced long-running form of "build" that supports additional
+ * features such as watch mode and a local development server.
  *
  * - Works in node: yes
  * - Works in browser: no
  *
- * Documentation: https://esbuild.github.io/api/#serve
+ * Documentation: https://esbuild.github.io/api/#context-api
  */
-export declare function serve(serveOptions: ServeOptions, buildOptions: BuildOptions): Promise<ServeResult>;
+export declare function context<T extends BuildOptions>(options: T): Promise<BuildContext<T>>;
+export declare function context(options: BuildOptions): Promise<BuildContext>;
 
 /**
  * This function transforms a single JavaScript file. It can be used to minify
@@ -516,6 +508,7 @@ export declare function serve(serveOptions: ServeOptions, buildOptions: BuildOpt
  *
  * Documentation: https://esbuild.github.io/api/#transform-api
  */
+export declare function transform<SpecificOptions extends TransformOptions>(input: string | Uint8Array, options?: SpecificOptions): Promise<TransformResult<SpecificOptions>>;
 export declare function transform(input: string | Uint8Array, options?: TransformOptions): Promise<TransformResult>;
 
 /**
@@ -548,7 +541,7 @@ export declare function analyzeMetafile(metafile: Metafile | string, options?: A
  *
  * Documentation: https://esbuild.github.io/api/#build-api
  */
-export declare function buildSync(options: BuildOptions & { write: false }): BuildResult & { outputFiles: OutputFile[] };
+export declare function buildSync<SpecificOptions extends BuildOptions>(options: SpecificOptions): BuildResult<SpecificOptions>;
 export declare function buildSync(options: BuildOptions): BuildResult;
 
 /**
@@ -559,7 +552,8 @@ export declare function buildSync(options: BuildOptions): BuildResult;
  *
  * Documentation: https://esbuild.github.io/api/#transform-api
  */
-export declare function transformSync(input: string, options?: TransformOptions): TransformResult;
+export declare function transformSync<SpecificOptions extends TransformOptions>(input: string, options?: SpecificOptions): TransformResult<SpecificOptions>;
+export declare function transformSync(input: string | Uint8Array, options?: TransformOptions): TransformResult;
 
 /**
  * A synchronous version of "formatMessages".

package/lib/main.js

@@ -34,11 +34,11 @@ __export(node_exports, {
   analyzeMetafileSync: () => analyzeMetafileSync,
   build: () => build,
   buildSync: () => buildSync,
+  context: () => context,
   default: () => node_default,
   formatMessages: () => formatMessages,
   formatMessagesSync: () => formatMessagesSync,
   initialize: () => initialize,
-  serve: () => serve,
   transform: () => transform,
   transformSync: () => transformSync,
   version: () => version
@@ -225,7 +225,6 @@ function validateTarget(target) {
 }
 var canBeAnything = () => null;
 var mustBeBoolean = (value) => typeof value === "boolean" ? null : "a boolean";
-var mustBeBooleanOrObject = (value) => typeof value === "boolean" || typeof value === "object" && !Array.isArray(value) ? null : "a boolean or an object";
 var mustBeString = (value) => typeof value === "string" ? null : "a string";
 var mustBeRegExp = (value) => value instanceof RegExp ? null : "a RegExp object";
 var mustBeInteger = (value) => typeof value === "number" && value === (value | 0) ? null : "an integer";
@@ -421,12 +420,10 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   let keys = /* @__PURE__ */ Object.create(null);
   let stdinContents = null;
   let stdinResolveDir = null;
-  let watchMode = null;
   pushLogFlags(flags, options, keys, isTTY2, logLevelDefault);
   pushCommonFlags(flags, options, keys);
   let sourcemap = getFlag(options, keys, "sourcemap", mustBeStringOrBoolean);
   let bundle = getFlag(options, keys, "bundle", mustBeBoolean);
-  let watch = getFlag(options, keys, "watch", mustBeBooleanOrObject);
   let splitting = getFlag(options, keys, "splitting", mustBeBoolean);
   let preserveSymlinks = getFlag(options, keys, "preserveSymlinks", mustBeBoolean);
   let metafile = getFlag(options, keys, "metafile", mustBeBoolean);
@@ -455,7 +452,6 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   let stdin = getFlag(options, keys, "stdin", mustBeObject);
   let write = (_a2 = getFlag(options, keys, "write", mustBeBoolean)) != null ? _a2 : writeDefault;
   let allowOverwrite = getFlag(options, keys, "allowOverwrite", mustBeBoolean);
-  let incremental = getFlag(options, keys, "incremental", mustBeBoolean) === true;
   let mangleCache = getFlag(options, keys, "mangleCache", mustBeObject);
   keys.plugins = true;
   checkForInvalidFlags(options, keys, `in ${callName}() call`);
@@ -465,17 +461,6 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
     flags.push("--bundle");
   if (allowOverwrite)
     flags.push("--allow-overwrite");
-  if (watch) {
-    flags.push("--watch");
-    if (typeof watch === "boolean") {
-      watchMode = {};
-    } else {
-      let watchKeys = /* @__PURE__ */ Object.create(null);
-      let onRebuild = getFlag(watch, watchKeys, "onRebuild", mustBeFunction);
-      checkForInvalidFlags(watch, watchKeys, `on "watch" in ${callName}() call`);
-      watchMode = { onRebuild };
-    }
-  }
   if (splitting)
     flags.push("--splitting");
   if (preserveSymlinks)
@@ -614,9 +599,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
     stdinContents,
     stdinResolveDir,
     absWorkingDir,
-    incremental,
     nodePaths,
-    watch: watchMode,
     mangleCache: validateMangleCache(mangleCache)
   };
 }
@@ -739,8 +722,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.16.17") {
-        throw new Error(`Cannot start service: Host version "${"0.16.17"}" does not match binary version ${quote(binaryVersion)}`);
+      if (binaryVersion !== "0.17.0") {
+        throw new Error(`Cannot start service: Host version "${"0.17.0"}" does not match binary version ${quote(binaryVersion)}`);
       }
       return;
     }
@@ -756,7 +739,7 @@ function createChannel(streamIn) {
         callback(null, packet.value);
     }
   };
-  let buildOrServe = ({ callName, refs, serveOptions, options, isTTY: isTTY2, defaultWD: defaultWD2, callback }) => {
+  let buildOrContext = ({ callName, refs, options, isTTY: isTTY2, defaultWD: defaultWD2, callback }) => {
     let refCount = 0;
     const buildKey = nextBuildKey++;
     const requestCallbacks = {};
@@ -777,7 +760,7 @@ function createChannel(streamIn) {
     };
     requestCallbacksByKey[buildKey] = requestCallbacks;
     buildRefs.ref();
-    buildOrServeImpl(
+    buildOrContextImpl(
       callName,
       buildKey,
       sendRequest,
@@ -786,10 +769,8 @@ function createChannel(streamIn) {
       streamIn,
       requestCallbacks,
       options,
-      serveOptions,
       isTTY2,
       defaultWD2,
-      closeData,
       (err, res) => {
         try {
           callback(err, res);
@@ -825,7 +806,13 @@ function createChannel(streamIn) {
           let outstanding = 1;
           let next = () => {
             if (--outstanding === 0) {
-              let result = { warnings, code: response.code, map: response.map };
+              let result = {
+                warnings,
+                code: response.code,
+                map: response.map,
+                mangleCache: void 0,
+                legalComments: void 0
+              };
               if ("legalComments" in response)
                 result.legalComments = response == null ? void 0 : response.legalComments;
               if (response.mangleCache)
@@ -931,30 +918,26 @@ function createChannel(streamIn) {
     readFromStdout,
     afterClose,
     service: {
-      buildOrServe,
+      buildOrContext,
       transform: transform2,
       formatMessages: formatMessages2,
       analyzeMetafile: analyzeMetafile2
     }
   };
 }
-function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, streamIn, requestCallbacks, options, serveOptions, isTTY2, defaultWD2, closeData, callback) {
+function buildOrContextImpl(callName, buildKey, sendRequest, sendResponse, refs, streamIn, requestCallbacks, options, isTTY2, defaultWD2, callback) {
   const details = createObjectStash();
-  const logPluginError = (e, pluginName, note, done) => {
+  const isContext = callName === "context";
+  const handleError = (e, pluginName) => {
     const flags = [];
     try {
       pushLogFlags(flags, options, {}, isTTY2, buildLogLevelDefault);
     } catch {
     }
-    const message = extractErrorMessageV8(e, streamIn, details, note, pluginName);
+    const message = extractErrorMessageV8(e, streamIn, details, void 0, pluginName);
     sendRequest(refs, { command: "error", flags, error: message }, () => {
       message.detail = details.load(message.detail);
-      done(message);
-    });
-  };
-  const handleError = (e, pluginName) => {
-    logPluginError(e, pluginName, void 0, (error) => {
-      callback(failureErrorWithLog("Build failed", [error], []), null);
+      callback(failureErrorWithLog(isContext ? "Context failed" : "Build failed", [message], []), null);
     });
   };
   let plugins;
@@ -962,15 +945,13 @@ function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, s
     const value = options.plugins;
     if (value !== void 0) {
       if (!Array.isArray(value))
-        throw new Error(`"plugins" must be an array`);
+        return handleError(new Error(`"plugins" must be an array`), "");
       plugins = value;
     }
   }
   if (plugins && plugins.length > 0) {
-    if (streamIn.isSync) {
-      handleError(new Error("Cannot use plugins in synchronous API calls"), "");
-      return;
-    }
+    if (streamIn.isSync)
+      return handleError(new Error("Cannot use plugins in synchronous API calls"), "");
     handlePlugins(
       buildKey,
       sendRequest,
@@ -983,12 +964,10 @@ function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, s
       details
     ).then(
       (result) => {
-        if (!result.ok) {
-          handleError(result.error, result.pluginName);
-          return;
-        }
+        if (!result.ok)
+          return handleError(result.error, result.pluginName);
         try {
-          buildOrServeContinue(result.requestPlugins, result.runOnEndCallbacks);
+          buildOrContextContinue(result.requestPlugins, result.runOnEndCallbacks);
         } catch (e) {
           handleError(e, "");
         }
@@ -998,25 +977,25 @@ function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, s
     return;
   }
   try {
-    buildOrServeContinue(null, (result, logPluginError2, done) => done());
+    buildOrContextContinue(null, (result, done) => done([], []));
   } catch (e) {
     handleError(e, "");
   }
-  function buildOrServeContinue(requestPlugins, runOnEndCallbacks) {
-    let writeDefault = !streamIn.isWriteUnavailable;
-    let {
+  function buildOrContextContinue(requestPlugins, runOnEndCallbacks) {
+    const writeDefault = streamIn.hasFS;
+    const {
       entries,
       flags,
       write,
       stdinContents,
       stdinResolveDir,
       absWorkingDir,
-      incremental,
       nodePaths,
-      watch,
       mangleCache
     } = flagsForBuildOptions(callName, options, isTTY2, buildLogLevelDefault, writeDefault);
-    let request = {
+    if (write && !streamIn.hasFS)
+      throw new Error(`The "write" option is unavailable in this environment`);
+    const request = {
       command: "build",
       key: buildKey,
       entries,
@@ -1025,17 +1004,23 @@ function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, s
       stdinContents,
       stdinResolveDir,
       absWorkingDir: absWorkingDir || defaultWD2,
-      incremental,
-      nodePaths
+      nodePaths,
+      context: isContext
     };
     if (requestPlugins)
       request.plugins = requestPlugins;
     if (mangleCache)
       request.mangleCache = mangleCache;
-    let serve2 = serveOptions && buildServeData(buildKey, sendRequest, sendResponse, refs, requestCallbacks, serveOptions, request);
-    let rebuild;
-    let stop;
-    let copyResponseToResult = (response, result) => {
+    const buildResponseToResult = (response, callback2) => {
+      const result = {
+        errors: replaceDetailsInMessages(response.errors, details),
+        warnings: replaceDetailsInMessages(response.warnings, details),
+        outputFiles: void 0,
+        metafile: void 0,
+        mangleCache: void 0
+      };
+      const originalErrors = result.errors.slice();
+      const originalWarnings = result.warnings.slice();
       if (response.outputFiles)
         result.outputFiles = response.outputFiles.map(convertOutputFiles);
       if (response.metafile)
@@ -1044,165 +1029,141 @@ function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, s
         result.mangleCache = response.mangleCache;
       if (response.writeToStdout !== void 0)
         console.log(decodeUTF8(response.writeToStdout).replace(/\n$/, ""));
-    };
-    let buildResponseToResult = (response, callback2) => {
-      let result = {
-        errors: replaceDetailsInMessages(response.errors, details),
-        warnings: replaceDetailsInMessages(response.warnings, details)
-      };
-      copyResponseToResult(response, result);
-      runOnEndCallbacks(result, logPluginError, () => {
-        if (result.errors.length > 0) {
-          return callback2(failureErrorWithLog("Build failed", result.errors, result.warnings), null);
+      runOnEndCallbacks(result, (onEndErrors, onEndWarnings) => {
+        if (originalErrors.length > 0 || onEndErrors.length > 0) {
+          const error = failureErrorWithLog("Build failed", originalErrors.concat(onEndErrors), originalWarnings.concat(onEndWarnings));
+          return callback2(error, null, onEndErrors, onEndWarnings);
         }
-        if (response.rebuild) {
-          if (!rebuild) {
-            let isDisposed = false;
-            rebuild = () => new Promise((resolve, reject) => {
-              if (isDisposed || closeData.didClose)
-                throw new Error("Cannot rebuild");
-              sendRequest(
-                refs,
-                { command: "rebuild", key: buildKey },
-                (error2, response2) => {
+        callback2(null, result, onEndErrors, onEndWarnings);
+      });
+    };
+    let latestResultPromise;
+    let provideLatestResult;
+    if (isContext)
+      requestCallbacks["on-end"] = (id, request2) => new Promise((resolve) => {
+        buildResponseToResult(request2, (err, result, onEndErrors, onEndWarnings) => {
+          const response = {
+            errors: onEndErrors,
+            warnings: onEndWarnings
+          };
+          if (provideLatestResult)
+            provideLatestResult(err, result);
+          latestResultPromise = void 0;
+          provideLatestResult = void 0;
+          sendResponse(id, response);
+          resolve();
+        });
+      });
+    sendRequest(refs, request, (error, response) => {
+      if (error)
+        return callback(new Error(error), null);
+      if (!isContext) {
+        return buildResponseToResult(response, callback);
+      }
+      if (response.errors.length > 0) {
+        return callback(failureErrorWithLog("Context failed", response.errors, response.warnings), null);
+      }
+      let didDispose = false;
+      const result = {
+        rebuild: () => {
+          if (!latestResultPromise)
+            latestResultPromise = new Promise((resolve, reject) => {
+              let settlePromise;
+              provideLatestResult = (err, result2) => {
+                if (!settlePromise)
+                  settlePromise = () => err ? reject(err) : resolve(result2);
+              };
+              const triggerAnotherBuild = () => {
+                const request2 = {
+                  command: "rebuild",
+                  key: buildKey
+                };
+                sendRequest(refs, request2, (error2, response2) => {
                   if (error2) {
-                    const message = { id: "", pluginName: "", text: error2, location: null, notes: [], detail: void 0 };
-                    return callback2(failureErrorWithLog("Build failed", [message], []), null);
+                    reject(new Error(error2));
+                  } else if (settlePromise) {
+                    settlePromise();
+                  } else {
+                    triggerAnotherBuild();
                   }
-                  buildResponseToResult(response2, (error3, result3) => {
-                    if (error3)
-                      reject(error3);
-                    else
-                      resolve(result3);
-                  });
-                }
-              );
+                });
+              };
+              triggerAnotherBuild();
             });
-            refs.ref();
-            rebuild.dispose = () => {
-              if (isDisposed)
-                return;
-              isDisposed = true;
-              sendRequest(refs, { command: "rebuild-dispose", key: buildKey }, () => {
-              });
-              refs.unref();
-            };
-          }
-          result.rebuild = rebuild;
-        }
-        if (response.watch) {
-          if (!stop) {
-            let isStopped = false;
-            refs.ref();
-            stop = () => {
-              if (isStopped)
-                return;
-              isStopped = true;
-              delete requestCallbacks["watch-rebuild"];
-              sendRequest(refs, { command: "watch-stop", key: buildKey }, () => {
-              });
-              refs.unref();
-            };
-            if (watch) {
-              requestCallbacks["watch-rebuild"] = (id, request2) => {
-                try {
-                  let watchResponse = request2.args;
-                  let result2 = {
-                    errors: replaceDetailsInMessages(watchResponse.errors, details),
-                    warnings: replaceDetailsInMessages(watchResponse.warnings, details)
-                  };
-                  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;
-                    }
-                    result2.stop = stop;
-                    if (watch.onRebuild)
-                      watch.onRebuild(null, result2);
-                  });
-                } catch (err) {
-                  console.error(err);
-                }
+          return latestResultPromise;
+        },
+        watch: (options2 = {}) => new Promise((resolve, reject) => {
+          if (!streamIn.hasFS)
+            throw new Error(`Cannot use the "watch" API in this environment`);
+          const keys = {};
+          checkForInvalidFlags(options2, keys, `in watch() call`);
+          const request2 = {
+            command: "watch",
+            key: buildKey
+          };
+          sendRequest(refs, request2, (error2) => {
+            if (error2)
+              reject(new Error(error2));
+            else
+              resolve(void 0);
+          });
+        }),
+        serve: (options2 = {}) => new Promise((resolve, reject) => {
+          if (!streamIn.hasFS)
+            throw new Error(`Cannot use the "serve" API in this environment`);
+          const keys = {};
+          const port = getFlag(options2, keys, "port", mustBeInteger);
+          const host = getFlag(options2, keys, "host", mustBeString);
+          const servedir = getFlag(options2, keys, "servedir", mustBeString);
+          const keyfile = getFlag(options2, keys, "keyfile", mustBeString);
+          const certfile = getFlag(options2, keys, "certfile", mustBeString);
+          const onRequest = getFlag(options2, keys, "onRequest", mustBeFunction);
+          checkForInvalidFlags(options2, keys, `in serve() call`);
+          const request2 = {
+            command: "serve",
+            key: buildKey,
+            onRequest: !!onRequest
+          };
+          if (port !== void 0)
+            request2.port = port;
+          if (host !== void 0)
+            request2.host = host;
+          if (servedir !== void 0)
+            request2.servedir = servedir;
+          if (keyfile !== void 0)
+            request2.keyfile = keyfile;
+          if (certfile !== void 0)
+            request2.certfile = certfile;
+          sendRequest(refs, request2, (error2, response2) => {
+            if (error2)
+              return reject(new Error(error2));
+            if (onRequest) {
+              requestCallbacks["serve-request"] = (id, request3) => {
+                onRequest(request3.args);
                 sendResponse(id, {});
               };
             }
-          }
-          result.stop = stop;
-        }
-        callback2(null, result);
-      });
-    };
-    if (write && streamIn.isWriteUnavailable)
-      throw new Error(`The "write" option is unavailable in this environment`);
-    if (incremental && streamIn.isSync)
-      throw new Error(`Cannot use "incremental" with a synchronous build`);
-    if (watch && streamIn.isSync)
-      throw new Error(`Cannot use "watch" with a synchronous build`);
-    sendRequest(refs, request, (error, response) => {
-      if (error)
-        return callback(new Error(error), null);
-      if (serve2) {
-        let serveResponse = response;
-        let isStopped = false;
-        refs.ref();
-        let result = {
-          port: serveResponse.port,
-          host: serveResponse.host,
-          wait: serve2.wait,
-          stop() {
-            if (isStopped)
-              return;
-            isStopped = true;
-            serve2.stop();
+            resolve(response2);
+          });
+        }),
+        dispose: () => new Promise((resolve) => {
+          if (didDispose)
+            return resolve();
+          const request2 = {
+            command: "dispose",
+            key: buildKey
+          };
+          sendRequest(refs, request2, () => {
+            resolve();
             refs.unref();
-          }
-        };
-        refs.ref();
-        serve2.wait.then(refs.unref, refs.unref);
-        return callback(null, result);
-      }
-      return buildResponseToResult(response, callback);
+          });
+        })
+      };
+      refs.ref();
+      callback(null, result);
     });
   }
 }
-var buildServeData = (buildKey, sendRequest, sendResponse, refs, requestCallbacks, options, request) => {
-  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 wait = new Promise((resolve, reject) => {
-    requestCallbacks["serve-wait"] = (id, request2) => {
-      if (request2.error !== null)
-        reject(new Error(request2.error));
-      else
-        resolve();
-      sendResponse(id, {});
-    };
-  });
-  request.serve = {};
-  checkForInvalidFlags(options, keys, `in serve() call`);
-  if (port !== void 0)
-    request.serve.port = port;
-  if (host !== void 0)
-    request.serve.host = host;
-  if (servedir !== void 0)
-    request.serve.servedir = servedir;
-  requestCallbacks["serve-request"] = (id, request2) => {
-    if (onRequest)
-      onRequest(request2.args);
-    sendResponse(id, {});
-  };
-  return {
-    wait,
-    stop() {
-      sendRequest(refs, { command: "serve-stop", key: buildKey }, () => {
-      });
-    }
-  };
-};
 var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn, requestCallbacks, initialOptions, plugins, details) => {
   let onStartCallbacks = [];
   let onEndCallbacks = [];
@@ -1473,18 +1434,49 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
     }
     sendResponse(id, response);
   };
-  let runOnEndCallbacks = (result, logPluginError, done) => done();
+  let runOnEndCallbacks = (result, done) => done([], []);
   if (onEndCallbacks.length > 0) {
-    runOnEndCallbacks = (result, logPluginError, done) => {
+    runOnEndCallbacks = (result, done) => {
       (async () => {
+        const onEndErrors = [];
+        const onEndWarnings = [];
         for (const { name, callback, note } of onEndCallbacks) {
+          let newErrors;
+          let newWarnings;
           try {
-            await callback(result);
+            const value = await callback(result);
+            if (value != null) {
+              if (typeof value !== "object")
+                throw new Error(`Expected onEnd() callback in plugin ${quote(name)} to return an object`);
+              let keys = {};
+              let errors = getFlag(value, keys, "errors", mustBeArray);
+              let warnings = getFlag(value, keys, "warnings", mustBeArray);
+              checkForInvalidFlags(value, keys, `from onEnd() callback in plugin ${quote(name)}`);
+              if (errors != null)
+                newErrors = sanitizeMessages(errors, "errors", details, name);
+              if (warnings != null)
+                newWarnings = sanitizeMessages(warnings, "warnings", details, name);
+            }
           } catch (e) {
-            result.errors.push(await new Promise((resolve) => logPluginError(e, name, note && note(), resolve)));
+            newErrors = [extractErrorMessageV8(e, streamIn, details, note && note(), name)];
+          }
+          if (newErrors) {
+            onEndErrors.push(...newErrors);
+            try {
+              result.errors.push(...newErrors);
+            } catch {
+            }
+          }
+          if (newWarnings) {
+            onEndWarnings.push(...newWarnings);
+            try {
+              result.warnings.push(...newWarnings);
+            } catch {
+            }
           }
         }
-      })().then(done);
+        done(onEndErrors, onEndWarnings);
+      })();
     };
   }
   isSetupDone = true;
@@ -1872,7 +1864,7 @@ for your current platform.`);
         "node_modules",
         ".cache",
         "esbuild",
-        `pnpapi-${pkg.replace("/", "-")}-${"0.16.17"}-${path.basename(subpath)}`
+        `pnpapi-${pkg.replace("/", "-")}-${"0.17.0"}-${path.basename(subpath)}`
       );
       if (!fs.existsSync(binTargetPath)) {
         fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
@@ -1907,7 +1899,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.16.17";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.17.0";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.basename(__dirname) !== "lib")) {
     throw new Error(
@@ -1974,9 +1966,9 @@ var fsAsync = {
     }
   }
 };
-var version = "0.16.17";
+var version = "0.17.0";
 var build = (options) => ensureServiceIsRunning().build(options);
-var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
+var context = (buildOptions) => ensureServiceIsRunning().context(buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
 var formatMessages = (messages, options) => ensureServiceIsRunning().formatMessages(messages, options);
 var analyzeMetafile = (messages, options) => ensureServiceIsRunning().analyzeMetafile(messages, options);
@@ -1987,10 +1979,9 @@ var buildSync = (options) => {
     return workerThreadService.buildSync(options);
   }
   let result;
-  runServiceSync((service) => service.buildOrServe({
+  runServiceSync((service) => service.buildOrContext({
     callName: "buildSync",
     refs: null,
-    serveOptions: null,
     options,
     isTTY: isTTY(),
     defaultWD,
@@ -2085,7 +2076,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.16.17"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.17.0"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -2099,7 +2090,7 @@ var ensureServiceIsRunning = () => {
     },
     readFileSync: fs2.readFileSync,
     isSync: false,
-    isWriteUnavailable: false,
+    hasFS: true,
     esbuild: node_exports
   });
   child.stdin.on("error", afterClose);
@@ -2127,61 +2118,47 @@ var ensureServiceIsRunning = () => {
     }
   };
   longLivedService = {
-    build: (options) => {
-      return new Promise((resolve, reject) => {
-        service.buildOrServe({
-          callName: "build",
-          refs,
-          serveOptions: null,
-          options,
-          isTTY: isTTY(),
-          defaultWD,
-          callback: (err, res) => err ? reject(err) : resolve(res)
-        });
-      });
-    },
-    serve: (serveOptions, buildOptions) => {
-      if (serveOptions === null || typeof serveOptions !== "object")
-        throw new Error("The first argument must be an object");
-      return new Promise((resolve, reject) => service.buildOrServe({
-        callName: "serve",
+    build: (options) => new Promise((resolve, reject) => {
+      service.buildOrContext({
+        callName: "build",
         refs,
-        serveOptions,
-        options: buildOptions,
+        options,
         isTTY: isTTY(),
         defaultWD,
         callback: (err, res) => err ? reject(err) : resolve(res)
-      }));
-    },
-    transform: (input, options) => {
-      return new Promise((resolve, reject) => service.transform({
-        callName: "transform",
-        refs,
-        input,
-        options: options || {},
-        isTTY: isTTY(),
-        fs: fsAsync,
-        callback: (err, res) => err ? reject(err) : resolve(res)
-      }));
-    },
-    formatMessages: (messages, options) => {
-      return new Promise((resolve, reject) => service.formatMessages({
-        callName: "formatMessages",
-        refs,
-        messages,
-        options,
-        callback: (err, res) => err ? reject(err) : resolve(res)
-      }));
-    },
-    analyzeMetafile: (metafile, options) => {
-      return new Promise((resolve, reject) => service.analyzeMetafile({
-        callName: "analyzeMetafile",
-        refs,
-        metafile: typeof metafile === "string" ? metafile : JSON.stringify(metafile),
-        options,
-        callback: (err, res) => err ? reject(err) : resolve(res)
-      }));
-    }
+      });
+    }),
+    context: (options) => new Promise((resolve, reject) => service.buildOrContext({
+      callName: "context",
+      refs,
+      options,
+      isTTY: isTTY(),
+      defaultWD,
+      callback: (err, res) => err ? reject(err) : resolve(res)
+    })),
+    transform: (input, options) => new Promise((resolve, reject) => service.transform({
+      callName: "transform",
+      refs,
+      input,
+      options: options || {},
+      isTTY: isTTY(),
+      fs: fsAsync,
+      callback: (err, res) => err ? reject(err) : resolve(res)
+    })),
+    formatMessages: (messages, options) => new Promise((resolve, reject) => service.formatMessages({
+      callName: "formatMessages",
+      refs,
+      messages,
+      options,
+      callback: (err, res) => err ? reject(err) : resolve(res)
+    })),
+    analyzeMetafile: (metafile, options) => new Promise((resolve, reject) => service.analyzeMetafile({
+      callName: "analyzeMetafile",
+      refs,
+      metafile: typeof metafile === "string" ? metafile : JSON.stringify(metafile),
+      options,
+      callback: (err, res) => err ? reject(err) : resolve(res)
+    }))
   };
   return longLivedService;
 };
@@ -2195,11 +2172,11 @@ var runServiceSync = (callback) => {
       stdin = bytes;
     },
     isSync: true,
-    isWriteUnavailable: false,
+    hasFS: true,
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.16.17"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.17.0"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -2219,7 +2196,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.16.17" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.17.0" },
     transferList: [workerPort],
     // From node's documentation: https://nodejs.org/api/worker_threads.html
     //
@@ -2245,14 +2222,8 @@ error: ${text}`);
     if (!options)
       return;
     let plugins = options.plugins;
-    let incremental = options.incremental;
-    let watch = options.watch;
     if (plugins && plugins.length > 0)
       throw fakeBuildError(`Cannot use plugins in synchronous API calls`);
-    if (incremental)
-      throw fakeBuildError(`Cannot use "incremental" with a synchronous build`);
-    if (watch)
-      throw fakeBuildError(`Cannot use "watch" with a synchronous build`);
   };
   let applyProperties = (object, properties) => {
     for (let key in properties) {
@@ -2357,10 +2328,10 @@ var node_default = node_exports;
   analyzeMetafileSync,
   build,
   buildSync,
+  context,
   formatMessages,
   formatMessagesSync,
   initialize,
-  serve,
   transform,
   transformSync,
   version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.16.17",
+  "version": "0.17.0",
   "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.16.17",
-    "@esbuild/android-arm64": "0.16.17",
-    "@esbuild/android-x64": "0.16.17",
-    "@esbuild/darwin-arm64": "0.16.17",
-    "@esbuild/darwin-x64": "0.16.17",
-    "@esbuild/freebsd-arm64": "0.16.17",
-    "@esbuild/freebsd-x64": "0.16.17",
-    "@esbuild/linux-arm": "0.16.17",
-    "@esbuild/linux-arm64": "0.16.17",
-    "@esbuild/linux-ia32": "0.16.17",
-    "@esbuild/linux-loong64": "0.16.17",
-    "@esbuild/linux-mips64el": "0.16.17",
-    "@esbuild/linux-ppc64": "0.16.17",
-    "@esbuild/linux-riscv64": "0.16.17",
-    "@esbuild/linux-s390x": "0.16.17",
-    "@esbuild/linux-x64": "0.16.17",
-    "@esbuild/netbsd-x64": "0.16.17",
-    "@esbuild/openbsd-x64": "0.16.17",
-    "@esbuild/sunos-x64": "0.16.17",
-    "@esbuild/win32-arm64": "0.16.17",
-    "@esbuild/win32-ia32": "0.16.17",
-    "@esbuild/win32-x64": "0.16.17"
+    "@esbuild/android-arm": "0.17.0",
+    "@esbuild/android-arm64": "0.17.0",
+    "@esbuild/android-x64": "0.17.0",
+    "@esbuild/darwin-arm64": "0.17.0",
+    "@esbuild/darwin-x64": "0.17.0",
+    "@esbuild/freebsd-arm64": "0.17.0",
+    "@esbuild/freebsd-x64": "0.17.0",
+    "@esbuild/linux-arm": "0.17.0",
+    "@esbuild/linux-arm64": "0.17.0",
+    "@esbuild/linux-ia32": "0.17.0",
+    "@esbuild/linux-loong64": "0.17.0",
+    "@esbuild/linux-mips64el": "0.17.0",
+    "@esbuild/linux-ppc64": "0.17.0",
+    "@esbuild/linux-riscv64": "0.17.0",
+    "@esbuild/linux-s390x": "0.17.0",
+    "@esbuild/linux-x64": "0.17.0",
+    "@esbuild/netbsd-x64": "0.17.0",
+    "@esbuild/openbsd-x64": "0.17.0",
+    "@esbuild/sunos-x64": "0.17.0",
+    "@esbuild/win32-arm64": "0.17.0",
+    "@esbuild/win32-ia32": "0.17.0",
+    "@esbuild/win32-x64": "0.17.0"
   },
   "license": "MIT"
 }