esbuild 0.15.4 → 0.15.7

package/bin/esbuild

@@ -151,16 +151,22 @@ by esbuild to install the correct binary executable for your current platform.`)
       throw e;
     }
   }
-  let isYarnPnP = false;
+  let pnpapi;
   try {
-    require("pnpapi");
-    isYarnPnP = true;
+    pnpapi = require("pnpapi");
   } catch (e) {
   }
-  if (isYarnPnP) {
-    const esbuildLibDir = path.dirname(require.resolve("esbuild"));
-    const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
+  if (pnpapi) {
+    const root = pnpapi.getPackageInformation(pnpapi.topLevel).packageLocation;
+    const binTargetPath = path.join(
+      root,
+      "node_modules",
+      ".cache",
+      "esbuild",
+      `pnpapi-${pkg}-${"0.15.7"}-${path.basename(subpath)}`
+    );
     if (!fs.existsSync(binTargetPath)) {
+      fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
       fs.copyFileSync(binPath2, binTargetPath);
       fs.chmodSync(binTargetPath, 493);
     }

package/install.js

@@ -89,8 +89,8 @@ function validateBinaryVersion(...command) {
   const stdout = child_process.execFileSync(command.shift(), command, {
     stdio: "pipe"
   }).toString().trim();
-  if (stdout !== "0.15.4") {
-    throw new Error(`Expected ${JSON.stringify("0.15.4")} but got ${JSON.stringify(stdout)}`);
+  if (stdout !== "0.15.7") {
+    throw new Error(`Expected ${JSON.stringify("0.15.7")} but got ${JSON.stringify(stdout)}`);
   }
 }
 function isYarn() {
@@ -142,7 +142,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.4"}`,
+      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"0.15.7"}`,
       { cwd: installDir, stdio: "pipe", env }
     );
     const installedBinPath = path2.join(installDir, "node_modules", pkg, subpath);
@@ -193,7 +193,7 @@ function maybeOptimizePackage(binPath) {
   }
 }
 async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
-  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.15.4"}.tgz`;
+  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.15.7"}.tgz`;
   console.error(`[esbuild] Trying to download ${JSON.stringify(url)}`);
   try {
     fs2.writeFileSync(binPath, extractFileFromTarGzip(await fetch(url), subpath));
@@ -237,7 +237,7 @@ this. If that fails, you need to remove the "--no-optional" flag to use esbuild.
 }
 checkAndPreparePackage().then(() => {
   if (isToPathJS) {
-    validateBinaryVersion("node", toPath);
+    validateBinaryVersion(process.execPath, toPath);
   } else {
     validateBinaryVersion(toPath);
   }

package/lib/main.js

@@ -758,8 +758,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.15.4") {
-        throw new Error(`Cannot start service: Host version "${"0.15.4"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.15.7") {
+        throw new Error(`Cannot start service: Host version "${"0.15.7"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -1849,16 +1849,22 @@ by esbuild to install the correct binary executable for your current platform.`)
       throw e;
     }
   }
-  let isYarnPnP = false;
+  let pnpapi;
   try {
-    require("pnpapi");
-    isYarnPnP = true;
+    pnpapi = require("pnpapi");
   } catch (e) {
   }
-  if (isYarnPnP) {
-    const esbuildLibDir = path.dirname(require.resolve("esbuild"));
-    const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
+  if (pnpapi) {
+    const root = pnpapi.getPackageInformation(pnpapi.topLevel).packageLocation;
+    const binTargetPath = path.join(
+      root,
+      "node_modules",
+      ".cache",
+      "esbuild",
+      `pnpapi-${pkg}-${"0.15.7"}-${path.basename(subpath)}`
+    );
     if (!fs.existsSync(binTargetPath)) {
+      fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
       fs.copyFileSync(binPath, binTargetPath);
       fs.chmodSync(binTargetPath, 493);
     }
@@ -1886,7 +1892,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.4";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.15.7";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.basename(__dirname) !== "lib")) {
     throw new Error(
@@ -1897,12 +1903,13 @@ More information: The file containing the code for esbuild's JavaScript API (${_
   }
   if (false) {
     return ["node", [path2.join(__dirname, "..", "bin", "esbuild")]];
-  }
-  const { binPath, isWASM } = generateBinPath();
-  if (isWASM) {
-    return ["node", [binPath]];
   } else {
-    return [binPath, []];
+    const { binPath, isWASM } = generateBinPath();
+    if (isWASM) {
+      return ["node", [binPath]];
+    } else {
+      return [binPath, []];
+    }
   }
 };
 var isTTY = () => tty.isatty(2);
@@ -1952,7 +1959,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.15.4";
+var version = "0.15.7";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -2063,7 +2070,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.15.4"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.15.7"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -2177,7 +2184,7 @@ var runServiceSync = (callback) => {
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.15.4"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.15.7"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -2193,7 +2200,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.4" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.15.7" },
     transferList: [workerPort],
     execArgv: []
   });

package/package.json

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