@netlify/plugin-nextjs 4.37.1 → 4.37.2

package/lib/constants.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DIVIDER = exports.LAMBDA_MAX_SIZE = exports.LAMBDA_WARNING_SIZE = exports.MINIMUM_REVALIDATE_SECONDS = exports.DYNAMIC_PARAMETER_REGEX = exports.OPTIONAL_CATCH_ALL_REGEX = exports.CATCH_ALL_REGEX = exports.DEFAULT_FUNCTIONS_SRC = exports.HANDLER_FUNCTION_PATH = exports.ODB_FUNCTION_PATH = exports.HIDDEN_PATHS = exports.IMAGE_FUNCTION_TITLE = exports.ODB_FUNCTION_TITLE = exports.HANDLER_FUNCTION_TITLE = exports.NEXT_PLUGIN = exports.NEXT_PLUGIN_NAME = exports.IMAGE_FUNCTION_NAME = exports.ODB_FUNCTION_NAME = exports.HANDLER_FUNCTION_NAME = void 0;
+const destr_1 = __importDefault(require("destr"));
 exports.HANDLER_FUNCTION_NAME = '___netlify-handler';
 exports.ODB_FUNCTION_NAME = '___netlify-odb-handler';
 exports.IMAGE_FUNCTION_NAME = '_ipx';
@@ -10,18 +14,29 @@ exports.HANDLER_FUNCTION_TITLE = 'Next.js SSR handler';
 exports.ODB_FUNCTION_TITLE = 'Next.js ISR handler';
 exports.IMAGE_FUNCTION_TITLE = 'next/image handler';
 // These are paths in .next that shouldn't be publicly accessible
-exports.HIDDEN_PATHS = [
-    '/cache/*',
-    '/server/*',
-    '/serverless/*',
-    '/trace',
-    '/traces',
-    '/routes-manifest.json',
-    '/build-manifest.json',
-    '/prerender-manifest.json',
-    '/react-loadable-manifest.json',
-    '/BUILD_ID',
-];
+exports.HIDDEN_PATHS = (0, destr_1.default)(process.env.NEXT_KEEP_METADATA_FILES)
+    ? []
+    : [
+        '/cache',
+        '/server',
+        '/serverless',
+        '/trace',
+        '/traces',
+        '/routes-manifest.json',
+        '/build-manifest.json',
+        '/prerender-manifest.json',
+        '/react-loadable-manifest.json',
+        '/BUILD_ID',
+        '/app-build-manifest.json',
+        '/app-path-routes-manifest.json',
+        '/export-marker.json',
+        '/images-manifest.json',
+        '/next-server.js.nft.json',
+        '/package.json',
+        '/prerender-manifest.js',
+        '/required-server-files.json',
+        '/static-manifest.json',
+    ];
 exports.ODB_FUNCTION_PATH = `/.netlify/builders/${exports.ODB_FUNCTION_NAME}`;
 exports.HANDLER_FUNCTION_PATH = `/.netlify/functions/${exports.HANDLER_FUNCTION_NAME}`;
 exports.DEFAULT_FUNCTIONS_SRC = 'netlify/functions';

package/lib/helpers/config.js

@@ -9,7 +9,6 @@ const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
 const constants_1 = require("../constants");
-const flags_1 = require("./flags");
 const utils_1 = require("./utils");
 const ROUTES_MANIFEST_FILE = 'routes-manifest.json';
 const defaultFailBuild = (message, { error }) => {
@@ -65,7 +64,7 @@ const hasManuallyAddedModule = ({ netlifyConfig, moduleName, }) =>
 Object.values(netlifyConfig.functions).some(({ included_files = [] }) => included_files.some((inc) => inc.includes(`node_modules/${moduleName}`)));
 exports.hasManuallyAddedModule = hasManuallyAddedModule;
 /* eslint-enable camelcase */
-const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [], apiLambdas, featureFlags, }) => {
+const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [], apiLambdas, splitApiRoutes, }) => {
     var _a, _b, _c;
     const config = await (0, exports.getRequiredServerFiles)(publish);
     const files = config.files || [];
@@ -95,7 +94,7 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
     };
     configureFunction(constants_1.HANDLER_FUNCTION_NAME);
     configureFunction(constants_1.ODB_FUNCTION_NAME);
