@vercel/next 3.1.10 → 3.1.13

package/dist/server-build.js

@@ -21,6 +21,7 @@ const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
 const EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = 'v12.2.0';
 const CORRECTED_MANIFESTS_VERSION = 'v12.2.0';
+const NON_NESTED_MIDDLEWARE_VERSION = 'v12.1.7-canary.9';
 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, trailingSlash, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
@@ -31,6 +32,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
     const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     const isCorrectManifests = semver_1.default.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
+    const isNonNestedMiddleware = semver_1.default.gte(nextVersion, NON_NESTED_MIDDLEWARE_VERSION);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
     if (lambdaPageKeys.length === 0) {
         throw new build_utils_1.NowBuildError({
@@ -610,6 +612,22 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             fsPath: catchallFsPath,
         });
     }
+    // We stopped duplicating matchers for _next/data routes when we added
+    // x-nextjs-data header resolving but we should still resolve middleware
+    // when the header isn't present so we augment the source to include that.
+    // We don't apply this modification for nested middleware > 1 staticRoute
+    if (isNonNestedMiddleware) {
+        middleware.staticRoutes.forEach(route => {
+            if (!route.src?.match(/_next[\\/]{1,}data/)) {
+                route.src =
+                    `^(\\/_next\\/data\\/${escapedBuildId})?(` +
+                        route.src
+                            ?.replace(/\|\^/g, '|')
+                            .replace(/\$$/, ')$')
+                            .replace(/\$/g, '(\\.json)?$');
+            }
+        });
+    }
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -735,15 +753,15 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // ensure prerender's for notFound: true static routes
-            // have 404 status code when not in preview mode
-            ...notFoundPreviewRoutes,
             ...headers,
             ...redirects,
             // middleware comes directly after redirects but before
             // beforeFiles rewrites as middleware is not a "file" route
             ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             ...beforeFilesRewrites,
+            // ensure prerender's for notFound: true static routes
+            // have 404 status code when not in preview mode
+            ...notFoundPreviewRoutes,
             // Make sure to 404 for the /404 path itself
             ...(i18n
                 ? [
@@ -832,7 +850,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 check: true,
                 dest: '$0',
             },
-            // remove locale prefixes to check public files
+            // remove locale prefixes to check public files and
+            // to allow checking non-prefixed lambda outputs
             ...(i18n
                 ? [
                     {
@@ -844,26 +863,46 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     },
                 ]
                 : []),
-            // for non-shared lambdas remove locale prefix if present
-            // to allow checking for lambda
-            ...(!i18n
-                ? []
-                : [
-                    {
-                        src: `${path_1.default.join('/', entryDirectory, '/')}(?:${i18n?.locales
-                            .map(locale => (0, escape_string_regexp_1.default)(locale))
-                            .join('|')})/(.*)`,
-                        dest: '/$1',
-                        check: true,
-                    },
-                ]),
             // routes that are called after each rewrite or after routes
             // if there no rewrites
             { handle: 'rewrite' },
             // re-build /_next/data URL after resolving
             ...denormalizeNextDataRoute(),
+            ...(isNextDataServerResolving
+                ? dataRoutes.filter(route => {
+                    // filter to only static data routes as dynamic routes will be handled
+                    // below
+                    const { pathname } = new URL(route.dest || '/', 'http://n');
+                    return !(0, utils_1.isDynamicRoute)(pathname.replace(/\.json$/, ''));
+                })
+                : []),
             // /_next/data routes for getServerProps/getStaticProps pages
-            ...dataRoutes,
+            ...(isNextDataServerResolving
+                ? // when resolving data routes for middleware we need to include
+                    // all dynamic routes including non-SSG/SSP so that the priority
+                    // is correct
+                    dynamicRoutes
+                        .map(route => {
+                        route = Object.assign({}, route);
+                        route.src = path_1.default.posix.join('^/', entryDirectory, '_next/data/', escapedBuildId, route.src.replace(/(^\^|\$$)/g, '') + '.json$');
+                        const { pathname } = new URL(route.dest || '/', 'http://n');
+                        let isPrerender = !!prerenders[path_1.default.join('./', pathname)];
+                        if (routesManifest.i18n) {
+                            for (const locale of routesManifest.i18n?.locales || []) {
+                                const prerenderPathname = pathname.replace(/^\/\$nextLocale/, `/${locale}`);
+                                if (prerenders[path_1.default.join('./', prerenderPathname)]) {
+                                    isPrerender = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (isPrerender) {
+                            route.dest = `/_next/data/${buildId}${pathname}.json`;
+                        }
+                        return route;
+                    })
+                        .filter(Boolean)
+                : dataRoutes),
             ...(!isNextDataServerResolving
                 ? [
                     // ensure we 404 for non-existent _next/data routes before
@@ -886,6 +925,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             'x-nextjs-matched-path': '/$1',
                         },
                         continue: true,
+                        override: true,
                     },
                     // add a catch-all data route so we don't 404 when getting
                     // middleware effects

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.10",
+  "version": "3.1.13",
   "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": "5.0.6",
+    "@vercel/build-utils": "5.1.0",
     "@vercel/nft": "0.21.0",
     "@vercel/routing-utils": "2.0.0",
     "async-sema": "3.0.1",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "90c18959498cfa852bc56adffcdd16a8bbcbcce6"
+  "gitHead": "7db6436797d0b4131113f0b8dccc3b66bc9b1981"
 }