esbuild 0.13.3 → 0.13.4

package/bin/esbuild

@@ -43,40 +43,48 @@ var knownUnixlikePackages = {
   "linux x64 LE": "esbuild-linux-64",
   "sunos x64 LE": "esbuild-sunos-64"
 };
-function binPathForCurrentPlatform() {
+function pkgAndSubpathForCurrentPlatform() {
   let pkg;
-  let bin;
+  let subpath;
   let platformKey = `${process.platform} ${os.arch()} ${os.endianness()}`;
   if (platformKey in knownWindowsPackages) {
     pkg = knownWindowsPackages[platformKey];
-    bin = `${pkg}/esbuild.exe`;
+    subpath = "esbuild.exe";
   } else if (platformKey in knownUnixlikePackages) {
     pkg = knownUnixlikePackages[platformKey];
-    bin = `${pkg}/bin/esbuild`;
+    subpath = "bin/esbuild";
   } else {
     throw new Error(`Unsupported platform: ${platformKey}`);
   }
+  return { pkg, subpath };
+}
+function downloadedBinPath(pkg, subpath) {
+  const esbuildLibDir = path.dirname(require.resolve("esbuild"));
+  return path.join(esbuildLibDir, `downloaded-${pkg}-${path.basename(subpath)}`);
+}
+function generateBinPath() {
+  if (ESBUILD_BINARY_PATH) {
+    return ESBUILD_BINARY_PATH;
+  }
+  const { pkg, subpath } = pkgAndSubpathForCurrentPlatform();
+  let binPath;
   try {
-    bin = require.resolve(bin);
+    binPath = require.resolve(`${pkg}/${subpath}`);
   } catch (e) {
-    try {
-      require.resolve(pkg);
-    } catch (e2) {
-      throw new Error(`The package "${pkg}" could not be found, and is needed by esbuild.
+    binPath = downloadedBinPath(pkg, subpath);
+    if (!fs.existsSync(binPath)) {
+      try {
+        require.resolve(pkg);
+      } catch (e2) {
+        throw new Error(`The package "${pkg}" could not be found, and is needed by esbuild.
 
 If you are installing esbuild with npm, make sure that you don't specify the
 "--no-optional" flag. The "optionalDependencies" package.json feature is used
 by esbuild to install the correct binary executable for your current platform.`);
+      }
+      throw e;
     }
-    throw e;
-  }
-  return bin;
-}
-function extractedBinPath() {
-  if (ESBUILD_BINARY_PATH) {
-    return ESBUILD_BINARY_PATH;
   }
-  const bin = binPathForCurrentPlatform();
   let isYarnPnP = false;
   try {
     require("pnpapi");
@@ -85,15 +93,15 @@ function extractedBinPath() {
   }
   if (isYarnPnP) {
     const esbuildLibDir = path.dirname(require.resolve("esbuild"));
-    const binTargetPath = path.join(esbuildLibDir, "yarn-pnp-" + path.basename(bin));
+    const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
     if (!fs.existsSync(binTargetPath)) {
-      fs.copyFileSync(bin, binTargetPath);
+      fs.copyFileSync(binPath, binTargetPath);
       fs.chmodSync(binTargetPath, 493);
     }
     return binTargetPath;
   }
-  return bin;
+  return binPath;
 }
 
 // lib/npm/node-shim.ts
-require("child_process").execFileSync(extractedBinPath(), process.argv.slice(2), { stdio: "inherit" });
+require("child_process").execFileSync(generateBinPath(), process.argv.slice(2), { stdio: "inherit" });

package/install.js

@@ -1,3 +1,39 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __reExport = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+};
+
 // lib/npm/node-platform.ts
 var fs = require("fs");
 var os = require("os");
@@ -23,61 +59,118 @@ var knownUnixlikePackages = {
   "linux x64 LE": "esbuild-linux-64",
   "sunos x64 LE": "esbuild-sunos-64"
 };
-function binPathForCurrentPlatform() {
+function pkgAndSubpathForCurrentPlatform() {
   let pkg;
-  let bin;
+  let subpath;
   let platformKey = `${process.platform} ${os.arch()} ${os.endianness()}`;
   if (platformKey in knownWindowsPackages) {
     pkg = knownWindowsPackages[platformKey];
-    bin = `${pkg}/esbuild.exe`;
+    subpath = "esbuild.exe";
   } else if (platformKey in knownUnixlikePackages) {
     pkg = knownUnixlikePackages[platformKey];
-    bin = `${pkg}/bin/esbuild`;
+    subpath = "bin/esbuild";
   } else {
     throw new Error(`Unsupported platform: ${platformKey}`);
   }
-  try {
-    bin = require.resolve(bin);
-  } catch (e) {
-    try {
-      require.resolve(pkg);
-    } catch (e2) {
-      throw new Error(`The package "${pkg}" could not be found, and is needed by esbuild.
-
-If you are installing esbuild with npm, make sure that you don't specify the
-"--no-optional" flag. The "optionalDependencies" package.json feature is used
-by esbuild to install the correct binary executable for your current platform.`);
-    }
-    throw e;
-  }
-  return bin;
+  return { pkg, subpath };
+}
+function downloadedBinPath(pkg, subpath) {
+  const esbuildLibDir = path.dirname(require.resolve("esbuild"));
+  return path.join(esbuildLibDir, `downloaded-${pkg}-${path.basename(subpath)}`);
 }
 
 // lib/npm/node-install.ts
 var fs2 = require("fs");
 var os2 = require("os");
 var path2 = require("path");
+var zlib = require("zlib");
+var https = require("https");
 var child_process = require("child_process");
 var toPath = path2.join(__dirname, "bin", "esbuild");
+var isToPathJS = true;
 function validateBinaryVersion(...command) {
   command.push("--version");
   const stdout = child_process.execFileSync(command.shift(), command).toString().trim();
-  if (stdout !== "0.13.3") {
-    throw new Error(`Expected ${JSON.stringify("0.13.3")} but got ${JSON.stringify(stdout)}`);
+  if (stdout !== "0.13.4") {
+    throw new Error(`Expected ${JSON.stringify("0.13.4")} but got ${JSON.stringify(stdout)}`);
   }
 }
-function isYarn2OrAbove() {
+function isYarn() {
   const { npm_config_user_agent } = process.env;
   if (npm_config_user_agent) {
-    const match = npm_config_user_agent.match(/yarn\/(\d+)/);
-    if (match && match[1]) {
-      return parseInt(match[1], 10) >= 2;
-    }
+    return /\byarn\//.test(npm_config_user_agent);
   }
   return false;
 }
-if (process.env.ESBUILD_BINARY_PATH) {
-  const pathString = JSON.stringify(process.env.ESBUILD_BINARY_PATH);
+function fetch(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, (res) => {
+      if ((res.statusCode === 301 || res.statusCode === 302) && res.headers.location)
+        return fetch(res.headers.location).then(resolve, reject);
+      if (res.statusCode !== 200)
+        return reject(new Error(`Server responded with ${res.statusCode}`));
+      let chunks = [];
+      res.on("data", (chunk) => chunks.push(chunk));
+      res.on("end", () => resolve(Buffer.concat(chunks)));
+    }).on("error", reject);
+  });
+}
+function extractFileFromTarGzip(buffer, subpath) {
+  try {
+    buffer = zlib.unzipSync(buffer);
+  } catch (err) {
+    throw new Error(`Invalid gzip data in archive: ${err && err.message || err}`);
+  }
+  let str = (i, n) => String.fromCharCode(...buffer.subarray(i, i + n)).replace(/\0.*$/, "");
+  let offset = 0;
+  subpath = `package/${subpath}`;
+  while (offset < buffer.length) {
+    let name = str(offset, 100);
+    let size = parseInt(str(offset + 124, 12), 8);
+    offset += 512;
+    if (!isNaN(size)) {
+      if (name === subpath)
+        return buffer.subarray(offset, offset + size);
+      offset += size + 511 & ~511;
+    }
+  }
+  throw new Error(`Could not find ${JSON.stringify(subpath)} in archive`);
+}
+function installUsingNPM(pkg, subpath, binPath) {
+  const env = __spreadProps(__spreadValues({}, process.env), { npm_config_global: void 0 });
+  const esbuildLibDir = path2.dirname(require.resolve("esbuild"));
+  const installDir = path2.join(esbuildLibDir, "npm-install");
+  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.13.4"}`, { cwd: installDir, stdio: "pipe", env });
+    const installedBinPath = path2.join(installDir, "node_modules", pkg, subpath);
+    fs2.renameSync(installedBinPath, binPath);
+  } finally {
+    try {
+      removeRecursive(installDir);
+    } catch (e) {
+    }
+  }
+}
+function removeRecursive(dir) {
+  for (const entry of fs2.readdirSync(dir)) {
+    const entryPath = path2.join(dir, entry);
+    let stats;
+    try {
+      stats = fs2.lstatSync(entryPath);
+    } catch (e) {
+      continue;
+    }
+    if (stats.isDirectory())
+      removeRecursive(entryPath);
+    else
+      fs2.unlinkSync(entryPath);
+  }
+  fs2.rmdirSync(dir);
+}
+function applyManualBinaryPathOverride(overridePath) {
+  const pathString = JSON.stringify(overridePath);
   fs2.writeFileSync(toPath, `#!/usr/bin/env node
 require('child_process').execFileSync(${pathString}, process.argv.slice(2), { stdio: 'inherit' });
 `);
@@ -85,15 +178,65 @@ require('child_process').execFileSync(${pathString}, process.argv.slice(2), { st
   const code = fs2.readFileSync(libMain, "utf8");
   fs2.writeFileSync(libMain, `var ESBUILD_BINARY_PATH = ${pathString};
 ${code}`);
-  validateBinaryVersion("node", toPath);
-} else if (os2.platform() !== "win32" && !isYarn2OrAbove()) {
-  const bin = binPathForCurrentPlatform();
+}
+function maybeOptimizePackage(binPath) {
+  if (os2.platform() !== "win32" && !isYarn()) {
+    const tempPath = path2.join(__dirname, "bin-esbuild");
+    try {
+      fs2.linkSync(binPath, tempPath);
+      fs2.renameSync(tempPath, toPath);
+      isToPathJS = false;
+    } catch (e) {
+    }
+  }
+}
+async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
+  const url = `https://registry.npmjs.org/${pkg}/-/${pkg}-${"0.13.4"}.tgz`;
+  console.error(`[esbuild] Trying to download ${JSON.stringify(url)}`);
+  try {
+    fs2.writeFileSync(binPath, extractFileFromTarGzip(await fetch(url), subpath));
+    fs2.chmodSync(binPath, 493);
+  } catch (e) {
+    console.error(`[esbuild] Failed to download ${JSON.stringify(url)}: ${e && e.message || e}`);
+    throw e;
+  }
+}
+async function checkAndPreparePackage() {
+  if (process.env.ESBUILD_BINARY_PATH) {
+    applyManualBinaryPathOverride(process.env.ESBUILD_BINARY_PATH);
+    return;
+  }
+  const { pkg, subpath } = pkgAndSubpathForCurrentPlatform();
+  let binPath;
   try {
-    fs2.unlinkSync(toPath);
-    fs2.linkSync(bin, toPath);
+    binPath = require.resolve(`${pkg}/${subpath}`);
   } catch (e) {
+    console.error(`[esbuild] Failed to find package "${pkg}" on the file system
+
+This can happen if you use the "--no-optional" flag. The "optionalDependencies"
+package.json feature is used by esbuild to install the correct binary executable
+for your current platform. This install script will now attempt to work around
+this. If that fails, you need to remove the "--no-optional" flag to use esbuild.
+`);
+    binPath = downloadedBinPath(pkg, subpath);
+    try {
+      console.error(`[esbuild] Trying to install package "${pkg}" using npm`);
+      installUsingNPM(pkg, subpath, binPath);
+    } catch (e2) {
+      console.error(`[esbuild] Failed to install package "${pkg}" using npm: ${e2 && e2.message || e2}`);
+      try {
+        await downloadDirectlyFromNPM(pkg, subpath, binPath);
+      } catch (e3) {
+        throw new Error(`Failed to install package "${pkg}"`);
+      }
+    }
   }
-  validateBinaryVersion(toPath);
-} else {
-  validateBinaryVersion("node", toPath);
+  maybeOptimizePackage(binPath);
 }
+checkAndPreparePackage().then(() => {
+  if (isToPathJS) {
+    validateBinaryVersion("node", toPath);
+  } else {
+    validateBinaryVersion(toPath);
+  }
+});

package/lib/main.js

@@ -709,8 +709,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.13.3") {
-        throw new Error(`Cannot start service: Host version "${"0.13.3"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.13.4") {
+        throw new Error(`Cannot start service: Host version "${"0.13.4"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -1606,40 +1606,48 @@ var knownUnixlikePackages = {
   "linux x64 LE": "esbuild-linux-64",
   "sunos x64 LE": "esbuild-sunos-64"
 };
-function binPathForCurrentPlatform() {
+function pkgAndSubpathForCurrentPlatform() {
   let pkg;
-  let bin;
+  let subpath;
   let platformKey = `${process.platform} ${os.arch()} ${os.endianness()}`;
   if (platformKey in knownWindowsPackages) {
     pkg = knownWindowsPackages[platformKey];
-    bin = `${pkg}/esbuild.exe`;
+    subpath = "esbuild.exe";
   } else if (platformKey in knownUnixlikePackages) {
     pkg = knownUnixlikePackages[platformKey];
-    bin = `${pkg}/bin/esbuild`;
+    subpath = "bin/esbuild";
   } else {
     throw new Error(`Unsupported platform: ${platformKey}`);
   }
+  return { pkg, subpath };
+}
+function downloadedBinPath(pkg, subpath) {
+  const esbuildLibDir = path.dirname(require.resolve("esbuild"));
+  return path.join(esbuildLibDir, `downloaded-${pkg}-${path.basename(subpath)}`);
+}
+function generateBinPath() {
+  if (ESBUILD_BINARY_PATH) {
+    return ESBUILD_BINARY_PATH;
+  }
+  const { pkg, subpath } = pkgAndSubpathForCurrentPlatform();
+  let binPath;
   try {
-    bin = require.resolve(bin);
+    binPath = require.resolve(`${pkg}/${subpath}`);
   } catch (e) {
-    try {
-      require.resolve(pkg);
-    } catch (e2) {
-      throw new Error(`The package "${pkg}" could not be found, and is needed by esbuild.
+    binPath = downloadedBinPath(pkg, subpath);
+    if (!fs.existsSync(binPath)) {
+      try {
+        require.resolve(pkg);
+      } catch (e2) {
+        throw new Error(`The package "${pkg}" could not be found, and is needed by esbuild.
 
 If you are installing esbuild with npm, make sure that you don't specify the
 "--no-optional" flag. The "optionalDependencies" package.json feature is used
 by esbuild to install the correct binary executable for your current platform.`);
+      }
+      throw e;
     }
-    throw e;
-  }
-  return bin;
-}
-function extractedBinPath() {
-  if (ESBUILD_BINARY_PATH) {
-    return ESBUILD_BINARY_PATH;
   }
-  const bin = binPathForCurrentPlatform();
   let isYarnPnP = false;
   try {
     require("pnpapi");
@@ -1648,14 +1656,14 @@ function extractedBinPath() {
   }
   if (isYarnPnP) {
     const esbuildLibDir = path.dirname(require.resolve("esbuild"));
-    const binTargetPath = path.join(esbuildLibDir, "yarn-pnp-" + path.basename(bin));
+    const binTargetPath = path.join(esbuildLibDir, `pnpapi-${pkg}-${path.basename(subpath)}`);
     if (!fs.existsSync(binTargetPath)) {
-      fs.copyFileSync(bin, binTargetPath);
+      fs.copyFileSync(binPath, binTargetPath);
       fs.chmodSync(binTargetPath, 493);
     }
     return binTargetPath;
   }
-  return bin;
+  return binPath;
 }
 
 // lib/npm/node.ts
@@ -1677,7 +1685,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.13.3";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.13.4";
 var esbuildCommandAndArgs = () => {
   if (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.
@@ -1687,7 +1695,7 @@ More information: The file containing the code for esbuild's JavaScript API (${_
   if (false) {
     return ["node", [path2.join(__dirname, "..", "bin", "esbuild")]];
   }
-  return [extractedBinPath(), []];
+  return [generateBinPath(), []];
 };
 var isTTY = () => tty.isatty(2);
 var fsSync = {
@@ -1736,7 +1744,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.13.3";
+var version = "0.13.4";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -1845,7 +1853,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.13.3"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.13.4"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -1952,7 +1960,7 @@ var runServiceSync = (callback) => {
     isBrowser: false
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.13.3"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.13.4"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -1968,7 +1976,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.13.3" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.13.4" },
     transferList: [workerPort],
     execArgv: []
   });

package/package.json

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