@vercel/next 4.15.2 → 4.15.4

package/dist/index.js

@@ -15390,7 +15390,8 @@ ${JSON.stringify(
       true
     )];
   });
-  const isNextDataServerResolving = (middleware.staticRoutes.length > 0 || nodeMiddleware) && import_semver4.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
+  const hasPagesRouter = routesManifest.appType ? routesManifest.appType === "pages" || routesManifest.appType === "hybrid" : true;
+  const isNextDataServerResolving = hasPagesRouter && (middleware.staticRoutes.length > 0 || nodeMiddleware) && import_semver4.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
   const dynamicRoutes = await getDynamicRoutes({
     entryPath,
     entryDirectory,
@@ -15831,7 +15832,11 @@ ${JSON.stringify(
       ...appDir ? [
         ...isAppClientSegmentCacheEnabled && rscPrefetchHeader && prefetchSegmentHeader && prefetchSegmentDirSuffix && prefetchSegmentSuffix ? [
           {
-            src: import_path5.default.posix.join("/", entryDirectory, "/(?<path>.+)$"),
+            src: import_path5.default.posix.join(
+              "/",
+              entryDirectory,
+              "/(?<path>.+?)(?:/)?$"
+            ),
             dest: import_path5.default.posix.join(
               "/",
               entryDirectory,
@@ -15858,7 +15863,7 @@ ${JSON.stringify(
             override: true
           },
           {
-            src: import_path5.default.posix.join("^/", entryDirectory, "$"),
+            src: import_path5.default.posix.join("^/", entryDirectory, "/?$"),
             dest: import_path5.default.posix.join(
               "/",
               entryDirectory,
@@ -15974,7 +15979,7 @@ ${JSON.stringify(
       ] : [],
       // normalize _next/data URL before processing rewrites
       ...normalizeNextDataRoute(),
-      ...!isNextDataServerResolving ? [
+      ...!isNextDataServerResolving && hasPagesRouter ? [
         // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
         // if no match to prevent rewriting _next/data unexpectedly
         {
@@ -16184,7 +16189,7 @@ ${JSON.stringify(
           return route;
         }).filter(Boolean)
       ) : dataRoutes,
-      ...!isNextDataServerResolving ? [
+      ...!isNextDataServerResolving && hasPagesRouter ? [
         // ensure we 404 for non-existent _next/data routes before
         // trying page dynamic routes
         {
@@ -16460,17 +16465,18 @@ var build = async (buildOptions) => {
   let pkg = await readPackageJson(entryPath);
   const nextVersionRange = await getNextVersionRange(entryPath);
   const nodeVersion = await (0, import_build_utils3.getNodeVersion)(entryPath, void 0, config, meta);
+  const spawnOpts = (0, import_build_utils3.getSpawnOptions)(meta, nodeVersion);
   const {
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
     turboSupportsCorepackHome
   } = await (0, import_build_utils3.scanParentDirs)(entryPath, true);
-  const spawnEnv = (0, import_build_utils3.getEnvForPackageManager)({
+  spawnOpts.env = (0, import_build_utils3.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    env: process.env,
+    env: spawnOpts.env || {},
     turboSupportsCorepackHome,
     projectCreatedAt: config.projectSettings?.createdAt
   });
@@ -16547,14 +16553,14 @@ var build = async (buildOptions) => {
           `Running "install" command: \`${trimmedInstallCommand}\`...`
         );
         await (0, import_build_utils3.execCommand)(trimmedInstallCommand, {
-          env: spawnEnv,
+          ...spawnOpts,
           cwd: entryPath
         });
       } else {
         await (0, import_build_utils3.runNpmInstall)(
           entryPath,
           [],
-          { env: spawnEnv },
+          spawnOpts,
           meta,
           config.projectSettings?.createdAt
         );
@@ -16563,14 +16569,14 @@ var build = async (buildOptions) => {
   } else {
     console.log(`Skipping "install" command...`);
   }
-  if (spawnEnv.VERCEL_ANALYTICS_ID) {
+  if (spawnOpts.env.VERCEL_ANALYTICS_ID) {
     (0, import_build_utils3.debug)("Found VERCEL_ANALYTICS_ID in environment");
     const version2 = await (0, import_build_utils3.getInstalledPackageVersion)(
       "@vercel/speed-insights",
       entryPath
     );
     if (version2) {
-      delete spawnEnv.VERCEL_ANALYTICS_ID;
+      delete spawnOpts.env.VERCEL_ANALYTICS_ID;
       delete process.env.VERCEL_ANALYTICS_ID;
       (0, import_build_utils3.debug)(
         "@vercel/speed-insights is installed, removing VERCEL_ANALYTICS_ID from environment"
@@ -16620,7 +16626,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
   } else if (!isLegacy) {
     target = await createServerlessConfig(workPath, entryPath, nextVersion);
   }
-  const env = { ...spawnEnv };
+  const env = { ...spawnOpts.env };
   env.NEXT_EDGE_RUNTIME_PROVIDER = "vercel";
   if (target) {
     env.NEXT_PRIVATE_TARGET = target;
@@ -16653,6 +16659,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         );
         console.log(`Running "${buildCommand}"`);
         await (0, import_build_utils3.execCommand)(buildCommand, {
+          ...spawnOpts,
           cwd: entryPath,
           env
         });
@@ -16661,6 +16668,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
           entryPath,
           buildScriptName,
           {
+            ...spawnOpts,
             env
           },
           config.projectSettings?.createdAt
@@ -17067,9 +17075,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
     await (0, import_build_utils3.runNpmInstall)(
       entryPath,
       ["--production"],
-      {
-        env: spawnEnv
-      },
+      spawnOpts,
       meta,
       config.projectSettings?.createdAt
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.15.2",
+  "version": "4.15.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -30,8 +30,8 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "13.0.0",
-    "@vercel/routing-utils": "5.2.1",
+    "@vercel/build-utils": "13.2.0",
+    "@vercel/routing-utils": "5.3.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "bytes": "3.1.2",