-    if ((0, flags_1.splitApiRoutes)(featureFlags)) {
+    if (splitApiRoutes) {
         for (const apiLambda of apiLambdas) {
             const { functionName, includedFiles } = apiLambda;
             (_b = netlifyConfig.functions)[functionName] || (_b[functionName] = { included_files: [] });

package/lib/helpers/files.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.movePublicFiles = exports.unpatchNextFiles = exports.unpatchFile = exports.patchNextFiles = exports.getDependenciesOfFile = exports.getSourceFileForPage = exports.getServerFile = exports.moveStaticPages = exports.getMiddleware = exports.matchesRewrite = exports.matchesRedirect = exports.matchMiddleware = exports.stripLocale = exports.isDynamicRoute = void 0;
+exports.removeMetadataFiles = exports.movePublicFiles = exports.unpatchNextFiles = exports.unpatchFile = exports.patchNextFiles = exports.getDependenciesOfFile = exports.getSourceFileForPage = exports.getServerFile = exports.moveStaticPages = exports.getMiddleware = exports.matchesRewrite = exports.matchesRedirect = exports.matchMiddleware = exports.stripLocale = exports.isDynamicRoute = void 0;
 const os_1 = require("os");
 const chalk_1 = require("chalk");
 const fs_extra_1 = require("fs-extra");
@@ -112,8 +112,8 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
             console.warn('Error moving file', source, error);
         }
     };
-    // Move all static files, except error documents and nft manifests
-    const pages = await (0, globby_1.default)(['{app,pages}/**/*.{html,json,rsc}', '!**/(500|404|*.js.nft).{html,json}'], {
+    // Move all static files, except nft manifests
+    const pages = await (0, globby_1.default)(['{app,pages}/**/*.{html,json,rsc}', '!**/*.js.nft.{html,json}'], {
         cwd: outputDir,
         dot: true,
     });
@@ -392,3 +392,13 @@ const movePublicFiles = async ({ appDir, outdir, publish, basePath, }) => {
     }
 };
 exports.movePublicFiles = movePublicFiles;
+const removeMetadataFiles = async (publish) => {
+    // Limit concurrent deletions to number of cpus or 2 if there is only 1
+    const limit = (0, p_limit_1.default)(Math.max(2, (0, os_1.cpus)().length));
+    const removePromises = constants_1.HIDDEN_PATHS.map((HIDDEN_PATH) => {
+        const pathToDelete = (0, pathe_1.join)(publish, HIDDEN_PATH);
+        return limit(() => (0, fs_extra_1.remove)(pathToDelete));
+    });
+    await Promise.all(removePromises);
+};
+exports.removeMetadataFiles = removeMetadataFiles;

package/lib/helpers/flags.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitApiRoutes = void 0;
 const destr_1 = __importDefault(require("destr"));
+const fs_extra_1 = require("fs-extra");
+const pathe_1 = require("pathe");
 /**
  * If this flag is enabled, we generate individual Lambda functions for API Routes.
  * They're packed together in 50mb chunks to avoid hitting the Lambda size limit.
@@ -16,7 +18,17 @@ const destr_1 = __importDefault(require("destr"));
  * If disabled, we bundle all API Routes into a single function.
  * This is can lead to large bundle sizes.
  *
+ * Relies on `next-server.js.nft.json`, which is only supported in Next.js 12+.
+ *
  * Disabled by default. Can be overriden using the NEXT_SPLIT_API_ROUTES env var.
  */
-const splitApiRoutes = (featureFlags) => { var _a, _b; return (_b = (_a = (0, destr_1.default)(process.env.NEXT_SPLIT_API_ROUTES)) !== null && _a !== void 0 ? _a : featureFlags.next_split_api_routes) !== null && _b !== void 0 ? _b : false; };
+const splitApiRoutes = (featureFlags, publish) => {
+    var _a, _b;
+    const isEnabled = (_b = (_a = (0, destr_1.default)(process.env.NEXT_SPLIT_API_ROUTES)) !== null && _a !== void 0 ? _a : featureFlags.next_split_api_routes) !== null && _b !== void 0 ? _b : false;
+    if (isEnabled && !(0, fs_extra_1.existsSync)((0, pathe_1.join)(publish, 'next-server.js.nft.json'))) {
+        console.warn('Trace-based bundling not possible on this version of Next.js. Speed up your builds significantly by upgrading to Next.js v12 or newer.');
+        return false;
+    }
+    return isEnabled;
+};
 exports.splitApiRoutes = splitApiRoutes;

package/lib/helpers/functions.js

@@ -179,7 +179,7 @@ const traceNextServer = async (publish) => {
 };
 const traceNPMPackage = async (packageName, publish) => {
     try {
-        return await (0, tiny_glob_1.default)((0, pathe_1.join)((0, pathe_1.dirname)(require.resolve(packageName, { paths: [publish] })), '**', '*'), {
+        return await (0, tiny_glob_1.default)((0, pathe_1.join)((0, pathe_1.dirname)(require.resolve(packageName, { paths: [__dirname, publish] })), '**', '*'), {
             absolute: true,
         });
     }

package/lib/helpers/redirects.js

@@ -14,12 +14,6 @@ const edge_1 = require("./edge");
 const files_1 = require("./files");
 const utils_1 = require("./utils");
 const matchesMiddleware = (middleware, route) => middleware.some((middlewarePath) => route.startsWith(middlewarePath));
-const generateHiddenPathRedirects = ({ basePath }) => constants_1.HIDDEN_PATHS.map((path) => ({
-    from: `${basePath}${path}`,
-    to: '/404.html',
-    status: 404,
-    force: true,
-}));
 const generateLocaleRedirects = ({ i18n, basePath, trailingSlash, }) => {
     const redirects = [];
     // If the cookie is set, we need to redirect at the origin
@@ -187,7 +181,6 @@ exports.generateDynamicRewrites = generateDynamicRewrites;
 const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, buildId, apiLambdas, }) => {
     const { dynamicRoutes: prerenderedDynamicRoutes, routes: prerenderedStaticRoutes } = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(netlifyConfig.build.publish, 'prerender-manifest.json'));
     const { dynamicRoutes, staticRoutes } = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(netlifyConfig.build.publish, 'routes-manifest.json'));
-    netlifyConfig.redirects.push(...generateHiddenPathRedirects({ basePath }));
     if (i18n && i18n.localeDetection !== false) {
         netlifyConfig.redirects.push(...generateLocaleRedirects({ i18n, basePath, trailingSlash }));
     }

package/lib/helpers/utils.js

@@ -93,7 +93,7 @@ const redirectsForNextRoute = ({ route, buildId, basePath, to, i18n, status = 20
 exports.redirectsForNextRoute = redirectsForNextRoute;
 const redirectsForNext404Route = ({ route, buildId, basePath, i18n, force = false, }) => netlifyRoutesForNextRoute({ route, buildId, i18n }).map(({ redirect, locale }) => ({
     from: `${basePath}${redirect}`,
-    to: locale ? `${basePath}/server/pages/${locale}/404.html` : `${basePath}/server/pages/404.html`,
+    to: locale ? `${basePath}/${locale}/404.html` : `${basePath}/404.html`,
     status: 404,
     force,
 }));

package/lib/index.js

@@ -92,7 +92,7 @@ const plugin = {
             }
         }
         const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
-        const apiLambdas = (0, flags_1.splitApiRoutes)(featureFlags)
+        const apiLambdas = (0, flags_1.splitApiRoutes)(featureFlags, publish)
             ? await (0, functions_1.getAPILambdas)(publish, appDir, pageExtensions)
             : await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir, pageExtensions).then((extendedRoutes) => extendedRoutes.map(functions_1.packSingleFunction));
         await (0, functions_1.generateFunctions)(constants, appDir, apiLambdas);
@@ -102,7 +102,7 @@ const plugin = {
             ignore,
             publish: (0, path_1.relative)(process.cwd(), publish),
             apiLambdas,
-            featureFlags,
+            splitApiRoutes: (0, flags_1.splitApiRoutes)(featureFlags, publish),
         });
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish, basePath });
         await (0, files_1.patchNextFiles)(appDir);
