@vercel/build-utils 9.2.1 → 9.3.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/build-utils
 
+## 9.3.1
+
+### Patch Changes
+
+- [build-utils] extract install command specific logic into helper ([#13049](https://github.com/vercel/vercel/pull/13049))
+
+- [build-utils] remove dead node 16 check ([#13047](https://github.com/vercel/vercel/pull/13047))
+
+## 9.3.0
+
+### Minor Changes
+
+- Support process tracing ([#12894](https://github.com/vercel/vercel/pull/12894))
+
 ## 9.2.1
 
 ### Patch Changes

package/dist/fs/run-user-scripts.js

@@ -423,6 +423,45 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+async function runInstallCommand({
+  packageManager,
+  args,
+  opts
+}) {
+  const getInstallCommandForPackageManager = (packageManager2, args2) => {
+    switch (packageManager2) {
+      case "npm":
+        return {
+          prettyCommand: "npm install",
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"])
+        };
+      case "pnpm":
+        return {
+          prettyCommand: "pnpm install",
+          // PNPM's install command is similar to NPM's but without the audit nonsense
+          // @see options https://pnpm.io/cli/install
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"])
+        };
+      case "bun":
+        return {
+          prettyCommand: "bun install",
+          // @see options https://bun.sh/docs/cli/install
+          commandArguments: ["install", ...args2]
+        };
+      case "yarn":
+        return {
+          prettyCommand: "yarn install",
+          commandArguments: ["install", ...args2]
+        };
+    }
+  };
+  const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
+  opts.prettyCommand = prettyCommand;
+  if (process.env.NPM_ONLY_PRODUCTION) {
+    commandArguments.push("--production");
+  }
+  await spawnAsync(packageManager, commandArguments, opts);
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     (0, import_debug.default)("Skipping dependency installation because dev mode is enabled");
@@ -473,45 +512,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonEngines: packageJson?.engines,
       turboSupportsCorepackHome
     });
-    let commandArgs;
-    const isPotentiallyBrokenNpm = cliType === "npm" && (nodeVersion?.major === 16 || opts.env.PATH?.includes("/node16/bin-npm7")) && !args.includes("--legacy-peer-deps") && spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== "1";
-    if (cliType === "npm") {
-      opts.prettyCommand = "npm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"]);
-      if (isPotentiallyBrokenNpm && spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === "1") {
-        commandArgs.push("--legacy-peer-deps");
-      }
-    } else if (cliType === "pnpm") {
-      opts.prettyCommand = "pnpm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"]);
-    } else if (cliType === "bun") {
-      opts.prettyCommand = "bun install";
-      commandArgs = ["install", ...args];
-    } else {
-      opts.prettyCommand = "yarn install";
-      commandArgs = ["install", ...args];
-    }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-      commandArgs.push("--production");
-    }
-    try {
-      await spawnAsync(cliType, commandArgs, opts);
-    } catch (err) {
-      const potentialErrorPath = import_path.default.join(
-        process.env.HOME || "/",
-        ".npm",
-        "eresolve-report.txt"
-      );
-      if (isPotentiallyBrokenNpm && !commandArgs.includes("--legacy-peer-deps") && import_fs_extra.default.existsSync(potentialErrorPath)) {
-        console.warn(
-          'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.'
-        );
-        commandArgs.push("--legacy-peer-deps");
-        await spawnAsync(cliType, commandArgs, opts);
-      } else {
-        throw err;
-      }
-    }
+    await runInstallCommand({
+      packageManager: cliType,
+      args,
+      opts
+    });
     (0, import_debug.default)(`Install complete [${Date.now() - installTime}ms]`);
     return true;
   } finally {

package/dist/index.js

@@ -23436,6 +23436,45 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+async function runInstallCommand({
+  packageManager,
+  args,
+  opts
+}) {
+  const getInstallCommandForPackageManager = (packageManager2, args2) => {
+    switch (packageManager2) {
+      case "npm":
+        return {
+          prettyCommand: "npm install",
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"])
+        };
+      case "pnpm":
+        return {
+          prettyCommand: "pnpm install",
+          // PNPM's install command is similar to NPM's but without the audit nonsense
+          // @see options https://pnpm.io/cli/install
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"])
+        };
+      case "bun":
+        return {
+          prettyCommand: "bun install",
+          // @see options https://bun.sh/docs/cli/install
+          commandArguments: ["install", ...args2]
+        };
+      case "yarn":
+        return {
+          prettyCommand: "yarn install",
+          commandArguments: ["install", ...args2]
+        };
+    }
+  };
+  const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
+  opts.prettyCommand = prettyCommand;
+  if (process.env.NPM_ONLY_PRODUCTION) {
+    commandArguments.push("--production");
+  }
+  await spawnAsync(packageManager, commandArguments, opts);
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     debug("Skipping dependency installation because dev mode is enabled");
@@ -23486,45 +23525,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonEngines: packageJson?.engines,
       turboSupportsCorepackHome
     });
