@vercel/next 3.1.2 → 3.1.3

package/dist/index.js

@@ -42553,6 +42553,13 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     const nextVersionRange = await getNextVersionRange(entryPath);
     const nodeVersion = await (0, build_utils_1.getNodeVersion)(entryPath, undefined, config, meta);
     const spawnOpts = (0, build_utils_1.getSpawnOptions)(meta, nodeVersion);
+    const { cliType, lockfileVersion } = await (0, build_utils_1.scanParentDirs)(entryPath);
+    spawnOpts.env = (0, build_utils_1.getEnvForPackageManager)({
+        cliType,
+        lockfileVersion,
+        nodeVersion,
+        env: spawnOpts.env || {},
+    });
     const nowJsonPath = await (0, find_up_1.default)(['now.json', 'vercel.json'], {
         cwd: entryPath,
     });
@@ -42600,25 +42607,8 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
     if (typeof installCommand === 'string') {
         if (installCommand.trim()) {
             console.log(`Running "install" command: \`${installCommand}\`...`);
-            const { cliType, lockfileVersion } = await (0, build_utils_1.scanParentDirs)(entryPath);
-            const env = {
-                YARN_NODE_LINKER: 'node-modules',
-                ...spawnOpts.env,
-            };
-            if (cliType === 'npm') {
-                if (typeof lockfileVersion === 'number' &&
-                    lockfileVersion >= 2 &&
-                    (nodeVersion?.major || 0) < 16) {
-                    // Ensure that npm 7 is at the beginning of the `$PATH`
-                    env.PATH = `/node16/bin-npm7${path_1.default.delimiter}${env.PATH}`;
-                    console.log('Detected `package-lock.json` generated by npm 7...');
-                }
-            }
             await (0, build_utils_1.execCommand)(installCommand, {
                 ...spawnOpts,
-                // Yarn v2 PnP mode may be activated, so force
-                // "node-modules" linker style
-                env,
                 cwd: entryPath,
             });
         }
@@ -43059,6 +43049,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
         await (0, fs_extra_1.remove)(path_1.default.join(entryPath, '.npmrc'));
     }
     const trailingSlashRedirects = [];
+    let trailingSlash = false;
     redirects = redirects.filter(_redir => {
         const redir = _redir;
         // detect the trailing slash redirect and make sure it's
@@ -43072,6 +43063,9 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             // moving underneath i18n routes
             redir.continue = true;
             trailingSlashRedirects.push(redir);
+            if (location === '/$1/') {
+                trailingSlash = true;
+            }
             return false;
         }
         return true;
@@ -43284,6 +43278,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
             return (0, server_build_1.serverBuild)({
                 config,
                 nextVersion,
+                trailingSlash,
                 dynamicPages,
                 canUsePreviewMode,
                 staticPages,
@@ -44637,7 +44632,7 @@ const pretty_bytes_1 = __importDefault(__webpack_require__(539));
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
 const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 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, }) {
+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 = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -45106,7 +45101,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // strip _next/data prefix for resolving
                 {
                     src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
-                    dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                    dest: `${path_1.default.join('/', entryDirectory, '/$1', trailingSlash ? '/' : '')}`,
                     ...(isOverride ? { override: true } : {}),
                     continue: true,
                     has: [
@@ -45119,14 +45114,14 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // normalize "/index" from "/_next/data/index.json" to -> just "/"
                 // as matches a rewrite sources will expect just "/"
                 {
-                    src: path_1.default.join('^/', entryDirectory, '/index'),
+                    src: path_1.default.join('^/', entryDirectory, '/index(?:/)?'),
                     has: [
                         {
                             type: 'header',
                             key: 'x-nextjs-data',
                         },
                     ],
-                    dest: path_1.default.join('/', entryDirectory),
+                    dest: path_1.default.join('/', entryDirectory, trailingSlash ? '/' : ''),
                     ...(isOverride ? { override: true } : {}),
                     continue: true,
                 },
@@ -45137,7 +45132,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         return isNextDataServerResolving
             ? [
                 {
-                    src: path_1.default.join('^/', entryDirectory, '$'),
+                    src: path_1.default.join('^/', entryDirectory, trailingSlash ? '/' : '', '$'),
                     has: [
                         {
                             type: 'header',
@@ -45148,7 +45143,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     continue: true,
                     ...(isOverride ? { override: true } : {}),
                 },
-                // handle non-trailing slash
                 {
                     src: path_1.default.join('^/', entryDirectory, '((?!_next/)(?:.*[^/]|.*))/?$'),
                     has: [

package/dist/server-build.js

@@ -19,7 +19,7 @@ const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
 const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 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, }) {
+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 = {};
     const lambdaPageKeys = Object.keys(lambdaPages);
@@ -488,7 +488,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // strip _next/data prefix for resolving
                 {
                     src: `^${path_1.default.join('/', entryDirectory, '/_next/data/', escapedBuildId, '/(.*).json')}`,
-                    dest: `${path_1.default.join('/', entryDirectory, '/$1')}`,
+                    dest: `${path_1.default.join('/', entryDirectory, '/$1', trailingSlash ? '/' : '')}`,
                     ...(isOverride ? { override: true } : {}),
                     continue: true,
                     has: [
@@ -501,14 +501,14 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 // normalize "/index" from "/_next/data/index.json" to -> just "/"
                 // as matches a rewrite sources will expect just "/"
                 {
-                    src: path_1.default.join('^/', entryDirectory, '/index'),
+                    src: path_1.default.join('^/', entryDirectory, '/index(?:/)?'),
                     has: [
                         {
                             type: 'header',
                             key: 'x-nextjs-data',
                         },
                     ],
-                    dest: path_1.default.join('/', entryDirectory),
+                    dest: path_1.default.join('/', entryDirectory, trailingSlash ? '/' : ''),
                     ...(isOverride ? { override: true } : {}),
                     continue: true,
                 },
@@ -519,7 +519,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         return isNextDataServerResolving
             ? [
                 {
-                    src: path_1.default.join('^/', entryDirectory, '$'),
+                    src: path_1.default.join('^/', entryDirectory, trailingSlash ? '/' : '', '$'),
                     has: [
                         {
                             type: 'header',
@@ -530,7 +530,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                     continue: true,
                     ...(isOverride ? { override: true } : {}),
                 },
-                // handle non-trailing slash
                 {
                     src: path_1.default.join('^/', entryDirectory, '((?!_next/)(?:.*[^/]|.*))/?$'),
                     has: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "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.2.1",
+    "@vercel/build-utils": "5.0.0",
     "@vercel/nft": "0.20.1",
     "@vercel/routing-utils": "1.13.5",
     "async-sema": "3.0.1",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "547e88228e180e883e5f07ab815a16960767bbf5"
+  "gitHead": "621b53bc49a1ac4aaf6ab986f9bbbdd517af01f5"
 }