vercel 41.0.3 → 41.1.0

package/dist/index.js

@@ -700,8 +700,8 @@ var require_graceful_fs = __commonJS2({
         }
       }
       var fs$writeFile = fs16.writeFile;
-      fs16.writeFile = writeFile3;
-      function writeFile3(path11, data, options, cb) {
+      fs16.writeFile = writeFile4;
+      function writeFile4(path11, data, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$writeFile(path11, data, options, cb);
@@ -1978,14 +1978,14 @@ var require_empty = __commonJS2({
     var u = require_universalify().fromPromise;
     var fs15 = require_fs();
     var path11 = require("path");
-    var mkdir2 = require_mkdirs();
+    var mkdir3 = require_mkdirs();
     var remove6 = require_remove();
     var emptyDir = u(async function emptyDir2(dir) {
       let items;
       try {
         items = await fs15.readdir(dir);
       } catch {
-        return mkdir2.mkdirs(dir);
+        return mkdir3.mkdirs(dir);
       }
       return Promise.all(items.map((item) => remove6.remove(path11.join(dir, item))));
     });
@@ -1994,7 +1994,7 @@ var require_empty = __commonJS2({
       try {
         items = fs15.readdirSync(dir);
       } catch {
-        return mkdir2.mkdirsSync(dir);
+        return mkdir3.mkdirsSync(dir);
       }
       items.forEach((item) => {
         item = path11.join(dir, item);
@@ -2017,7 +2017,7 @@ var require_file = __commonJS2({
     var u = require_universalify().fromCallback;
     var path11 = require("path");
     var fs15 = require_graceful_fs();
-    var mkdir2 = require_mkdirs();
+    var mkdir3 = require_mkdirs();
     function createFile(file, callback) {
       function makeFile() {
         fs15.writeFile(file, "", (err) => {
@@ -2033,7 +2033,7 @@ var require_file = __commonJS2({
         fs15.stat(dir, (err2, stats2) => {
           if (err2) {
             if (err2.code === "ENOENT") {
-              return mkdir2.mkdirs(dir, (err3) => {
+              return mkdir3.mkdirs(dir, (err3) => {
                 if (err3)
                   return callback(err3);
                 makeFile();
@@ -2067,7 +2067,7 @@ var require_file = __commonJS2({
         }
       } catch (err) {
         if (err && err.code === "ENOENT")
-          mkdir2.mkdirsSync(dir);
+          mkdir3.mkdirsSync(dir);
         else
           throw err;
       }
@@ -2087,7 +2087,7 @@ var require_link = __commonJS2({
     var u = require_universalify().fromCallback;
     var path11 = require("path");
     var fs15 = require_graceful_fs();
-    var mkdir2 = require_mkdirs();
+    var mkdir3 = require_mkdirs();
     var pathExists = require_path_exists().pathExists;
     var { areIdentical } = require_stat();
     function createLink(srcpath, dstpath, callback) {
@@ -2112,7 +2112,7 @@ var require_link = __commonJS2({
               return callback(err2);
             if (dirExists)
               return makeLink(srcpath, dstpath);
-            mkdir2.mkdirs(dir, (err3) => {
+            mkdir3.mkdirs(dir, (err3) => {
               if (err3)
                 return callback(err3);
               makeLink(srcpath, dstpath);
@@ -2139,7 +2139,7 @@ var require_link = __commonJS2({
       const dirExists = fs15.existsSync(dir);
       if (dirExists)
         return fs15.linkSync(srcpath, dstpath);
-      mkdir2.mkdirsSync(dir);
+      mkdir3.mkdirsSync(dir);
       return fs15.linkSync(srcpath, dstpath);
     }
     module2.exports = {
@@ -2454,7 +2454,7 @@ var require_jsonfile = __commonJS2({
       const str = stringify3(obj, options);
       await universalify.fromCallback(fs15.writeFile)(file, str, options);
     }
-    var writeFile3 = universalify.fromPromise(_writeFile);
+    var writeFile4 = universalify.fromPromise(_writeFile);
     function writeFileSync(file, obj, options = {}) {
       const fs15 = options.fs || _fs;
       const str = stringify3(obj, options);
@@ -2463,7 +2463,7 @@ var require_jsonfile = __commonJS2({
     var jsonfile = {
       readFile: readFile6,
       readFileSync: readFileSync3,
-      writeFile: writeFile3,
+      writeFile: writeFile4,
       writeFileSync
     };
     module2.exports = jsonfile;
@@ -2492,7 +2492,7 @@ var require_output = __commonJS2({
     var u = require_universalify().fromCallback;
     var fs15 = require_graceful_fs();
     var path11 = require("path");
-    var mkdir2 = require_mkdirs();
+    var mkdir3 = require_mkdirs();
     var pathExists = require_path_exists().pathExists;
     function outputFile2(file, data, encoding, callback) {
       if (typeof encoding === "function") {
@@ -2505,7 +2505,7 @@ var require_output = __commonJS2({
           return callback(err);
         if (itDoes)
           return fs15.writeFile(file, data, encoding, callback);
-        mkdir2.mkdirs(dir, (err2) => {
+        mkdir3.mkdirs(dir, (err2) => {
           if (err2)
             return callback(err2);
           fs15.writeFile(file, data, encoding, callback);
@@ -2517,7 +2517,7 @@ var require_output = __commonJS2({
       if (fs15.existsSync(dir)) {
         return fs15.writeFileSync(file, ...args2);
       }
-      mkdir2.mkdirsSync(dir);
+      mkdir3.mkdirsSync(dir);
       fs15.writeFileSync(file, ...args2);
     }
     module2.exports = {
@@ -16718,7 +16718,7 @@ var require_span = __commonJS2({
         }
       }
     };
-    var Span = class _Span {
+    var Span2 = class _Span {
       /**
        * Tags for the span.
        * @deprecated Use `spanToJSON(span).atttributes` instead.
@@ -17219,7 +17219,7 @@ var require_span = __commonJS2({
         return hasData ? data : attributes;
       }
     };
-    exports2.Span = Span;
+    exports2.Span = Span2;
     exports2.SpanRecorder = SpanRecorder;
   }
 });
@@ -42769,7 +42769,7 @@ var require_imurmurhash = __commonJS2({
 var require_write_file_atomic = __commonJS2({
   "../../node_modules/.pnpm/write-file-atomic@2.4.3/node_modules/write-file-atomic/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = writeFile3;
+    module2.exports = writeFile4;
     module2.exports.sync = writeFileSync;
     module2.exports._getTmpname = getTmpname;
     module2.exports._cleanupOnExit = cleanupOnExit;
@@ -42798,7 +42798,7 @@ var require_write_file_atomic = __commonJS2({
         }
       };
     }
-    function writeFile3(filename, data, options, callback) {
+    function writeFile4(filename, data, options, callback) {
       if (options) {
         if (options instanceof Function) {
           callback = options;
@@ -43151,10 +43151,10 @@ var require_make_dir2 = __commonJS2({
     module2.exports = (input, opts) => Promise.resolve().then(() => {
       checkPath(input);
       opts = Object.assign({}, defaults, opts);
-      const mkdir2 = pify(opts.fs.mkdir);
+      const mkdir3 = pify(opts.fs.mkdir);
       const stat2 = pify(opts.fs.stat);
       const make = (pth) => {
-        return mkdir2(pth, opts.mode).then(() => pth).catch((err) => {
+        return mkdir3(pth, opts.mode).then(() => pth).catch((err) => {
           if (err.code === "ENOENT") {
             if (err.message.includes("null bytes") || path11.dirname(pth) === pth) {
               throw err;
@@ -44553,14 +44553,14 @@ var require_empty2 = __commonJS2({
     var u = require_universalify2().fromCallback;
     var fs15 = require("fs");
     var path11 = require("path");
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var remove6 = require_remove2();
     var emptyDir = u(function emptyDir2(dir, callback) {
       callback = callback || function() {
       };
       fs15.readdir(dir, (err, items) => {
         if (err)
-          return mkdir2.mkdirs(dir, callback);
+          return mkdir3.mkdirs(dir, callback);
         items = items.map((item) => path11.join(dir, item));
         deleteItem();
         function deleteItem() {
@@ -44580,7 +44580,7 @@ var require_empty2 = __commonJS2({
       try {
         items = fs15.readdirSync(dir);
       } catch (err) {
-        return mkdir2.mkdirsSync(dir);
+        return mkdir3.mkdirsSync(dir);
       }
       items.forEach((item) => {
         item = path11.join(dir, item);
@@ -44603,7 +44603,7 @@ var require_file2 = __commonJS2({
     var u = require_universalify2().fromCallback;
     var path11 = require("path");
     var fs15 = require_graceful_fs();
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var pathExists = require_path_exists2().pathExists;
     function createFile(file, callback) {
       function makeFile() {
@@ -44622,7 +44622,7 @@ var require_file2 = __commonJS2({
             return callback(err2);
           if (dirExists)
             return makeFile();
-          mkdir2.mkdirs(dir, (err3) => {
+          mkdir3.mkdirs(dir, (err3) => {
             if (err3)
               return callback(err3);
             makeFile();
@@ -44640,7 +44640,7 @@ var require_file2 = __commonJS2({
         return;
       const dir = path11.dirname(file);
       if (!fs15.existsSync(dir)) {
-        mkdir2.mkdirsSync(dir);
+        mkdir3.mkdirsSync(dir);
       }
       fs15.writeFileSync(file, "");
     }
@@ -44658,7 +44658,7 @@ var require_link2 = __commonJS2({
     var u = require_universalify2().fromCallback;
     var path11 = require("path");
     var fs15 = require_graceful_fs();
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var pathExists = require_path_exists2().pathExists;
     function createLink(srcpath, dstpath, callback) {
       function makeLink(srcpath2, dstpath2) {
@@ -44684,7 +44684,7 @@ var require_link2 = __commonJS2({
               return callback(err3);
             if (dirExists)
               return makeLink(srcpath, dstpath);
-            mkdir2.mkdirs(dir, (err4) => {
+            mkdir3.mkdirs(dir, (err4) => {
               if (err4)
                 return callback(err4);
               makeLink(srcpath, dstpath);
@@ -44707,7 +44707,7 @@ var require_link2 = __commonJS2({
       const dirExists = fs15.existsSync(dir);
       if (dirExists)
         return fs15.linkSync(srcpath, dstpath);
-      mkdir2.mkdirsSync(dir);
+      mkdir3.mkdirsSync(dir);
       return fs15.linkSync(srcpath, dstpath);
     }
     module2.exports = {
@@ -45008,7 +45008,7 @@ var require_jsonfile3 = __commonJS2({
       var str = JSON.stringify(obj, options ? options.replacer : null, spaces);
       return str.replace(/\n/g, EOL) + EOL;
     }
-    function writeFile3(file, obj, options, callback) {
+    function writeFile4(file, obj, options, callback) {
       if (callback == null) {
         callback = options;
         options = {};
@@ -45040,7 +45040,7 @@ var require_jsonfile3 = __commonJS2({
     var jsonfile = {
       readFile: readFile6,
       readFileSync: readFileSync3,
-      writeFile: writeFile3,
+      writeFile: writeFile4,
       writeFileSync
     };
     module2.exports = jsonfile;
@@ -45068,7 +45068,7 @@ var require_output_json2 = __commonJS2({
   "../../node_modules/.pnpm/fs-extra@8.0.1/node_modules/fs-extra/lib/json/output-json.js"(exports2, module2) {
     "use strict";
     var path11 = require("path");
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var pathExists = require_path_exists2().pathExists;
     var jsonFile = require_jsonfile4();
     function outputJson(file, data, options, callback) {
@@ -45082,7 +45082,7 @@ var require_output_json2 = __commonJS2({
           return callback(err);
         if (itDoes)
           return jsonFile.writeJson(file, data, options, callback);
-        mkdir2.mkdirs(dir, (err2) => {
+        mkdir3.mkdirs(dir, (err2) => {
           if (err2)
             return callback(err2);
           jsonFile.writeJson(file, data, options, callback);
@@ -45099,12 +45099,12 @@ var require_output_json_sync2 = __commonJS2({
     "use strict";
     var fs15 = require_graceful_fs();
     var path11 = require("path");
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var jsonFile = require_jsonfile4();
     function outputJsonSync(file, data, options) {
       const dir = path11.dirname(file);
       if (!fs15.existsSync(dir)) {
-        mkdir2.mkdirsSync(dir);
+        mkdir3.mkdirsSync(dir);
       }
       jsonFile.writeJsonSync(file, data, options);
     }
@@ -45278,7 +45278,7 @@ var require_output2 = __commonJS2({
     var u = require_universalify2().fromCallback;
     var fs15 = require_graceful_fs();
     var path11 = require("path");
-    var mkdir2 = require_mkdirs3();
+    var mkdir3 = require_mkdirs3();
     var pathExists = require_path_exists2().pathExists;
     function outputFile2(file, data, encoding, callback) {
       if (typeof encoding === "function") {
@@ -45291,7 +45291,7 @@ var require_output2 = __commonJS2({
           return callback(err);
         if (itDoes)
           return fs15.writeFile(file, data, encoding, callback);
-        mkdir2.mkdirs(dir, (err2) => {
+        mkdir3.mkdirs(dir, (err2) => {
           if (err2)
             return callback(err2);
           fs15.writeFile(file, data, encoding, callback);
@@ -45303,7 +45303,7 @@ var require_output2 = __commonJS2({
       if (fs15.existsSync(dir)) {
         return fs15.writeFileSync(file, ...args2);
       }
-      mkdir2.mkdirsSync(dir);
+      mkdir3.mkdirsSync(dir);
       fs15.writeFileSync(file, ...args2);
     }
     module2.exports = {
@@ -46157,7 +46157,7 @@ var require_package = __commonJS2({
   "../client/package.json"(exports2, module2) {
     module2.exports = {
       name: "@vercel/client",
-      version: "15.0.3",
+      version: "15.0.4",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -46196,7 +46196,7 @@ var require_package = __commonJS2({
         typescript: "4.9.5"
       },
       dependencies: {
-        "@vercel/build-utils": "9.2.1",
+        "@vercel/build-utils": "9.3.0",
         "@vercel/error-utils": "2.0.3",
         "@vercel/routing-utils": "5.0.4",
         "async-retry": "1.2.3",
@@ -102620,7 +102620,7 @@ var require_local_file_system_detector = __commonJS2({
       LocalFileSystemDetector: () => LocalFileSystemDetector5
     });
     module2.exports = __toCommonJS4(local_file_system_detector_exports);
-    var import_promises = __toESM4(require("fs/promises"));
+    var import_promises2 = __toESM4(require("fs/promises"));
     var import_path41 = require("path");
     var import_filesystem = require_filesystem();
     var import_error_utils37 = require_dist2();
@@ -102631,7 +102631,7 @@ var require_local_file_system_detector = __commonJS2({
       }
       async _hasPath(name) {
         try {
-          await import_promises.default.stat(this.getFilePath(name));
+          await import_promises2.default.stat(this.getFilePath(name));
           return true;
         } catch (err) {
           if ((0, import_error_utils37.isErrnoException)(err) && err.code === "ENOENT") {
@@ -102641,15 +102641,15 @@ var require_local_file_system_detector = __commonJS2({
         }
       }
       _readFile(name) {
-        return import_promises.default.readFile(this.getFilePath(name));
+        return import_promises2.default.readFile(this.getFilePath(name));
       }
       async _isFile(name) {
-        const stat2 = await import_promises.default.stat(this.getFilePath(name));
+        const stat2 = await import_promises2.default.stat(this.getFilePath(name));
         return stat2.isFile();
       }
       async _readdir(dir) {
         const dirPath = this.getFilePath(dir);
-        const entries = await import_promises.default.readdir(dirPath, { withFileTypes: true });
+        const entries = await import_promises2.default.readdir(dirPath, { withFileTypes: true });
         const result = [];
         for (const entry of entries) {
           let type;
@@ -121402,7 +121402,10 @@ async function resolveBuilders(buildersDir, builderSpecs, resolvedSpecs) {
       const builder = require_(path11);
       builders.set(spec, {
         builder,
-        pkg: builderPkg,
+        pkg: {
+          name,
+          ...builderPkg
+        },
         path: path11,
         pkgPath
       });
@@ -133586,6 +133589,8 @@ async function main2(client2) {
       store: client2.telemetryEventStore
     }
   });
+  const reporter = new InMemoryReporter();
+  const rootSpan = new import_build_utils13.Span({ name: "vc", reporter });
   let { cwd } = client2;
   if (process.env.__VERCEL_BUILD_RUNNING) {
     output_manager_default.error(
@@ -133723,7 +133728,10 @@ async function main2(client2) {
     }
     process.env.VERCEL = "1";
     process.env.NOW_BUILDER = "1";
-    await doBuild(client2, project, buildsJson, cwd, outputDir);
+    await rootSpan.child("vc.doBuild").trace(
+      (span) => doBuild(client2, project, buildsJson, cwd, outputDir, span)
+    );
+    await rootSpan.stop();
     return 0;
   } catch (err) {
     output_manager_default.prettyError(err);
@@ -133736,12 +133744,23 @@ async function main2(client2) {
     await import_fs_extra18.default.writeJSON(configJsonPath, { version: 3 }, { spaces: 2 });
     return 1;
   } finally {
+    try {
+      const diagnosticsOutputPath = (0, import_path27.join)(outputDir, "diagnostics");
+      await (0, import_promises.mkdir)(diagnosticsOutputPath, { recursive: true });
+      await (0, import_promises.writeFile)(
+        (0, import_path27.join)(diagnosticsOutputPath, "cli_traces.json"),
+        JSON.stringify(reporter.events)
+      );
+    } catch (err) {
+      output_manager_default.error("Failed to write diagnostics trace file");
+      output_manager_default.prettyError(err);
+    }
     for (const key of envToUnset) {
       delete process.env[key];
     }
   }
 }
-async function doBuild(client2, project, buildsJson, cwd, outputDir) {
+async function doBuild(client2, project, buildsJson, cwd, outputDir, span) {
   const { localConfigPath } = client2;
   const workPath = (0, import_path27.join)(cwd, project.settings.rootDirectory || ".");
   const [pkg, vercelConfig, nowConfig] = await Promise.all([
@@ -133904,20 +133923,27 @@ async function doBuild(client2, project, buildsJson, cwd, outputDir) {
         framework: projectSettings.framework,
         nodeVersion: projectSettings.nodeVersion
       } : build2.config || {};
+      const builderSpan = span.child("vc.builder", {
+        name: builderPkg.name
+      });
+      const buildSpan = builderSpan.child(import_build_utils13.BUILDER_COMPILE_STEP);
       const buildOptions = {
         files: filesMap,
         entrypoint: build2.src,
         workPath,
         repoRootPath,
         config: buildConfig,
-        meta
+        meta,
+        span: buildSpan
       };
       output_manager_default.debug(
         `Building entrypoint "${build2.src}" with "${builderPkg.name}"`
       );
       let buildResult;
       try {
-        buildResult = await builder.build(buildOptions);
+        buildResult = await buildSpan.trace(
+          () => builder.build(buildOptions)
+        );
         if (buildConfig.zeroConfig && isFrontendBuilder && "output" in buildResult && !buildResult.routes) {
           const framework2 = import_frameworks5.frameworkList.find(
             (f) => f.slug === buildConfig.framework
@@ -133929,7 +133955,10 @@ async function doBuild(client2, project, buildsJson, cwd, outputDir) {
         }
       } finally {
         try {
-          Object.assign(diagnostics, await builder.diagnostics?.(buildOptions));
+          const builderDiagnostics = await builderSpan.child("vc.builder.diagnostics").trace(async () => {
+            return await builder.diagnostics?.(buildOptions);
+          });
+          Object.assign(diagnostics, builderDiagnostics);
         } catch (error3) {
           output_manager_default.error("Collecting diagnostics failed");
           output_manager_default.debug(error3);
@@ -134200,7 +134229,7 @@ async function getFrameworkRoutes(framework, dirPrefix) {
   }
   return routes2;
 }
-var import_chalk46, import_dotenv, import_fs_extra18, import_minimatch2, import_path27, import_semver3, import_build_utils13, import_client6, import_frameworks5, import_fs_detectors4, import_routing_utils2;
+var import_chalk46, import_dotenv, import_fs_extra18, import_minimatch2, import_path27, import_semver3, import_build_utils13, import_client6, import_frameworks5, import_fs_detectors4, import_routing_utils2, import_promises, InMemoryReporter;
 var init_build2 = __esm({
   "src/commands/build/index.ts"() {
     "use strict";
@@ -134241,6 +134270,15 @@ var init_build2 = __esm({
     init_help();
     init_pull4();
     init_command3();
+    import_promises = require("fs/promises");
+    InMemoryReporter = class {
+      constructor() {
+        this.events = [];
+      }
+      report(event) {
+        this.events.push(event);
+      }
+    };
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "41.0.3",
+  "version": "41.1.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -21,17 +21,17 @@
     "node": ">= 18"
   },
   "dependencies": {
-    "@vercel/build-utils": "9.2.1",
+    "@vercel/build-utils": "9.3.0",
     "@vercel/fun": "1.1.4",
     "@vercel/go": "3.2.1",
     "@vercel/hydrogen": "1.1.0",
-    "@vercel/next": "4.5.2",
-    "@vercel/node": "5.1.2",
+    "@vercel/next": "4.6.0",
+    "@vercel/node": "5.1.3",
     "@vercel/python": "4.7.1",
     "@vercel/redwood": "2.2.0",
-    "@vercel/remix-builder": "5.2.4",
+    "@vercel/remix-builder": "5.3.0",
     "@vercel/ruby": "2.2.0",
-    "@vercel/static-build": "2.6.1",
+    "@vercel/static-build": "2.6.2",
     "chokidar": "4.0.0"
   },
   "devDependencies": {
@@ -80,7 +80,7 @@
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
     "@vercel-internals/types": "3.0.6",
-    "@vercel/client": "15.0.3",
+    "@vercel/client": "15.0.4",
     "@vercel/error-utils": "2.0.3",
     "@vercel/frameworks": "3.6.1",
     "@vercel/fs-detectors": "5.3.8",