-    let commandArgs;
-    const isPotentiallyBrokenNpm = cliType === "npm" && (nodeVersion?.major === 16 || opts.env.PATH?.includes("/node16/bin-npm7")) && !args.includes("--legacy-peer-deps") && spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== "1";
-    if (cliType === "npm") {
-      opts.prettyCommand = "npm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"]);
-      if (isPotentiallyBrokenNpm && spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === "1") {
-        commandArgs.push("--legacy-peer-deps");
-      }
-    } else if (cliType === "pnpm") {
-      opts.prettyCommand = "pnpm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"]);
-    } else if (cliType === "bun") {
-      opts.prettyCommand = "bun install";
-      commandArgs = ["install", ...args];
-    } else {
-      opts.prettyCommand = "yarn install";
-      commandArgs = ["install", ...args];
-    }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-      commandArgs.push("--production");
-    }
-    try {
-      await spawnAsync(cliType, commandArgs, opts);
-    } catch (err) {
-      const potentialErrorPath = import_path5.default.join(
-        process.env.HOME || "/",
-        ".npm",
-        "eresolve-report.txt"
-      );
-      if (isPotentiallyBrokenNpm && !commandArgs.includes("--legacy-peer-deps") && import_fs_extra7.default.existsSync(potentialErrorPath)) {
-        console.warn(
-          'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.'
-        );
-        commandArgs.push("--legacy-peer-deps");
-        await spawnAsync(cliType, commandArgs, opts);
-      } else {
-        throw err;
-      }
-    }
+    await runInstallCommand({
+      packageManager: cliType,
+      args,
+      opts
+    });
     debug(`Install complete [${Date.now() - installTime}ms]`);
     return true;
   } finally {
@@ -24231,6 +24236,7 @@ var buildsSchema = {
 
 // src/trace/trace.ts
 var import_node_crypto = require("crypto");
+var NUM_OF_MICROSEC_IN_NANOSEC = BigInt("1000");
 function mapUndefinedAttributes(attrs) {
   return Object.fromEntries(
     Object.entries(attrs ?? {}).filter(
@@ -24250,23 +24256,26 @@ var Span = class _Span {
     this.attrs = mapUndefinedAttributes(attrs);
     this.status = "started";
     this.id = (0, import_node_crypto.randomUUID)();
-    this._start = Date.now();
     this._reporter = reporter;
+    this.now = Date.now();
+    this._start = process.hrtime.bigint();
   }
   stop() {
     if (this.status === "stopped") {
       throw new Error(`Cannot stop a span which is already stopped`);
     }
     this.status = "stopped";
-    const duration = Date.now() - this._start;
+    const end = process.hrtime.bigint();
+    const duration = Number((end - this._start) / NUM_OF_MICROSEC_IN_NANOSEC);
+    const timestamp = Number(this._start / NUM_OF_MICROSEC_IN_NANOSEC);
     const traceEvent = {
       name: this.name,
-      duration: Number(duration),
-      timestamp: this._start,
+      duration,
+      timestamp,
       id: this.id,
       parentId: this.parentId,
       tags: this.attrs,
-      startTime: this._start
+      startTime: this.now
     };
     if (this._reporter) {
       this._reporter.report(traceEvent);

package/dist/trace/trace.d.ts

@@ -9,9 +9,6 @@ export type TraceEvent = {
     startTime: number;
 };
 export type Reporter = {
-    flushAll: (opts?: {
-        end: boolean;
-    }) => Promise<void> | void;
     report: (event: TraceEvent) => void;
 };
 interface Attributes {
@@ -24,6 +21,7 @@ export declare class Span {
     private attrs;
     private status;
     private _start;
+    private now;
     private _reporter;
     constructor({ name, parentId, attrs, reporter, }: {
         name: string;

package/dist/trace/trace.js

@@ -22,6 +22,7 @@ __export(trace_exports, {
 });
 module.exports = __toCommonJS(trace_exports);
 var import_node_crypto = require("node:crypto");
+const NUM_OF_MICROSEC_IN_NANOSEC = BigInt("1000");
 function mapUndefinedAttributes(attrs) {
   return Object.fromEntries(
     Object.entries(attrs ?? {}).filter(
@@ -41,23 +42,26 @@ class Span {
     this.attrs = mapUndefinedAttributes(attrs);
     this.status = "started";
     this.id = (0, import_node_crypto.randomUUID)();
-    this._start = Date.now();
     this._reporter = reporter;
+    this.now = Date.now();
+    this._start = process.hrtime.bigint();
   }
   stop() {
     if (this.status === "stopped") {
       throw new Error(`Cannot stop a span which is already stopped`);
     }
     this.status = "stopped";
-    const duration = Date.now() - this._start;
+    const end = process.hrtime.bigint();
+    const duration = Number((end - this._start) / NUM_OF_MICROSEC_IN_NANOSEC);
+    const timestamp = Number(this._start / NUM_OF_MICROSEC_IN_NANOSEC);
     const traceEvent = {
       name: this.name,
-      duration: Number(duration),
-      timestamp: this._start,
+      duration,
+      timestamp,
       id: this.id,
       parentId: this.parentId,
       tags: this.attrs,
-      startTime: this._start
+      startTime: this.now
     };
     if (this._reporter) {
       this._reporter.report(traceEvent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "9.2.1",
+  "version": "9.3.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",