@vercel/next 4.13.2 → 4.13.4

package/dist/index.js

@@ -12564,12 +12564,13 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   function normalizeDataRoute(route) {
     let normalized = import_path3.default.posix.join(entryDirectory, route);
     if (nonDynamicSsg || isFallback || isOmitted) {
+      const pathToReplace = route.endsWith(routeFileNoExt + ".json") ? origRouteFileNoExt : routeFileNoExt;
       normalized = normalized.replace(
         new RegExp(`${(0, import_escape_string_regexp.default)(origRouteFileNoExt)}.json$`),
         // ensure we escape "$" correctly while replacing as "$" is a special
         // character, we need to do double escaping as first is for the initial
         // replace on the routeFile and then the second on the outputPath
-        `${routeFileNoExt.replace(/\$/g, "$$$$")}.json`
+        `${pathToReplace.replace(/\$/g, "$$$$")}.json`
       );
     }
     return normalized;
@@ -12796,27 +12797,27 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       }
       if (outputPathData && renderingMode !== "PARTIALLY_STATIC" /* PARTIALLY_STATIC */) {
         prerenders[normalizePathData(outputPathData)] = prerender;
-      } else if (outputPathData && routesManifest?.rsc?.dynamicRSCPrerender && routesManifest?.ppr?.chain?.headers && postponedState) {
-        const contentType = `application/x-nextjs-pre-render; state-length=${postponedState.length}; origin=${JSON.stringify(
-          rscContentTypeHeader
-        )}`;
-        let rdcRSCAllowQuery = allowQuery;
-        if (isAppClientParamParsingEnabled) {
-          rdcRSCAllowQuery = [];
+      } else if (outputPathData && routesManifest?.rsc?.dynamicRSCPrerender && routesManifest?.ppr?.chain?.headers) {
+        let contentType = rscContentTypeHeader;
+        if (postponedState) {
+          contentType = `application/x-nextjs-pre-render; state-length=${postponedState.length}; origin=${JSON.stringify(
+            rscContentTypeHeader
+          )}`;
+        }
+        const rdcRSCAllowQuery = isAppClientParamParsingEnabled ? htmlAllowQuery : allowQuery;
+        let fallback = null;
+        if (rdcRSCAllowQuery && rdcRSCAllowQuery.length === 0 && postponedState) {
+          fallback = new import_build_utils.FileBlob({
+            data: postponedState,
+            contentType
+          });
         }
         prerenders[normalizePathData(outputPathData)] = new import_build_utils.Prerender({
           expiration: initialRevalidate,
           staleExpiration: initialExpire,
           lambda,
           allowQuery: rdcRSCAllowQuery,
-          fallback: (
-            // Use the fallback value for the RSC route if the route doesn't
-            // vary based on the route parameters.
-            rdcRSCAllowQuery && rdcRSCAllowQuery.length === 0 ? new import_build_utils.FileBlob({
-              data: postponedState,
-              contentType
-            }) : null
-          ),
+          fallback,
           group: prerenderGroup,
           bypassToken: prerenderManifest.bypassToken,
           experimentalBypassFor,
@@ -12848,10 +12849,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             appDir,
             routeFileNoExt + prefetchSegmentDirSuffix
           );
-          let segmentAllowQuery = allowQuery;
-          if (isAppClientParamParsingEnabled && (isFallback || isBlocking)) {
-            segmentAllowQuery = [];
-          }
+          const segmentAllowQuery = isAppClientParamParsingEnabled ? htmlAllowQuery : allowQuery;
           for (const segmentPath of meta.segmentPaths) {
             const outputSegmentPath = import_path3.default.join(
               outputPathPage + prefetchSegmentDirSuffix,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.13.2",
+  "version": "4.13.4",
   "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": "12.1.0",
+    "@vercel/build-utils": "12.1.3",
     "@vercel/routing-utils": "5.2.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
@@ -57,7 +57,7 @@
   },
   "scripts": {
     "build": "node build.mjs",
-    "test": "echo 'temporarily skipping tests'",
+    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand --testTimeout=360000",
     "test-unit": "pnpm test test/unit/",
     "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
     "test-next-local-legacy": "pnpm test test/integration/legacy/*.test.js",