@@ -148,6 +148,10 @@ const plugin = {
         (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
         (0, verification_1.warnForRootRedirects)({ appDir });
         await (0, functions_1.warnOnApiRoutes)({ FUNCTIONS_DIST });
+        // we are removing metadata files from Publish directory
+        // we have to do this after functions were bundled as bundling still
+        // require those files, but we don't want to publish them
+        await (0, files_1.removeMetadataFiles)(publish);
         if (experimental === null || experimental === void 0 ? void 0 : experimental.appDir) {
             console.log('🧪 Thank you for testing "appDir" support on Netlify. For known issues and to give feedback, visit https://ntl.fyi/next-13-feedback');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.37.1",
+  "version": "4.37.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [

package/src/templates/edge-shared/utils.ts

@@ -58,6 +58,8 @@ export const addMiddlewareHeaders = async (
 }
 
 interface ResponseCookies {
+  // This is non-standard that Next.js adds.
+  // See github.com/vercel/next.js/blob/de08f8b3d31ef45131dad97a7d0e95fa01001167/packages/next/src/compiled/@edge-runtime/cookies/index.js#L158
   readonly _headers: Headers
 }
 
@@ -191,7 +193,8 @@ export const buildResponse = async ({
     }
 
     // NextResponse doesn't set cookies onto the originResponse, so we need to copy them over
-    if (response.cookies._headers.has('set-cookie')) {
+    // In some cases, it's possible there are no headers set. See https://github.com/netlify/pod-ecosystem-frameworks/issues/475
+    if (response.cookies._headers?.has('set-cookie')) {
       response.originResponse.headers.set('set-cookie', response.cookies._headers.get('set-cookie')!)
     }