@vercel/next 4.6.0 → 4.6.2

package/dist/index.js

@@ -824,7 +824,7 @@ var require_superstatic = __commonJS({
       sourceToRegex: () => sourceToRegex
     });
     module2.exports = __toCommonJS2(superstatic_exports);
-    var import_url4 = require("url");
+    var import_url3 = require("url");
     var import_path_to_regexp = require_dist();
     var import_path_to_regexp_updated = require_dist2();
     function cloneKeys(keys) {
@@ -1086,7 +1086,7 @@ var require_superstatic = __commonJS({
         indexes[name] = "$" + name;
         escapedDestination = escapeSegment(escapedDestination, name);
       });
-      const parsedDestination = (0, import_url4.parse)(escapedDestination, true);
+      const parsedDestination = (0, import_url3.parse)(escapedDestination, true);
       delete parsedDestination.href;
       delete parsedDestination.path;
       delete parsedDestination.search;
@@ -1138,7 +1138,7 @@ var require_superstatic = __commonJS({
           }
         }
       }
-      destination = (0, import_url4.format)({
+      destination = (0, import_url3.format)({
         ...rest,
         hostname,
         pathname,
@@ -8173,24 +8173,24 @@ var require_util = __commonJS({
     }
     exports.urlParse = urlParse;
     function urlGenerate(aParsedUrl) {
-      let url4 = "";
+      let url3 = "";
       if (aParsedUrl.scheme) {
-        url4 += aParsedUrl.scheme + ":";
+        url3 += aParsedUrl.scheme + ":";
       }
-      url4 += "//";
+      url3 += "//";
       if (aParsedUrl.auth) {
-        url4 += aParsedUrl.auth + "@";
+        url3 += aParsedUrl.auth + "@";
       }
       if (aParsedUrl.host) {
-        url4 += aParsedUrl.host;
+        url3 += aParsedUrl.host;
       }
       if (aParsedUrl.port) {
-        url4 += ":" + aParsedUrl.port;
+        url3 += ":" + aParsedUrl.port;
       }
       if (aParsedUrl.path) {
-        url4 += aParsedUrl.path;
+        url3 += aParsedUrl.path;
       }
-      return url4;
+      return url3;
     }
     exports.urlGenerate = urlGenerate;
     var MAX_CACHED_INPUTS = 32;
@@ -8218,12 +8218,12 @@ var require_util = __commonJS({
     }
     var normalize = lruMemoize(function normalize2(aPath) {
       let path5 = aPath;
-      const url4 = urlParse(aPath);
-      if (url4) {
-        if (!url4.path) {
+      const url3 = urlParse(aPath);
+      if (url3) {
+        if (!url3.path) {
           return aPath;
         }
-        path5 = url4.path;
+        path5 = url3.path;
       }
       const isAbsolute = exports.isAbsolute(path5);
       const parts = [];
@@ -8263,9 +8263,9 @@ var require_util = __commonJS({
       if (path5 === "") {
         path5 = isAbsolute ? "/" : ".";
       }
-      if (url4) {
-        url4.path = path5;
-        return urlGenerate(url4);
+      if (url3) {
+        url3.path = path5;
+        return urlGenerate(url3);
       }
       return path5;
     });
@@ -9586,13 +9586,13 @@ var require_source_map_consumer = __commonJS({
         if (this.sourceRoot != null) {
           relativeSource = util.relative(this.sourceRoot, relativeSource);
         }
-        let url4;
-        if (this.sourceRoot != null && (url4 = util.urlParse(this.sourceRoot))) {
+        let url3;
+        if (this.sourceRoot != null && (url3 = util.urlParse(this.sourceRoot))) {
           const fileUriAbsPath = relativeSource.replace(/^file:\/\//, "");
-          if (url4.scheme == "file" && this._sources.has(fileUriAbsPath)) {
+          if (url3.scheme == "file" && this._sources.has(fileUriAbsPath)) {
             return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)];
           }
-          if ((!url4.path || url4.path == "/") && this._sources.has("/" + relativeSource)) {
+          if ((!url3.path || url3.path == "/") && this._sources.has("/" + relativeSource)) {
             return this.sourcesContent[this._sources.indexOf("/" + relativeSource)];
           }
         }
@@ -10811,7 +10811,7 @@ var import_find_up = __toESM(require_find_up());
 var import_fs_extra6 = __toESM(require_lib2());
 var import_path5 = __toESM(require("path"));
 var import_semver4 = __toESM(require_semver());
-var import_url3 = __toESM(require("url"));
+var import_url2 = __toESM(require("url"));
 
 // src/create-serverless-config.ts
 var import_fs_extra4 = __toESM(require_lib2());
@@ -13624,7 +13624,6 @@ var legacy_versions_default = [
 
 // src/server-build.ts
 var import_path4 = __toESM(require("path"));
-var import_url2 = __toESM(require("url"));
 var import_semver3 = __toESM(require_semver());
 var import_async_sema2 = __toESM(require_lib());
 var import_build_utils2 = require("@vercel/build-utils");
@@ -13754,7 +13753,31 @@ async function serverBuild({
         const rewrite = rewrites[i];
         if (!rewrite.src || !rewrite.dest)
           continue;
-        const { protocol, pathname, query } = import_url2.default.parse(rewrite.dest);
+        let protocol = null;
+        if (rewrite.dest.startsWith("http://")) {
+          protocol = "http://";
+        } else if (rewrite.dest.startsWith("https://")) {
+          protocol = "https://";
+        }
+        let pathname = null;
+        let query = null;
+        if (!protocol) {
+          pathname = rewrite.dest;
+          let index = pathname.indexOf("?");
+          if (index !== -1) {
+            query = pathname.substring(index + 1);
+            pathname = pathname.substring(0, index);
+            index = query.indexOf("#");
+            if (index !== -1) {
+              query = query.substring(0, index);
+            }
+          } else {
+            index = pathname.indexOf("#");
+            if (index !== -1) {
+              pathname = pathname.substring(0, index);
+            }
+          }
+        }
         if (isAfterFilesRewrite) {
           const parts = ["\\.rsc"];
           if (isAppPPREnabled) {
@@ -13768,11 +13791,12 @@ async function serverBuild({
             /\/?\(\?:\/\)\?/,
             `(?:/)?(?<rscsuff>${rscSuffix})?`
           );
-          let destQueryIndex = rewrite.dest.indexOf("?");
+          const destQueryIndex = rewrite.dest.indexOf("?");
           if (destQueryIndex === -1) {
-            destQueryIndex = rewrite.dest.length;
+            rewrite.dest = `${rewrite.dest}$rscsuff`;
+          } else {
+            rewrite.dest = `${rewrite.dest.substring(0, destQueryIndex)}$rscsuff${rewrite.dest.substring(destQueryIndex)}`;
           }
-          rewrite.dest = rewrite.dest.substring(0, destQueryIndex) + "$rscsuff" + rewrite.dest.substring(destQueryIndex);
         }
         const { rewriteHeaders } = routesManifest;
         if (!rewriteHeaders)
@@ -15703,7 +15727,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 builderSpan = buildOptions.span ?? new import_build_utils3.Span({ name: "vc.builder" });
   const {
     files,
     entrypoint,
@@ -15817,11 +15841,11 @@ var build = async (buildOptions) => {
     typeof trimmedInstallCommand === "undefined" || // Case 1: We have a install command which is non zero length
     Boolean(trimmedInstallCommand)
   );
-  buildSpan.setAttributes({
+  builderSpan.setAttributes({
     install: JSON.stringify(shouldRunInstallCommand)
   });
   if (shouldRunInstallCommand) {
-    await buildSpan.child(import_build_utils3.BUILDER_INSTALLER_STEP, {
+    await builderSpan.child(import_build_utils3.BUILDER_INSTALLER_STEP, {
       cliType,
       lockfileVersion: lockfileVersion?.toString(),
       packageJsonPackageManager,
@@ -15909,37 +15933,45 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
   if (isServerMode) {
     env.NODE_ENV = "production";
   }
-  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
-      });
-    }
+  const shouldRunCompileStep = Boolean(buildCommand) || Boolean(buildScriptName);
+  builderSpan.setAttributes({
+    build: JSON.stringify(shouldRunCompileStep)
   });
-  (0, import_build_utils3.debug)("build command exited");
+  if (shouldRunCompileStep) {
+    await builderSpan.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)("build command exited");
+  } else {
+    console.log(`Skipping "build" command...`);
+  }
   if (buildCallback) {
     await buildCallback(buildOptions);
   }
@@ -17329,7 +17361,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
     for (let i = 0; i < dynamicRoutes.length; i++) {
       const route = dynamicRoutes[i];
       mergedDynamicRoutesLambdaRoutes.push(route);
-      const { pathname } = import_url3.default.parse(route.dest);
+      const { pathname } = import_url2.default.parse(route.dest);
       if (pathname && pageLambdaMap[pathname]) {
         mergedDynamicRoutesLambdaRoutes.push(
           dynamicPageLambdaRoutesMap[pathname]
@@ -17339,7 +17371,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
     for (let i = 0; i < dataRoutes.length; i++) {
       const route = dataRoutes[i];
       mergedDataRoutesLambdaRoutes.push(route);
-      const { pathname } = import_url3.default.parse(route.dest);
+      const { pathname } = import_url2.default.parse(route.dest);
       if (pathname && pageLambdaMap[pathname] && dynamicPageLambdaRoutesMap[pathname]) {
         mergedDataRoutesLambdaRoutes.push(dynamicPageLambdaRoutesMap[pathname]);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "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.3.0",
+    "@vercel/build-utils": "10.0.1",
     "@vercel/routing-utils": "5.0.4",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",