@vercel/next 4.5.2 → 4.6.0

package/dist/index.js

@@ -13820,6 +13820,9 @@ async function serverBuild({
         ) : {};
         const updated = {
           ...rewrite,
+          // We don't want to perform the actual rewrite here, instead we want
+          // to just add the headers associated with the rewrite.
+          dest: void 0,
           has,
           headers: headers2
         };
@@ -15700,6 +15703,7 @@ function isLegacyNext(nextVersion) {
 }
 var build = async (buildOptions) => {
   let { workPath, repoRootPath } = buildOptions;
+  const buildSpan = buildOptions.span ?? new import_build_utils3.Span({ name: import_build_utils3.BUILDER_COMPILE_STEP });
   const {
     files,
     entrypoint,
@@ -15806,18 +15810,38 @@ var build = async (buildOptions) => {
     (0, import_build_utils3.debug)("Found NPM_AUTH_TOKEN in environment, creating .npmrc");
     await writeNpmRc(entryPath, process.env.NPM_AUTH_TOKEN);
   }
-  if (typeof installCommand === "string") {
-    if (installCommand.trim()) {
-      console.log(`Running "install" command: \`${installCommand}\`...`);
-      await (0, import_build_utils3.execCommand)(installCommand, {
-        ...spawnOpts,
-        cwd: entryPath
-      });
-    } else {
-      console.log(`Skipping "install" command...`);
-    }
+  const { detectedPackageManager } = (0, import_build_utils3.detectPackageManager)(cliType, lockfileVersion) ?? {};
+  const trimmedInstallCommand = installCommand?.trim();
+  const shouldRunInstallCommand = (
+    // Case 1: We have a zero config install
+    typeof trimmedInstallCommand === "undefined" || // Case 1: We have a install command which is non zero length
+    Boolean(trimmedInstallCommand)
+  );
+  buildSpan.setAttributes({
+    install: JSON.stringify(shouldRunInstallCommand)
+  });
+  if (shouldRunInstallCommand) {
+    await buildSpan.child(import_build_utils3.BUILDER_INSTALLER_STEP, {
+      cliType,
+      lockfileVersion: lockfileVersion?.toString(),
+      packageJsonPackageManager,
+      detectedPackageManager,
+      installCommand: trimmedInstallCommand
+    }).trace(async () => {
+      if (typeof trimmedInstallCommand === "string") {
+        console.log(
+          `Running "install" command: \`${trimmedInstallCommand}\`...`
+        );
+        await (0, import_build_utils3.execCommand)(trimmedInstallCommand, {
+          ...spawnOpts,
+          cwd: entryPath
+        });
+      } else {
+        await (0, import_build_utils3.runNpmInstall)(entryPath, [], spawnOpts, meta, nodeVersion);
+      }
+    });
   } else {
-    await (0, import_build_utils3.runNpmInstall)(entryPath, [], spawnOpts, meta, nodeVersion);
+    console.log(`Skipping "install" command...`);
   }
   if (spawnOpts.env.VERCEL_ANALYTICS_ID) {
     (0, import_build_utils3.debug)("Found VERCEL_ANALYTICS_ID in environment");
@@ -15885,31 +15909,36 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
   if (isServerMode) {
     env.NODE_ENV = "production";
   }
-  if (buildCommand) {
-    const nodeBinPaths = (0, import_build_utils3.getNodeBinPaths)({
-      start: entryPath,
-      base: repoRootPath
-    });
-    const nodeBinPath = nodeBinPaths.join(import_path5.default.delimiter);
-    env.PATH = `${nodeBinPath}${import_path5.default.delimiter}${env.PATH}`;
-    if (!env.YARN_NODE_LINKER) {
-      env.YARN_NODE_LINKER = "node-modules";
+  await buildSpan.child(import_build_utils3.BUILDER_COMPILE_STEP, {
+    buildCommand,
+    buildScriptName
+  }).trace(async () => {
+    if (buildCommand) {
+      const nodeBinPaths = (0, import_build_utils3.getNodeBinPaths)({
+        start: entryPath,
+        base: repoRootPath
+      });
+      const nodeBinPath = nodeBinPaths.join(import_path5.default.delimiter);
+      env.PATH = `${nodeBinPath}${import_path5.default.delimiter}${env.PATH}`;
+      if (!env.YARN_NODE_LINKER) {
+        env.YARN_NODE_LINKER = "node-modules";
+      }
+      (0, import_build_utils3.debug)(
+        `Added "${nodeBinPath}" to PATH env because a build command was used.`
+      );
+      console.log(`Running "${buildCommand}"`);
+      await (0, import_build_utils3.execCommand)(buildCommand, {
+        ...spawnOpts,
+        cwd: entryPath,
+        env
+      });
+    } else if (buildScriptName) {
+      await (0, import_build_utils3.runPackageJsonScript)(entryPath, buildScriptName, {
+        ...spawnOpts,
+        env
+      });
     }
-    (0, import_build_utils3.debug)(
-      `Added "${nodeBinPath}" to PATH env because a build command was used.`
-    );
-    console.log(`Running "${buildCommand}"`);
-    await (0, import_build_utils3.execCommand)(buildCommand, {
-      ...spawnOpts,
-      cwd: entryPath,
-      env
-    });
-  } else if (buildScriptName) {
-    await (0, import_build_utils3.runPackageJsonScript)(entryPath, buildScriptName, {
-      ...spawnOpts,
-      env
-    });
-  }
+  });
   (0, import_build_utils3.debug)("build command exited");
   if (buildCallback) {
     await buildCallback(buildOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.5.2",
+  "version": "4.6.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -30,7 +30,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "9.2.1",
+    "@vercel/build-utils": "9.3.0",
     "@vercel/routing-utils": "5.0.4",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",