@vercel/next 3.0.1 → 3.0.2-canary.0

package/dist/index.js

@@ -45724,6 +45724,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
                 entryPath,
                 baseDir,
                 dataRoutes,
+                buildId,
                 escapedBuildId,
                 outputDirectory,
                 trailingSlashRedirects,
@@ -47023,7 +47024,8 @@ const pretty_bytes_1 = __importDefault(__webpack_require__(539));
 // related PR: https://github.com/vercel/next.js/pull/30046
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
 const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
-async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
+async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -47422,6 +47424,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         routesManifest,
         isCorrectMiddlewareOrder,
     });
+    const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
+        semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const notFoundPreviewRoutes = [];
@@ -47464,6 +47468,39 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            // strip _next/data prefix for resolving
+            {
+                src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                continue: true,
+                override: true,
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+            },
+        ]
+        : [];
+    const denormalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            {
+                src: '/(.*)',
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+                dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                continue: true,
+                override: true,
+            },
+        ]
+        : [];
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -47487,6 +47524,15 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: new build_utils_1.FileBlob({
+                        contentType: 'application/json',
+                        mode: 0o644,
+                        data: '{}',
+                    }),
+                }
+                : {}),
         },
         routes: [
             /*
@@ -47504,6 +47550,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute,
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -47629,6 +47677,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute,
             // while middleware was in beta the order came right before
             // handle: 'filesystem' we maintain this for older versions
             // to prevent a local/deploy mismatch
@@ -47647,13 +47697,19 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
-            // if no match to prevent rewriting _next/data unexpectedly
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
-                check: true,
-            },
+            // normalize _next/data URL before processing rewrites
+            ...normalizeNextDataRoute,
+            ...(!isNextDataServerResolving
+                ? [
+                    // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
+                    // if no match to prevent rewriting _next/data unexpectedly
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
+                        check: true,
+                    },
+                ]
+                : []),
             // These need to come before handle: miss or else they are grouped
             // with that routing section
             ...afterFilesRewrites,
@@ -47699,18 +47755,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // routes that are called after each rewrite or after routes
             // if there no rewrites
             { handle: 'rewrite' },
+            // re-build /_next/data URL after resolving
+            ...denormalizeNextDataRoute,
             // /_next/data routes for getServerProps/getStaticProps pages
             ...dataRoutes,
-            // ensure we 404 for non-existent _next/data routes before
-            // trying page dynamic routes
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '404'),
-                status: 404,
-            },
+            ...(!isNextDataServerResolving
+                ? [
+                    // ensure we 404 for non-existent _next/data routes before
+                    // trying page dynamic routes
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '404'),
+                        status: 404,
+                    },
+                ]
+                : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
             ...dynamicRoutes,
+            ...(isNextDataServerResolving
+                ? [
+                    // add a catch-all data route so we don't 404 when getting
+                    // middleware effects
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        dest: '__next_data_catchall',
+                    },
+                ]
+                : []),
             // routes to call after a file has been matched
             { handle: 'hit' },
             // Before we handle static files we need to set proper caching headers

package/dist/server-build.js

@@ -18,7 +18,8 @@ const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 // related PR: https://github.com/vercel/next.js/pull/30046
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
 const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
-async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
+const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
+async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, buildId, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -417,6 +418,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         routesManifest,
         isCorrectMiddlewareOrder,
     });
+    const isNextDataServerResolving = middleware.staticRoutes.length > 0 &&
+        semver_1.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const notFoundPreviewRoutes = [];
@@ -459,6 +462,39 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            // strip _next/data prefix for resolving
+            {
+                src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                continue: true,
+                override: true,
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+            },
+        ]
+        : [];
+    const denormalizeNextDataRoute = isNextDataServerResolving
+        ? [
+            {
+                src: '/(.*)',
+                has: [
+                    {
+                        type: 'header',
+                        key: 'x-nextjs-data',
+                    },
+                ],
+                dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                continue: true,
+                override: true,
+            },
+        ]
+        : [];
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -482,6 +518,15 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: new build_utils_1.FileBlob({
+                        contentType: 'application/json',
+                        mode: 0o644,
+                        data: '{}',
+                    }),
+                }
+                : {}),
         },
         routes: [
             /*
@@ -499,6 +544,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute,
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -624,6 +671,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute,
             // while middleware was in beta the order came right before
             // handle: 'filesystem' we maintain this for older versions
             // to prevent a local/deploy mismatch
@@ -642,13 +691,19 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
-            // if no match to prevent rewriting _next/data unexpectedly
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
-                check: true,
-            },
+            // normalize _next/data URL before processing rewrites
+            ...normalizeNextDataRoute,
+            ...(!isNextDataServerResolving
+                ? [
+                    // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
+                    // if no match to prevent rewriting _next/data unexpectedly
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '_next/data/$1'),
+                        check: true,
+                    },
+                ]
+                : []),
             // These need to come before handle: miss or else they are grouped
             // with that routing section
             ...afterFilesRewrites,
@@ -694,18 +749,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // routes that are called after each rewrite or after routes
             // if there no rewrites
             { handle: 'rewrite' },
+            // re-build /_next/data URL after resolving
+            ...denormalizeNextDataRoute,
             // /_next/data routes for getServerProps/getStaticProps pages
             ...dataRoutes,
-            // ensure we 404 for non-existent _next/data routes before
-            // trying page dynamic routes
-            {
-                src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
-                dest: path_1.default.join('/', entryDirectory, '404'),
-                status: 404,
-            },
+            ...(!isNextDataServerResolving
+                ? [
+                    // ensure we 404 for non-existent _next/data routes before
+                    // trying page dynamic routes
+                    {
+                        src: path_1.default.join('/', entryDirectory, '_next/data/(.*)'),
+                        dest: path_1.default.join('/', entryDirectory, '404'),
+                        status: 404,
+                    },
+                ]
+                : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
             ...dynamicRoutes,
+            ...(isNextDataServerResolving
+                ? [
+                    // add a catch-all data route so we don't 404 when getting
+                    // middleware effects
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        dest: '__next_data_catchall',
+                    },
+                ]
+                : []),
             // routes to call after a file has been matched
             { handle: 'hit' },
             // Before we handle static files we need to set proper caching headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.0.1",
+  "version": "3.0.2-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,7 +45,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "4.1.0",
+    "@vercel/build-utils": "4.1.1-canary.0",
     "@vercel/nft": "0.19.1",
     "@vercel/routing-utils": "1.13.4",
     "async-sema": "3.0.1",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "0c7b54edad6adf48505abf2cbec01691b85963bb"
+  "gitHead": "4bf6295d7a1d6544f195d76a2a4aedb476fa7dc1"
 }