esbuild 0.19.5 → 0.19.7

package/bin/esbuild

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

package/lib/main.d.ts

@@ -425,6 +425,7 @@ export interface OnLoadArgs {
   namespace: string
   suffix: string
   pluginData: any
+  with: Record<string, string>
 }
 
 /** Documentation: https://esbuild.github.io/plugins/#on-load-results */
@@ -467,8 +468,10 @@ export interface Metafile {
         kind: ImportKind
         external?: boolean
         original?: string
+        with?: Record<string, string>
       }[]
       format?: 'cjs' | 'esm'
+      with?: Record<string, string>
     }
   }
   outputs: {

package/lib/main.js

@@ -746,8 +746,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.19.5") {
-        throw new Error(`Cannot start service: Host version "${"0.19.5"}" does not match binary version ${quote(binaryVersion)}`);
+      if (binaryVersion !== "0.19.7") {
+        throw new Error(`Cannot start service: Host version "${"0.19.7"}" does not match binary version ${quote(binaryVersion)}`);
       }
       return;
     }
@@ -890,7 +890,6 @@ function createChannel(streamIn) {
     start(null);
   };
   let formatMessages2 = ({ callName, refs, messages, options, callback }) => {
-    let result = sanitizeMessages(messages, "messages", null, "");
     if (!options)
       throw new Error(`Missing second argument in ${callName}() call`);
     let keys = {};
@@ -904,7 +903,7 @@ function createChannel(streamIn) {
       throw new Error(`Expected "kind" to be "error" or "warning" in ${callName}() call`);
     let request = {
       command: "format-msgs",
-      messages: result,
+      messages: sanitizeMessages(messages, "messages", null, "", terminalWidth),
       isWarning: kind === "warning"
     };
     if (color !== void 0)
@@ -1356,9 +1355,9 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           let warnings = getFlag(result, keys, "warnings", mustBeArray);
           checkForInvalidFlags(result, keys, `from onStart() callback in plugin ${quote(name)}`);
           if (errors != null)
-            response.errors.push(...sanitizeMessages(errors, "errors", details, name));
+            response.errors.push(...sanitizeMessages(errors, "errors", details, name, void 0));
           if (warnings != null)
-            response.warnings.push(...sanitizeMessages(warnings, "warnings", details, name));
+            response.warnings.push(...sanitizeMessages(warnings, "warnings", details, name, void 0));
         }
       } catch (e) {
         response.errors.push(extractErrorMessageV8(e, streamIn, details, note && note(), name));
@@ -1411,9 +1410,9 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           if (pluginData != null)
             response.pluginData = details.store(pluginData);
           if (errors != null)
-            response.errors = sanitizeMessages(errors, "errors", details, name);
+            response.errors = sanitizeMessages(errors, "errors", details, name, void 0);
           if (warnings != null)
-            response.warnings = sanitizeMessages(warnings, "warnings", details, name);
+            response.warnings = sanitizeMessages(warnings, "warnings", details, name, void 0);
           if (watchFiles != null)
             response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
           if (watchDirs != null)
@@ -1436,7 +1435,8 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           path: request.path,
           namespace: request.namespace,
           suffix: request.suffix,
-          pluginData: details.load(request.pluginData)
+          pluginData: details.load(request.pluginData),
+          with: request.with
         });
         if (result != null) {
           if (typeof result !== "object")
@@ -1466,9 +1466,9 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
           if (loader != null)
             response.loader = loader;
           if (errors != null)
-            response.errors = sanitizeMessages(errors, "errors", details, name);
+            response.errors = sanitizeMessages(errors, "errors", details, name, void 0);
           if (warnings != null)
-            response.warnings = sanitizeMessages(warnings, "warnings", details, name);
+            response.warnings = sanitizeMessages(warnings, "warnings", details, name, void 0);
           if (watchFiles != null)
             response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
           if (watchDirs != null)
@@ -1501,9 +1501,9 @@ var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn,
               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);
+                newErrors = sanitizeMessages(errors, "errors", details, name, void 0);
               if (warnings != null)
-                newWarnings = sanitizeMessages(warnings, "warnings", details, name);
+                newWarnings = sanitizeMessages(warnings, "warnings", details, name, void 0);
             }
           } catch (e) {
             newErrors = [extractErrorMessageV8(e, streamIn, details, note && note(), name)];
@@ -1668,7 +1668,7 @@ function replaceDetailsInMessages(messages, stash) {
   }
   return messages;
 }
-function sanitizeLocation(location, where) {
+function sanitizeLocation(location, where, terminalWidth) {
   if (location == null)
     return null;
   let keys = {};
@@ -1680,6 +1680,15 @@ function sanitizeLocation(location, where) {
   let lineText = getFlag(location, keys, "lineText", mustBeString);
   let suggestion = getFlag(location, keys, "suggestion", mustBeString);
   checkForInvalidFlags(location, keys, where);
+  if (lineText) {
+    const relevantASCII = lineText.slice(
+      0,
+      (column && column > 0 ? column : 0) + (length && length > 0 ? length : 0) + (terminalWidth && terminalWidth > 0 ? terminalWidth : 80)
+    );
+    if (!/[\x7F-\uFFFF]/.test(relevantASCII) && !/\n/.test(lineText)) {
+      lineText = relevantASCII;
+    }
+  }
   return {
     file: file || "",
     namespace: namespace || "",
@@ -1690,7 +1699,7 @@ function sanitizeLocation(location, where) {
     suggestion: suggestion || ""
   };
 }
-function sanitizeMessages(messages, property, stash, fallbackPluginName) {
+function sanitizeMessages(messages, property, stash, fallbackPluginName, terminalWidth) {
   let messagesClone = [];
   let index = 0;
   for (const message of messages) {
@@ -1712,7 +1721,7 @@ function sanitizeMessages(messages, property, stash, fallbackPluginName) {
         checkForInvalidFlags(note, noteKeys, where);
         notesClone.push({
           text: noteText || "",
-          location: sanitizeLocation(noteLocation, where)
+          location: sanitizeLocation(noteLocation, where, terminalWidth)
         });
       }
     }
@@ -1720,7 +1729,7 @@ function sanitizeMessages(messages, property, stash, fallbackPluginName) {
       id: id || "",
       pluginName: pluginName || fallbackPluginName,
       text: text || "",
-      location: sanitizeLocation(location, where),
+      location: sanitizeLocation(location, where, terminalWidth),
       notes: notesClone,
       detail: stash ? stash.store(detail) : -1
     });
@@ -1930,7 +1939,7 @@ for your current platform.`);
         "node_modules",
         ".cache",
         "esbuild",
-        `pnpapi-${pkg.replace("/", "-")}-${"0.19.5"}-${path.basename(subpath)}`
+        `pnpapi-${pkg.replace("/", "-")}-${"0.19.7"}-${path.basename(subpath)}`
       );
       if (!fs.existsSync(binTargetPath)) {
         fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
@@ -1965,7 +1974,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.19.5";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.19.7";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.basename(__dirname) !== "lib")) {
     throw new Error(
@@ -2032,7 +2041,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.19.5";
+var version = "0.19.7";
 var build = (options) => ensureServiceIsRunning().build(options);
 var context = (buildOptions) => ensureServiceIsRunning().context(buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -2142,7 +2151,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.19.5"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.19.7"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -2242,7 +2251,7 @@ var runServiceSync = (callback) => {
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.19.5"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.19.7"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -2262,7 +2271,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.19.5" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.19.7" },
     transferList: [workerPort],
     // From node's documentation: https://nodejs.org/api/worker_threads.html
     //

package/package.json

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