@vercel/next 3.1.13 → 3.1.16

package/dist/index.js

@@ -42724,14 +42724,13 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
         entryDirectory,
         outputDirectory,
     }, null, 2));
-    Object.keys(process.env)
-        .filter(key => key.startsWith('VERCEL_'))
-        .forEach(key => {
-        const newKey = `NEXT_PUBLIC_${key}`;
-        if (!(newKey in process.env)) {
-            process.env[newKey] = process.env[key];
-        }
+    const prefixedEnvs = (0, build_utils_1.getPrefixedEnvVars)({
+        envPrefix: 'NEXT_PUBLIC_',
+        envs: process.env,
     });
+    for (const [key, value] of Object.entries(prefixedEnvs)) {
+        process.env[key] = value;
+    }
     await (0, build_utils_1.download)(files, workPath, meta);
     if (config.rootDirectory) {
         // this must come after the download step since files outside
@@ -44826,7 +44825,6 @@ 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 = {};
@@ -44837,7 +44835,6 @@ 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({
@@ -45417,22 +45414,6 @@ 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'

package/dist/server-build.js

@@ -21,7 +21,6 @@ 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 = {};
@@ -32,7 +31,6 @@ 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({
@@ -612,22 +610,6 @@ 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'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.13",
+  "version": "3.1.16",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -11,8 +11,7 @@
     "test-unit": "yarn test test/build.test.ts  test/unit/",
     "test-next-local": "jest --env node --verbose --bail --forceExit --testTimeout=360000 test/integration/*.test.js test/integration/*.test.ts",
     "test-next-local:middleware": "jest --env node --verbose --bail --useStderr --testTimeout=360000 test/integration/middleware.test.ts",
-    "test-integration-once": "rm test/builder-info.json; jest --env node --verbose --runInBand --bail test/fixtures/**/*.test.js",
-    "prepublishOnly": "yarn build"
+    "test-integration-once": "rm test/builder-info.json; jest --env node --verbose --runInBand --bail test/fixtures/**/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -45,9 +44,9 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.1.0",
+    "@vercel/build-utils": "5.3.0",
     "@vercel/nft": "0.21.0",
-    "@vercel/routing-utils": "2.0.0",
+    "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -70,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "7db6436797d0b4131113f0b8dccc3b66bc9b1981"
+  "gitHead": "47e3381c6df661168e8be335cc58df03f3cf2414"
 }