@vercel/build-utils 14.4.0 → 14.5.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @vercel/build-utils
 
+## 14.5.1
+
+### Patch Changes
+
+- a443e57: Revert dependency install log rewriting that piped pnpm stdout through an unread Transform and could hang large installs.
+
+## 14.5.0
+
+### Minor Changes
+
+- 90afd71: Expose the resolved rewrite destination as the request path observed by Node backend framework applications (express, hono, h3, koa, nestjs, fastify, elysia) and the unified backends builder, and warn affected backend projects about the behavior change.
+
+## 14.4.1
+
+### Patch Changes
+
+- e5b0363: Add `Span.reportChildEvents()` so a tree of trace events produced in another process (e.g. a forked build worker) can be reported under an existing span. Its root events are reparented to that span while links internal to the set are preserved, keeping trace nesting intact.
+
 ## 14.4.0
 
 ### Minor Changes

package/dist/fs/run-user-scripts.d.ts

@@ -129,7 +129,6 @@ export declare function usingCorepack(env: {
     [x: string]: string | undefined;
 }, packageJsonPackageManager: string | undefined, turboSupportsCorepackHome: boolean | undefined): boolean;
 export declare function walkParentDirs({ base, start, filename, }: WalkParentDirsProps): Promise<string | null>;
-export declare function stripPnpmVersionFooter(line: string): string;
 /**
  * Reset the customInstallCommandSet. This should be called at the start of each build
  * to prevent custom install commands from being skipped due to the set persisting

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

@@ -52,7 +52,6 @@ __export(run_user_scripts_exports, {
   scanParentDirs: () => scanParentDirs,
   spawnAsync: () => spawnAsync,
   spawnCommand: () => spawnCommand,
-  stripPnpmVersionFooter: () => stripPnpmVersionFooter,
   traverseUpDirectories: () => traverseUpDirectories,
   turboVersionSpecifierSupportsCorepack: () => turboVersionSpecifierSupportsCorepack,
   usingCorepack: () => usingCorepack,
@@ -65,7 +64,6 @@ var import_path = __toESM(require("path"));
 var import_async_sema = __toESM(require("async-sema"));
 var import_cross_spawn = __toESM(require("cross-spawn"));
 var import_semver = require("semver");
-var import_stream = require("stream");
 var import_util = require("util");
 var import_debug = __toESM(require("../debug"));
 var import_errors = require("../errors");
@@ -578,29 +576,6 @@ function getInstallCommandForPackageManager(packageManager, args) {
       };
   }
 }
-function stripPnpmVersionFooter(line) {
-  return line.replace(/ using pnpm v\d+\.\d+\.\d+(?=\r?$)/, "");
-}
-function createPnpmOutputFilter(destination) {
-  let incompleteLine = "";
-  return new import_stream.Transform({
-    transform(chunk, _encoding, callback) {
-      const lines = `${incompleteLine}${chunk.toString()}`.split("\n");
-      incompleteLine = lines.pop() ?? "";
-      for (const line of lines) {
-        destination.write(`${stripPnpmVersionFooter(line)}
-`);
-      }
-      callback();
-    },
-    flush(callback) {
-      if (incompleteLine) {
-        destination.write(stripPnpmVersionFooter(incompleteLine));
-      }
-      callback();
-    }
-  });
-}
 async function runInstallCommand({
   packageManager,
   args,
@@ -612,9 +587,8 @@ async function runInstallCommand({
   if (process.env.NPM_ONLY_PRODUCTION) {
     commandArguments.push("--production");
   }
-  const shouldFilterPnpmOutput = packageManager === "pnpm";
-  opts.outputStream = shouldFilterPnpmOutput ? createPnpmOutputFilter(output?.stdout ?? process.stdout) : output?.stdout;
-  opts.errorStream = shouldFilterPnpmOutput ? output?.stderr ?? process.stderr : output?.stderr;
+  opts.outputStream = output?.stdout;
+  opts.errorStream = output?.stderr;
   await spawnAsync(packageManager, commandArguments, opts);
 }
 function initializeSet(set) {
@@ -697,6 +671,12 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       }
     }
     const installTime = Date.now();
+    if (output?.stdout) {
+      output.stdout.write("Installing dependencies...\n");
+    } else {
+      console.log("Installing dependencies...");
+    }
+    (0, import_debug.default)(`Installing to ${destPath}`);
     const opts = { cwd: destPath, ...spawnOpts };
     const env = (0, import_clone_env.cloneEnv)(opts.env || process.env);
     delete env.NODE_ENV;
@@ -710,20 +690,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       turboSupportsCorepackHome,
       projectCreatedAt
     });
-    const packageManager = getPackageManagerDisplayName({
-      cliType,
-      lockfileVersion,
-      packageJsonPackageManager,
-      env: opts.env
-    });
-    const installMessage = `Installing dependencies with ${packageManager}`;
-    if (output?.stdout) {
-      output.stdout.write(`${installMessage}
-`);
-    } else {
-      console.log(installMessage);
-    }
-    (0, import_debug.default)(`Installing to ${destPath}`);
     const maySeeDynamicRequireYarnBug = process.env?.ENABLE_EXPERIMENTAL_COREPACK && packageJson?.packageManager?.startsWith("yarn") && packageJson?.type === "module";
     if (maySeeDynamicRequireYarnBug) {
       console.warn(
@@ -742,37 +708,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
     runNpmInstallSema.release();
   }
 }
-function getPackageManagerDisplayName({
-  cliType,
-  lockfileVersion,
-  packageJsonPackageManager,
-  env
-}) {
-  const versionResult = import_cross_spawn.default.sync(cliType, ["--version"], {
-    env,
-    encoding: "utf8"
-  });
-  const version = versionResult.status === 0 ? versionResult.stdout.trim() : "";
-  if (version) {
-    return `${cliType} ${version}`;
-  }
-  if (packageJsonPackageManager && env.ENABLE_EXPERIMENTAL_COREPACK) {
-    return packageJsonPackageManager.replace("@", " ");
-  }
-  if (cliType === "pnpm") {
-    const selectedPath = env.PATH?.split(import_path.default.delimiter).find(
-      (segment) => /^\/pnpm\d+\/node_modules\/\.bin$/.test(segment)
-    );
-    const major = selectedPath?.match(/^\/pnpm(\d+)\//)?.[1];
-    if (major) {
-      return `pnpm ${major}`;
-    }
-  }
-  if (cliType === "yarn") {
-    return detectYarnVersion(lockfileVersion).replace("@", " ").replace(/\.x$/, "");
-  }
-  return cliType;
-}
 function getEnvForPackageManager({
   cliType,
   lockfileVersion,
@@ -831,6 +766,44 @@ function getEnvForPackageManager({
   if (pathsToPrepend.length > 0) {
     const oldPath = env.PATH + "";
     newEnv.PATH = `${pathsToPrepend.join(import_path.default.delimiter)}${oldPath ? import_path.default.delimiter : ""}${oldPath}`;
+    if (newPath && pathsToPrepend.includes(newPath) && detectedLockfile && detectedPackageManager) {
+      const versionString = cliType === "pnpm" ? `version ${lockfileVersion} ` : "";
+      const pin = resolveCompatiblePnpmPin({
+        cliType,
+        lockfileVersion,
+        packageJsonDevEngines,
+        corepackPackageManager: packageJsonPackageManager
+      });
+      const usedPin = Boolean(pin) && detectedPackageManager === pin?.override.detectedPackageManager;
+      const lockfileDefault = detectPackageManager(
+        cliType,
+        lockfileVersion,
+        projectCreatedAt,
+        nodeVersion
+      );
+      const usedEnginesSelector = Boolean(packageJsonEngines?.pnpm) && !usedPin && detectedPackageManager !== lockfileDefault?.detectedPackageManager;
+      const detectedV9PnpmLockfile = detectedLockfile === "pnpm-lock.yaml" && lockfileVersion === 9;
+      if (usedPin && pin) {
+        const pinField = pin.source === "devEngines" ? "package.json#devEngines.packageManager" : `package.json#packageManager ${packageJsonPackageManager}`;
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager} from ${pinField}`
+        );
+      } else if (usedEnginesSelector) {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager} from package.json#engines.pnpm ${packageJsonEngines?.pnpm}`
+        );
+      } else if (detectedV9PnpmLockfile) {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${lockfileVersion} which may be generated by pnpm@9.x, pnpm@10.x, or pnpm@11.x
+Using ${detectedPackageManager} based on project creation date
+To use a different version, set package.json#packageManager or package.json#devEngines.packageManager`
+        );
+      } else {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
+        );
+      }
+    }
   }
   if (cliType === "yarn" && !env.YARN_NODE_LINKER) {
     newEnv.YARN_NODE_LINKER = "node-modules";
@@ -1396,7 +1369,6 @@ const installDependencies = (0, import_util.deprecate)(
   scanParentDirs,
   spawnAsync,
   spawnCommand,
-  stripPnpmVersionFooter,
   traverseUpDirectories,
   turboVersionSpecifierSupportsCorepack,
   usingCorepack,

package/dist/generate-node-builder-functions.js

@@ -76,6 +76,22 @@ function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, vali
       slug: frameworkName,
       version
     };
+    if (!res.routes) {
+      res.routes = [
+        { handle: "filesystem" },
+        {
+          src: "/(.*)",
+          dest: "/",
+          transforms: [
+            {
+              type: "request.path",
+              op: "set",
+              args: "/$1"
+            }
+          ]
+        }
+      ];
+    }
     return res;
   };
   const entrypointCallback = async (args) => {

package/dist/index.js

@@ -2024,11 +2024,11 @@ var require_stream_readable = __commonJS({
 var require_stream_transform = __commonJS({
   "../../node_modules/.pnpm/readable-stream@2.3.8/node_modules/readable-stream/lib/_stream_transform.js"(exports, module2) {
     "use strict";
-    module2.exports = Transform2;
+    module2.exports = Transform;
     var Duplex = require_stream_duplex();
     var util = Object.create(require_util());
     util.inherits = require_inherits();
-    util.inherits(Transform2, Duplex);
+    util.inherits(Transform, Duplex);
     function afterTransform(er, data) {
       var ts = this._transformState;
       ts.transforming = false;
@@ -2047,9 +2047,9 @@ var require_stream_transform = __commonJS({
         this._read(rs.highWaterMark);
       }
     }
-    function Transform2(options) {
-      if (!(this instanceof Transform2))
-        return new Transform2(options);
+    function Transform(options) {
+      if (!(this instanceof Transform))
+        return new Transform(options);
       Duplex.call(this, options);
       this._transformState = {
         afterTransform: afterTransform.bind(this),
@@ -2079,14 +2079,14 @@ var require_stream_transform = __commonJS({
         done(this, null, null);
       }
     }
-    Transform2.prototype.push = function(chunk, encoding) {
+    Transform.prototype.push = function(chunk, encoding) {
       this._transformState.needTransform = false;
       return Duplex.prototype.push.call(this, chunk, encoding);
     };
-    Transform2.prototype._transform = function(chunk, encoding, cb) {
+    Transform.prototype._transform = function(chunk, encoding, cb) {
       throw new Error("_transform() is not implemented");
     };
-    Transform2.prototype._write = function(chunk, encoding, cb) {
+    Transform.prototype._write = function(chunk, encoding, cb) {
       var ts = this._transformState;
       ts.writecb = cb;
       ts.writechunk = chunk;
@@ -2097,7 +2097,7 @@ var require_stream_transform = __commonJS({
           this._read(rs.highWaterMark);
       }
     };
-    Transform2.prototype._read = function(n) {
+    Transform.prototype._read = function(n) {
       var ts = this._transformState;
       if (ts.writechunk !== null && ts.writecb && !ts.transforming) {
         ts.transforming = true;
@@ -2106,7 +2106,7 @@ var require_stream_transform = __commonJS({
         ts.needTransform = true;
       }
     };
-    Transform2.prototype._destroy = function(err, cb) {
+    Transform.prototype._destroy = function(err, cb) {
       var _this2 = this;
       Duplex.prototype._destroy.call(this, err, function(err2) {
         cb(err2);
@@ -2132,14 +2132,14 @@ var require_stream_passthrough = __commonJS({
   "../../node_modules/.pnpm/readable-stream@2.3.8/node_modules/readable-stream/lib/_stream_passthrough.js"(exports, module2) {
     "use strict";
     module2.exports = PassThrough;
-    var Transform2 = require_stream_transform();
+    var Transform = require_stream_transform();
     var util = Object.create(require_util());
     util.inherits = require_inherits();
-    util.inherits(PassThrough, Transform2);
+    util.inherits(PassThrough, Transform);
     function PassThrough(options) {
       if (!(this instanceof PassThrough))
         return new PassThrough(options);
-      Transform2.call(this, options);
+      Transform.call(this, options);
     }
     PassThrough.prototype._transform = function(chunk, encoding, cb) {
       cb(null, chunk);
@@ -6016,7 +6016,7 @@ var require_buffer_crc32 = __commonJS({
 var require_yazl = __commonJS({
   "../../node_modules/.pnpm/yazl@2.5.1/node_modules/yazl/index.js"(exports) {
     var fs11 = require("fs");
-    var Transform2 = require("stream").Transform;
+    var Transform = require("stream").Transform;
     var PassThrough = require("stream").PassThrough;
     var zlib = require("zlib");
     var util = require("util");
@@ -6540,18 +6540,18 @@ var require_yazl = __commonJS({
       buffer.writeUInt32LE(low, offset);
       buffer.writeUInt32LE(high, offset + 4);
     }
-    util.inherits(ByteCounter, Transform2);
+    util.inherits(ByteCounter, Transform);
     function ByteCounter(options) {
-      Transform2.call(this, options);
+      Transform.call(this, options);
       this.byteCount = 0;
     }
     ByteCounter.prototype._transform = function(chunk, encoding, cb) {
       this.byteCount += chunk.length;
       cb(null, chunk);
     };
-    util.inherits(Crc32Watcher, Transform2);
+    util.inherits(Crc32Watcher, Transform);
     function Crc32Watcher(options) {
-      Transform2.call(this, options);
+      Transform.call(this, options);
       this.crc32 = 0;
     }
     Crc32Watcher.prototype._transform = function(chunk, encoding, cb) {
@@ -35662,7 +35662,6 @@ var import_path6 = __toESM(require("path"));
 var import_async_sema4 = __toESM(require_async_sema());
 var import_cross_spawn = __toESM(require_cross_spawn());
 var import_semver2 = __toESM(require_semver2());
-var import_stream2 = require("stream");
 var import_util6 = require("util");
 
 // src/fs/node-version.ts
@@ -37204,29 +37203,6 @@ function getInstallCommandForPackageManager(packageManager, args) {
       };
   }
 }
-function stripPnpmVersionFooter(line) {
-  return line.replace(/ using pnpm v\d+\.\d+\.\d+(?=\r?$)/, "");
-}
-function createPnpmOutputFilter(destination) {
-  let incompleteLine = "";
-  return new import_stream2.Transform({
-    transform(chunk, _encoding, callback) {
-      const lines = `${incompleteLine}${chunk.toString()}`.split("\n");
-      incompleteLine = lines.pop() ?? "";
-      for (const line of lines) {
-        destination.write(`${stripPnpmVersionFooter(line)}
-`);
-      }
-      callback();
-    },
-    flush(callback) {
-      if (incompleteLine) {
-        destination.write(stripPnpmVersionFooter(incompleteLine));
-      }
-      callback();
-    }
-  });
-}
 async function runInstallCommand({
   packageManager,
   args,
@@ -37238,9 +37214,8 @@ async function runInstallCommand({
   if (process.env.NPM_ONLY_PRODUCTION) {
     commandArguments.push("--production");
   }
-  const shouldFilterPnpmOutput = packageManager === "pnpm";
-  opts.outputStream = shouldFilterPnpmOutput ? createPnpmOutputFilter(output?.stdout ?? process.stdout) : output?.stdout;
-  opts.errorStream = shouldFilterPnpmOutput ? output?.stderr ?? process.stderr : output?.stderr;
+  opts.outputStream = output?.stdout;
+  opts.errorStream = output?.stderr;
   await spawnAsync(packageManager, commandArguments, opts);
 }
 function initializeSet(set) {
@@ -37323,6 +37298,12 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       }
     }
     const installTime = Date.now();
+    if (output?.stdout) {
+      output.stdout.write("Installing dependencies...\n");
+    } else {
+      console.log("Installing dependencies...");
+    }
+    debug(`Installing to ${destPath}`);
     const opts = { cwd: destPath, ...spawnOpts };
     const env = cloneEnv(opts.env || process.env);
     delete env.NODE_ENV;
@@ -37336,20 +37317,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       turboSupportsCorepackHome,
       projectCreatedAt
     });
-    const packageManager = getPackageManagerDisplayName({
-      cliType,
-      lockfileVersion,
-      packageJsonPackageManager,
-      env: opts.env
-    });
-    const installMessage = `Installing dependencies with ${packageManager}`;
-    if (output?.stdout) {
-      output.stdout.write(`${installMessage}
-`);
-    } else {
-      console.log(installMessage);
-    }
-    debug(`Installing to ${destPath}`);
     const maySeeDynamicRequireYarnBug = process.env?.ENABLE_EXPERIMENTAL_COREPACK && packageJson?.packageManager?.startsWith("yarn") && packageJson?.type === "module";
     if (maySeeDynamicRequireYarnBug) {
       console.warn(
@@ -37368,37 +37335,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
     runNpmInstallSema.release();
   }
 }
-function getPackageManagerDisplayName({
-  cliType,
-  lockfileVersion,
-  packageJsonPackageManager,
-  env
-}) {
-  const versionResult = import_cross_spawn.default.sync(cliType, ["--version"], {
-    env,
-    encoding: "utf8"
-  });
-  const version = versionResult.status === 0 ? versionResult.stdout.trim() : "";
-  if (version) {
-    return `${cliType} ${version}`;
-  }
-  if (packageJsonPackageManager && env.ENABLE_EXPERIMENTAL_COREPACK) {
-    return packageJsonPackageManager.replace("@", " ");
-  }
-  if (cliType === "pnpm") {
-    const selectedPath = env.PATH?.split(import_path6.default.delimiter).find(
-      (segment) => /^\/pnpm\d+\/node_modules\/\.bin$/.test(segment)
-    );
-    const major = selectedPath?.match(/^\/pnpm(\d+)\//)?.[1];
-    if (major) {
-      return `pnpm ${major}`;
-    }
-  }
-  if (cliType === "yarn") {
-    return detectYarnVersion(lockfileVersion).replace("@", " ").replace(/\.x$/, "");
-  }
-  return cliType;
-}
 function getEnvForPackageManager({
   cliType,
   lockfileVersion,
@@ -37457,6 +37393,44 @@ function getEnvForPackageManager({
   if (pathsToPrepend.length > 0) {
     const oldPath = env.PATH + "";
     newEnv.PATH = `${pathsToPrepend.join(import_path6.default.delimiter)}${oldPath ? import_path6.default.delimiter : ""}${oldPath}`;
+    if (newPath && pathsToPrepend.includes(newPath) && detectedLockfile && detectedPackageManager) {
+      const versionString = cliType === "pnpm" ? `version ${lockfileVersion} ` : "";
+      const pin = resolveCompatiblePnpmPin({
+        cliType,
+        lockfileVersion,
+        packageJsonDevEngines,
+        corepackPackageManager: packageJsonPackageManager
+      });
+      const usedPin = Boolean(pin) && detectedPackageManager === pin?.override.detectedPackageManager;
+      const lockfileDefault = detectPackageManager(
+        cliType,
+        lockfileVersion,
+        projectCreatedAt,
+        nodeVersion
+      );
+      const usedEnginesSelector = Boolean(packageJsonEngines?.pnpm) && !usedPin && detectedPackageManager !== lockfileDefault?.detectedPackageManager;
+      const detectedV9PnpmLockfile = detectedLockfile === "pnpm-lock.yaml" && lockfileVersion === 9;
+      if (usedPin && pin) {
+        const pinField = pin.source === "devEngines" ? "package.json#devEngines.packageManager" : `package.json#packageManager ${packageJsonPackageManager}`;
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager} from ${pinField}`
+        );
+      } else if (usedEnginesSelector) {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager} from package.json#engines.pnpm ${packageJsonEngines?.pnpm}`
+        );
+      } else if (detectedV9PnpmLockfile) {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${lockfileVersion} which may be generated by pnpm@9.x, pnpm@10.x, or pnpm@11.x
+Using ${detectedPackageManager} based on project creation date
+To use a different version, set package.json#packageManager or package.json#devEngines.packageManager`
+        );
+      } else {
+        console.log(
+          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
+        );
+      }
+    }
   }
   if (cliType === "yarn" && !env.YARN_NODE_LINKER) {
     newEnv.YARN_NODE_LINKER = "node-modules";
@@ -39344,6 +39318,22 @@ var Span = class _Span {
       reporter: this._reporter
     });
   }
+  /**
+   * Report already-finalized trace events (e.g. collected in a child process) to this span's
+   * reporter so they appear nested under this span. Any event that is a root of the passed set —
+   * i.e. whose `parentId` refers to a span not present in `events` — is reparented to this span;
+   * links internal to the set are preserved. Safe to call with events from any process: the
+   * caller does not need to know or set this span's id.
+   */
+  reportChildEvents(events) {
+    if (!this._reporter)
+      return;
+    const ids = new Set(events.map((event) => event.id));
+    for (const event of events) {
+      const isRoot = event.parentId === void 0 || !ids.has(event.parentId);
+      this._reporter.report(isRoot ? { ...event, parentId: this.id } : event);
+    }
+  }
   async trace(fn) {
     try {
       return await fn(this);
@@ -39440,6 +39430,22 @@ function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, vali
       slug: frameworkName,
       version
     };
+    if (!res.routes) {
+      res.routes = [
+        { handle: "filesystem" },
+        {
+          src: "/(.*)",
+          dest: "/",
+          transforms: [
+            {
+              type: "request.path",
+              op: "set",
+              args: "/$1"
+            }
+          ]
+        }
+      ];
+    }
     return res;
   };
   const entrypointCallback = async (args) => {
@@ -40185,11 +40191,11 @@ function getAndVerifyOutputLambdasOrEdgeFuncs(buildResponse) {
 }
 
 // src/collect-build-result/stream-with-extended-payload.ts
-var import_stream3 = require("stream");
+var import_stream2 = require("stream");
 function streamWithExtendedPayload(stream, data) {
   return data ? new MultipartContentStream(stream, data) : stream;
 }
-var MultipartContentStream = class extends import_stream3.Readable {
+var MultipartContentStream = class extends import_stream2.Readable {
   constructor(stream, data) {
     super();
     stream.on("error", (err) => {

package/dist/trace/trace.d.ts

@@ -32,6 +32,14 @@ export declare class Span {
     stop(): void;
     setAttributes(attrs: Attributes): void;
     child(name: string, attrs?: Attributes): Span;
+    /**
+     * Report already-finalized trace events (e.g. collected in a child process) to this span's
+     * reporter so they appear nested under this span. Any event that is a root of the passed set —
+     * i.e. whose `parentId` refers to a span not present in `events` — is reparented to this span;
+     * links internal to the set are preserved. Safe to call with events from any process: the
+     * caller does not need to know or set this span's id.
+     */
+    reportChildEvents(events: TraceEvent[]): void;
     trace<T>(fn: (span: Span) => T | Promise<T>): Promise<T>;
 }
 export {};

package/dist/trace/trace.js

@@ -78,6 +78,22 @@ class Span {
       reporter: this._reporter
     });
   }
+  /**
+   * Report already-finalized trace events (e.g. collected in a child process) to this span's
+   * reporter so they appear nested under this span. Any event that is a root of the passed set —
+   * i.e. whose `parentId` refers to a span not present in `events` — is reparented to this span;
+   * links internal to the set are preserved. Safe to call with events from any process: the
+   * caller does not need to know or set this span's id.
+   */
+  reportChildEvents(events) {
+    if (!this._reporter)
+      return;
+    const ids = new Set(events.map((event) => event.id));
+    for (const event of events) {
+      const isRoot = event.parentId === void 0 || !ids.has(event.parentId);
+      this._reporter.report(isRoot ? { ...event, parentId: this.id } : event);
+    }
+  }
   async trace(fn) {
     try {
       return await fn(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "14.4.0",
+  "version": "14.5.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -52,8 +52,8 @@
     "vitest": "4.1.10",
     "typescript": "4.9.5",
     "yazl": "2.5.1",
-    "@vercel/error-utils": "2.2.1",
-    "@vercel/routing-utils": "6.5.0"
+    "@vercel/routing-utils": "6.5.0",
+    "@vercel/error-utils": "2.2.1"
   },
   "scripts": {
     "build": "node build.mjs",