@vercel/next 3.0.1 → 3.0.2-canary.2

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,52 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = (isOverride = false) => {
+        return isNextDataServerResolving
+            ? [
+                // strip _next/data prefix for resolving
+                {
+                    src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                    dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                    ...(isOverride ? { override: true } : {}),
+                    continue: true,
+                    has: [
+                        {
+                            type: 'header',
+                            key: 'x-nextjs-data',
+                        },
+                    ],
+                },
+            ]
+            : [];
+    };
+    const denormalizeNextDataRoute = (isOverride = false) => {
+        return isNextDataServerResolving
+            ? [
+                {
+                    src: '/(.*)',
+                    has: [
+                        {
+                            type: 'header',
+                            key: 'x-nextjs-data',
+                        },
+                    ],
+                    dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                    continue: true,
+                    ...(isOverride ? { override: true } : {}),
+                },
+            ]
+            : [];
+    };
+    let nextDataCatchallOutput = undefined;
+    if (isNextDataServerResolving) {
+        const catchallFsPath = path_1.default.join(entryPath, outputDirectory, '__next_data_catchall.json');
+        await fs_extra_1.default.writeFile(catchallFsPath, '{}');
+        nextDataCatchallOutput = new build_utils_1.FileFsRef({
+            contentType: 'application/json',
+            fsPath: catchallFsPath,
+        });
+    }
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -47487,6 +47537,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: nextDataCatchallOutput,
+                }
+                : {}),
         },
         routes: [
             /*
@@ -47504,6 +47559,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute(true),
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -47629,6 +47686,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute(true),
             // 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 +47706,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 +47764,41 @@ 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
+                ? [
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        headers: {
+                            'x-nextjs-matched-path': '/$1',
+                        },
+                        continue: true,
+                    },
+                    // 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,52 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
+    const normalizeNextDataRoute = (isOverride = false) => {
+        return isNextDataServerResolving
+            ? [
+                // strip _next/data prefix for resolving
+                {
+                    src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                    dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                    ...(isOverride ? { override: true } : {}),
+                    continue: true,
+                    has: [
+                        {
+                            type: 'header',
+                            key: 'x-nextjs-data',
+                        },
+                    ],
+                },
+            ]
+            : [];
+    };
+    const denormalizeNextDataRoute = (isOverride = false) => {
+        return isNextDataServerResolving
+            ? [
+                {
+                    src: '/(.*)',
+                    has: [
+                        {
+                            type: 'header',
+                            key: 'x-nextjs-data',
+                        },
+                    ],
+                    dest: `${path_1.default.join('/', entryDirectory, '/_next/data/', buildId, '/$1.json')}`,
+                    continue: true,
+                    ...(isOverride ? { override: true } : {}),
+                },
+            ]
+            : [];
+    };
+    let nextDataCatchallOutput = undefined;
+    if (isNextDataServerResolving) {
+        const catchallFsPath = path_1.default.join(entryPath, outputDirectory, '__next_data_catchall.json');
+        await fs_extra_1.default.writeFile(catchallFsPath, '{}');
+        nextDataCatchallOutput = new build_utils_1.FileFsRef({
+            contentType: 'application/json',
+            fsPath: catchallFsPath,
+        });
+    }
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -482,6 +531,11 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...staticDirectoryFiles,
             ...privateOutputs.files,
             ...middleware.edgeFunctions,
+            ...(isNextDataServerResolving
+                ? {
+                    __next_data_catchall: nextDataCatchallOutput,
+                }
+                : {}),
         },
         routes: [
             /*
@@ -499,6 +553,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             // trailing slash
             ...trailingSlashRedirects,
             ...privateOutputs.routes,
+            // normalize _next/data URL before processing redirects
+            ...normalizeNextDataRoute(true),
             ...(i18n
                 ? [
                     // Handle auto-adding current default locale to path based on
@@ -624,6 +680,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
+            // we need to undo _next/data normalize before checking filesystem
+            ...denormalizeNextDataRoute(true),
             // 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 +700,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 +758,41 @@ 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
+                ? [
+                    {
+                        src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
+                        headers: {
+                            'x-nextjs-matched-path': '/$1',
+                        },
+                        continue: true,
+                    },
+                    // 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.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,9 +45,9 @@
     "@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.1",
     "@vercel/nft": "0.19.1",
-    "@vercel/routing-utils": "1.13.4",
+    "@vercel/routing-utils": "1.13.5-canary.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "0c7b54edad6adf48505abf2cbec01691b85963bb"
+  "gitHead": "cf7c50d69178cd090daf00146828b310f34f4961"
 }