@netlify/plugin-nextjs 4.37.4 → 4.38.0

package/lib/constants.js

@@ -3,15 +3,17 @@ 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;
+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.API_FUNCTION_TITLE = exports.ODB_FUNCTION_TITLE = exports.HANDLER_FUNCTION_TITLE = exports.NEXT_PLUGIN = exports.NEXT_PLUGIN_NAME = exports.IMAGE_FUNCTION_NAME = exports.API_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.API_FUNCTION_NAME = '___netlify-api-handler';
 exports.IMAGE_FUNCTION_NAME = '_ipx';
 exports.NEXT_PLUGIN_NAME = '@netlify/next-runtime';
 exports.NEXT_PLUGIN = '@netlify/plugin-nextjs';
 exports.HANDLER_FUNCTION_TITLE = 'Next.js SSR handler';
 exports.ODB_FUNCTION_TITLE = 'Next.js ISR handler';
+exports.API_FUNCTION_TITLE = 'Next.js API handler';
 exports.IMAGE_FUNCTION_TITLE = 'next/image handler';
 // These are paths in .next that shouldn't be publicly accessible
 exports.HIDDEN_PATHS = (0, destr_1.default)(process.env.NEXT_KEEP_METADATA_FILES)

package/lib/helpers/config.js

@@ -64,6 +64,11 @@ 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 */
+/**
+ * Transforms `/api/shows/[id].js` into `/api/shows/*id*.js`,
+ * so that the file `[id].js` is matched correctly.
+ */
+const escapeGlob = (path) => path.replace(/\[/g, '*').replace(/]/g, '*');
 const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [], apiLambdas, splitApiRoutes, }) => {
     var _a, _b, _c;
     const config = await (0, exports.getRequiredServerFiles)(publish);
@@ -100,7 +105,7 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
             (_b = netlifyConfig.functions)[functionName] || (_b[functionName] = { included_files: [] });
             netlifyConfig.functions[functionName].node_bundler = 'none';
             (_c = netlifyConfig.functions[functionName]).included_files || (_c.included_files = []);
-            netlifyConfig.functions[functionName].included_files.push(...includedFiles);
+            netlifyConfig.functions[functionName].included_files.push(...includedFiles.map(escapeGlob));
         }
     }
     else {

package/lib/helpers/dev.js

@@ -7,13 +7,10 @@ exports.onPreDev = void 0;
 const path_1 = require("path");
 const execa_1 = __importDefault(require("execa"));
 const edge_1 = require("./edge");
-const files_1 = require("./files");
 // The types haven't been updated yet
 const onPreDev = async ({ constants, netlifyConfig }) => {
     var _a;
     const base = (_a = netlifyConfig.build.base) !== null && _a !== void 0 ? _a : process.cwd();
-    // Need to patch the files, because build might not have been run
-    await (0, files_1.patchNextFiles)(base);
     await (0, edge_1.writeDevEdgeFunction)(constants);
     // Don't await this or it will never finish
     execa_1.default.node((0, path_1.resolve)(__dirname, '..', '..', 'lib', 'helpers', 'middlewareWatcher.js'), [base, process.env.NODE_ENV === 'test' ? '--once' : ''], {

package/lib/helpers/edge.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.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.generateRscDataEdgeManifest = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
+exports.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.generateRscDataEdgeManifest = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.sanitizeEdgePath = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const chalk_1 = require("chalk");
@@ -31,6 +31,11 @@ exports.loadPrerenderManifest = loadPrerenderManifest;
  * Convert the Next middleware name into a valid Edge Function name
  */
 const sanitizeName = (name) => `next_${name.replace(/\W/g, '_')}`;
+/**
+ * Convert the images path to strip the origin (until domain-level Edge functions are supported)
+ */
+const sanitizeEdgePath = (imagesPath) => new URL(imagesPath, process.env.URL || 'http://n').pathname;
+exports.sanitizeEdgePath = sanitizeEdgePath;
 // Slightly different spacing in different versions!
 const IMPORT_UNSUPPORTED = [
     `Object.defineProperty(globalThis,"__import_unsupported"`,
@@ -301,7 +306,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         manifest.functions.push({
             function: 'ipx',
             name: 'next/image handler',
-            path: nextConfig.images.path || '/_next/image',
+            path: nextConfig.images.path ? (0, exports.sanitizeEdgePath)(nextConfig.images.path) : '/_next/image',
             generator,
         });
         manifest.layers.push({

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.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;
+exports.removeMetadataFiles = exports.movePublicFiles = 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");
@@ -236,36 +236,6 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     }
 };
 exports.moveStaticPages = moveStaticPages;
-const PATCH_WARNING = `/* File patched by Netlify */`;
-/**
- * Attempt to patch a source file, preserving a backup
- */
-const patchFile = async ({ file, replacements, }) => {
-    if (!(0, fs_extra_1.existsSync)(file)) {
-        console.warn('File was not found');
-        return false;
-    }
-    let content = await (0, fs_extra_1.readFile)(file, 'utf8');
-    // If the file has already been patched, patch the backed-up original instead
-    if (content.includes(PATCH_WARNING) && (0, fs_extra_1.existsSync)(`${file}.orig`)) {
-        content = await (0, fs_extra_1.readFile)(`${file}.orig`, 'utf8');
-    }
-    const newContent = replacements.reduce((acc, [from, to]) => {
-        if (acc.includes(to)) {
-            console.log('Already patched. Skipping.');
-            return acc;
-        }
-        return acc.replace(from, to);
-    }, content);
-    if (newContent === content) {
-        console.warn('File was not changed');
-        return false;
-    }
-    await (0, fs_extra_1.writeFile)(`${file}.orig`, content);
-    await (0, fs_extra_1.writeFile)(file, `${newContent}\n${PATCH_WARNING}`);
-    console.log('Done');
-    return true;
-};
 /**
  * The file we need has moved around a bit over the past few versions,
  * so we iterate through the options until we find it
@@ -312,73 +282,6 @@ const getDependenciesOfFile = async (file) => {
     return dependencies.files.map((dep) => (0, pathe_1.resolve)((0, pathe_1.dirname)(file), dep));
 };
 exports.getDependenciesOfFile = getDependenciesOfFile;
-const baseServerReplacements = [
-    // force manual revalidate during cache fetches
-    [
-        `checkIsManualRevalidate(req, this.renderOpts.previewProps)`,
-        `checkIsManualRevalidate(process.env._REVALIDATE_SSG ? { headers: { 'x-prerender-revalidate': this.renderOpts.previewProps.previewModeId } } : req, this.renderOpts.previewProps)`,
-    ],
-    // In https://github.com/vercel/next.js/pull/47803 checkIsManualRevalidate was renamed to checkIsOnDemandRevalidate
-    [
-        `checkIsOnDemandRevalidate(req, this.renderOpts.previewProps)`,
-        `checkIsOnDemandRevalidate(process.env._REVALIDATE_SSG ? { headers: { 'x-prerender-revalidate': this.renderOpts.previewProps.previewModeId } } : req, this.renderOpts.previewProps)`,
-    ],
-    // ensure ISR 404 pages send the correct SWR cache headers
-    [`private: isPreviewMode || is404Page && cachedData`, `private: isPreviewMode && cachedData`],
-];
-const nextServerReplacements = [
-    [
-        `getMiddlewareManifest() {\n        if (this.minimalMode) return null;`,
-        `getMiddlewareManifest() {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return null;`,
-    ],
-    [
-        `generateCatchAllMiddlewareRoute(devReady) {\n        if (this.minimalMode) return []`,
-        `generateCatchAllMiddlewareRoute(devReady) {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return [];`,
-    ],
-    [
-        `generateCatchAllMiddlewareRoute() {\n        if (this.minimalMode) return undefined;`,
-        `generateCatchAllMiddlewareRoute() {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return undefined;`,
-    ],
-    [
-        `getMiddlewareManifest() {\n        if (this.minimalMode) {`,
-        `getMiddlewareManifest() {\n        if (!this.minimalMode && (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1')) {`,
-    ],
-];
-const patchNextFiles = async (root) => {
-    const baseServerFile = (0, exports.getServerFile)(root);
-    console.log(`Patching ${baseServerFile}`);
-    if (baseServerFile) {
-        await patchFile({
-            file: baseServerFile,
-            replacements: baseServerReplacements,
-        });
-    }
-    const nextServerFile = (0, exports.getServerFile)(root, false);
-    console.log(`Patching ${nextServerFile}`);
-    if (nextServerFile) {
-        await patchFile({
-            file: nextServerFile,
-            replacements: nextServerReplacements,
-        });
-    }
-};
-exports.patchNextFiles = patchNextFiles;
-const unpatchFile = async (file) => {
-    const origFile = `${file}.orig`;
-    if ((0, fs_extra_1.existsSync)(origFile)) {
-        await (0, fs_extra_1.move)(origFile, file, { overwrite: true });
-    }
-};
-exports.unpatchFile = unpatchFile;
-const unpatchNextFiles = async (root) => {
-    const baseServerFile = (0, exports.getServerFile)(root);
-    await (0, exports.unpatchFile)(baseServerFile);
-    const nextServerFile = (0, exports.getServerFile)(root, false);
-    if (nextServerFile !== baseServerFile) {
-        await (0, exports.unpatchFile)(nextServerFile);
-    }
-};
-exports.unpatchNextFiles = unpatchNextFiles;
 const movePublicFiles = async ({ appDir, outdir, publish, basePath, }) => {
     // `outdir` is a config property added when using Next.js with Nx. It's typically
     // a relative path outside of the appDir, e.g. '../../dist/apps/<app-name>', and

package/lib/helpers/functions.js

@@ -31,7 +31,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         ? (0, pathe_1.relative)(functionDir, nextServerModuleAbsoluteLocation)
         : undefined;
     for (const apiLambda of apiLambdas) {
-        const { functionName, routes, type, includedFiles } = apiLambda;
+        const { functionName, functionTitle, routes, type, includedFiles } = apiLambda;
         const apiHandlerSource = (0, getApiHandler_1.getApiHandler)({
             // most api lambdas serve multiple routes, but scheduled functions need to be in separate lambdas.
             // so routes[0] is safe to access.
@@ -46,6 +46,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         // copy handler dependencies (VercelNodeBridge, NetlifyNextServer, etc.)
         await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, functionName, 'bridge.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'server.js'), (0, pathe_1.join)(functionsDir, functionName, 'server.js'));
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'requireHooks.js'), (0, pathe_1.join)(functionsDir, functionName, 'requireHooks.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, functionName, 'handlerUtils.js'));
         const resolveSourceFile = (file) => (0, pathe_1.join)(publish, 'server', file);
         // TODO: this should be unneeded once we use the `none` bundler everywhere
@@ -60,6 +61,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
             ].map(resolveSourceFile),
         });
         await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, functionName, 'pages.js'), resolverSource);
+        await (0, functionsMetaData_1.writeFunctionConfiguration)({ functionName, functionTitle, functionsDir });
         const nfInternalFiles = await (0, tiny_glob_1.default)((0, pathe_1.join)(functionsDir, functionName, '**'));
         includedFiles.push(...nfInternalFiles);
     }
@@ -76,8 +78,9 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         // copy handler dependencies (VercelNodeBridge, NetlifyNextServer, etc.)
         await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, functionName, 'bridge.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'server.js'), (0, pathe_1.join)(functionsDir, functionName, 'server.js'));
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'requireHooks.js'), (0, pathe_1.join)(functionsDir, functionName, 'requireHooks.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, functionName, 'handlerUtils.js'));
-        (0, functionsMetaData_1.writeFunctionConfiguration)({ functionName, functionTitle, functionsDir });
+        await (0, functionsMetaData_1.writeFunctionConfiguration)({ functionName, functionTitle, functionsDir });
     };
     await writeHandler(constants_1.HANDLER_FUNCTION_NAME, constants_1.HANDLER_FUNCTION_TITLE, false);
     await writeHandler(constants_1.ODB_FUNCTION_NAME, constants_1.ODB_FUNCTION_TITLE, true);
@@ -221,20 +224,45 @@ const getBundleWeight = async (patterns) => {
     }));
     return sum(sizes.flat(1));
 };
-const MB = 1024 * 1024;
 const getAPILambdas = async (publish, baseDir, pageExtensions) => {
     const commonDependencies = await (0, exports.getAPIPRouteCommonDependencies)(publish);
-    const threshold = 50 * MB - (await getBundleWeight(commonDependencies));
+    const threshold = constants_1.LAMBDA_WARNING_SIZE - (await getBundleWeight(commonDependencies));
     const apiRoutes = await (0, exports.getApiRouteConfigs)(publish, baseDir, pageExtensions);
     const packFunctions = async (routes, type) => {
         const weighedRoutes = await Promise.all(routes.map(async (route) => ({ value: route, weight: await getBundleWeight(route.includedFiles) })));
         const bins = (0, pack_1.pack)(weighedRoutes, threshold);
-        return bins.map((bin, index) => ({
-            functionName: bin.length === 1 ? bin[0].functionName : `api-${index}`,
-            routes: bin,
-            includedFiles: [...commonDependencies, ...routes.flatMap((route) => route.includedFiles)],
-            type,
-        }));
+        return bins.map((bin) => {
+            if (bin.length === 1) {
+                const [func] = bin;
+                const { functionName, functionTitle, config, includedFiles } = func;
+                return {
+                    functionName,
+                    functionTitle,
+                    routes: [func],
+                    includedFiles: [...commonDependencies, ...includedFiles],
+                    type: config.type,
+                };
+            }
+            const includedFiles = [...commonDependencies, ...bin.flatMap((route) => route.includedFiles)];
+            const nonSingletonBins = bins.filter((b) => b.length > 1);
+            if (nonSingletonBins.length === 1) {
+                return {
+                    functionName: constants_1.API_FUNCTION_NAME,
+                    functionTitle: constants_1.API_FUNCTION_TITLE,
+                    includedFiles,
+                    routes: bin,
+                    type,
+                };
+            }
+            const indexInNonSingletonBins = nonSingletonBins.indexOf(bin);
+            return {
+                functionName: `${constants_1.API_FUNCTION_NAME}-${indexInNonSingletonBins + 1}`,
+                functionTitle: `${constants_1.API_FUNCTION_TITLE} ${indexInNonSingletonBins + 1}/${nonSingletonBins.length}`,
+                includedFiles,
+                routes: bin,
+                type,
+            };
+        });
     };
     const standardFunctions = apiRoutes.filter((route) => !(0, analysis_1.isEdgeConfig)(route.config.runtime) &&
         route.config.type !== "experimental-background" /* ApiRouteType.BACKGROUND */ &&
@@ -263,12 +291,14 @@ const getApiRouteConfigs = async (publish, appDir, pageExtensions) => {
         const filePath = (0, files_1.getSourceFileForPage)(apiRoute, [pagesDir, srcPagesDir], pageExtensions);
         const config = await (0, analysis_1.extractConfigFromFile)(filePath, appDir);
         const functionName = (0, utils_1.getFunctionNameForPage)(apiRoute, config.type === "experimental-background" /* ApiRouteType.BACKGROUND */);
+        const functionTitle = `${constants_1.API_FUNCTION_TITLE} ${apiRoute}`;
         const compiled = pages[apiRoute];
         const compiledPath = (0, pathe_1.join)(publish, 'server', compiled);
         const routeDependencies = await (0, files_1.getDependenciesOfFile)(compiledPath);
         const includedFiles = [compiledPath, ...routeDependencies];
         return {
             functionName,
+            functionTitle,
             route: apiRoute,
             config,
             compiled,
@@ -288,6 +318,7 @@ const getExtendedApiRouteConfigs = async (publish, appDir, pageExtensions) => {
 exports.getExtendedApiRouteConfigs = getExtendedApiRouteConfigs;
 const packSingleFunction = (func) => ({
     functionName: func.functionName,
+    functionTitle: func.functionTitle,
     includedFiles: func.includedFiles,
     routes: [func],
     type: func.config.type,

package/lib/index.js

@@ -51,6 +51,7 @@ const plugin = {
         });
         await (0, edge_1.cleanupEdgeFunctions)(constants);
         const middlewareManifest = await (0, edge_1.loadMiddlewareManifest)(netlifyConfig);
+        const config = await (0, config_1.getRequiredServerFiles)(publish);
         if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) &&
             Object.keys(middlewareManifest.functions).length !== 0 &&
             (0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
@@ -70,7 +71,6 @@ const plugin = {
         `));
         }
         if ((0, utils_1.isNextAuthInstalled)()) {
-            const config = await (0, config_1.getRequiredServerFiles)(publish);
             const userDefinedNextAuthUrl = config.config.env.NEXTAUTH_URL;
             if (userDefinedNextAuthUrl) {
                 console.log(`NextAuth package detected, NEXTAUTH_URL environment variable set by user in next.config.js to ${userDefinedNextAuthUrl}`);
@@ -105,7 +105,6 @@ const plugin = {
             splitApiRoutes: (0, flags_1.splitApiRoutes)(featureFlags, publish),
         });
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish, basePath });
-        await (0, files_1.patchNextFiles)(appDir);
         if (!(0, destr_1.default)(process.env.SERVE_STATIC_FILES_FROM_ORIGIN)) {
             await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n, basePath });
         }

package/lib/templates/getHandler.js

@@ -11,6 +11,7 @@ const path = require('path');
 const { URLSearchParams, URL } = require('url');
 const { Bridge } = require('@vercel/node-bridge/bridge');
 const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, } = require('./handlerUtils');
+const { overrideRequireHooks, applyRequireHooks } = require('./requireHooks');
 const { getNetlifyNextServer } = require('./server');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-lines-per-function
@@ -28,14 +29,14 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
         require.resolve('./pages.js');
     }
     catch { }
+    // Next 13.4 conditionally uses different React versions and we need to make sure we use the same one
+    overrideRequireHooks(conf);
     const NetlifyNextServer = getNetlifyNextServer(NextServer);
+    applyRequireHooks();
     const ONE_YEAR_IN_SECONDS = 31536000;
     (_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
     // We don't want to write ISR files to disk in the lambda environment
     conf.experimental.isrFlushToDisk = false;
-    // This is our flag that we use when patching the source
-    // eslint-disable-next-line no-underscore-dangle
-    process.env._REVALIDATE_SSG = 'true';
     for (const [key, value] of Object.entries(conf.env)) {
         process.env[key] = String(value);
     }
@@ -152,9 +153,9 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
   const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath } = require('./handlerUtils')
-  const { getNetlifyNextServer } = require('./server')
+  const { overrideRequireHooks, applyRequireHooks } = require("./requireHooks")
+  const { getNetlifyNextServer } = require("./server")
   const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default
-
   ${isODB ? `const { builder } = require("@netlify/functions")` : ''}
   const { config }  = require("${publishDir}/required-server-files.json")
   let staticManifest

package/lib/templates/handlerUtils.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.localizeDataRoute = exports.localizeRoute = exports.unlocalizeRoute = exports.normalizeRoute = exports.netlifyApiFetch = exports.normalizePath = exports.getPrefetchResponse = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
+exports.localizeDataRoute = exports.localizeRoute = exports.unlocalizeRoute = exports.joinPaths = exports.normalizeRoute = exports.netlifyApiFetch = exports.normalizePath = exports.getPrefetchResponse = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
@@ -203,6 +203,9 @@ exports.netlifyApiFetch = netlifyApiFetch;
 // Remove trailing slash from a route (except for the root route)
 const normalizeRoute = (route) => (route.endsWith('/') ? route.slice(0, -1) || '/' : route);
 exports.normalizeRoute = normalizeRoute;
+// Join multiple paths together, ensuring that there is only one slash between them
+const joinPaths = (...paths) => paths.reduce((a, b) => (a.endsWith('/') ? `${a}${b}` : `${a}/${b}`));
+exports.joinPaths = joinPaths;
 // Check if a route has a locale prefix (including the root route)
 const isLocalized = (route, i18n) => i18n.locales.some((locale) => route === `/${locale}` || route.startsWith(`/${locale}/`));
 // Remove the locale prefix from a route (if any)

package/lib/templates/requireHooks.js

@@ -0,0 +1,96 @@
+"use strict";
+/* eslint-disable n/no-extraneous-require, no-underscore-dangle, @typescript-eslint/no-explicit-any */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyRequireHooks = exports.overrideRequireHooks = void 0;
+// This is a modified version of the require hooks from Next.js
+// https://github.com/vercel/next.js/blob/b04c70573ac199a9bb3ea42201e0865e610d5b67/packages/next/src/server/require-hook.ts
+const module_1 = __importDefault(require("module"));
+const resolveFilename = module_1.default._resolveFilename;
+const requireHooks = new Map();
+const overrideRequireHooks = (config) => {
+    // we may have changed the working directory in the handler
+    const opts = {
+        paths: [process.cwd()],
+    };
+    requireHooks.set('default', new Map([
+        ['react', require.resolve(`react`, opts)],
+        ['react/jsx-runtime', require.resolve(`react/jsx-runtime`, opts)],
+    ]));
+    if (config.experimental.appDir) {
+        requireHooks.set('next', new Map([
+            ['react', require.resolve(`next/dist/compiled/react`, opts)],
+            ['react/jsx-runtime', require.resolve(`next/dist/compiled/react/jsx-runtime`, opts)],
+            ['react/jsx-dev-runtime', require.resolve(`next/dist/compiled/react/jsx-dev-runtime`, opts)],
+            ['react-dom', require.resolve(`next/dist/compiled/react-dom/server-rendering-stub`, opts)],
+            ['react-dom/client', require.resolve(`next/dist/compiled/react-dom/client`, opts)],
+            ['react-dom/server', require.resolve(`next/dist/compiled/react-dom/server`, opts)],
+            ['react-dom/server.browser', require.resolve(`next/dist/compiled/react-dom/server.browser`, opts)],
+            ['react-dom/server.edge', require.resolve(`next/dist/compiled/react-dom/server.edge`, opts)],
+            [
+                'react-server-dom-webpack/client',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack/client`, opts),
+            ],
+            [
+                'react-server-dom-webpack/client.edge',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack/client.edge`, opts),
+            ],
+            [
+                'react-server-dom-webpack/server.edge',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack/server.edge`, opts),
+            ],
+            [
+                'react-server-dom-webpack/server.node',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack/server.node`, opts),
+            ],
+            ['styled-jsx', require.resolve('styled-jsx', opts)],
+            ['styled-jsx/style', require.resolve('styled-jsx/style', opts)],
+        ]));
+    }
+    if (config.experimental.serverActions) {
+        requireHooks.set('experimental', new Map([
+            ['react', require.resolve(`next/dist/compiled/react-experimental`, opts)],
+            ['react/jsx-runtime', require.resolve(`next/dist/compiled/react-experimental/jsx-runtime`, opts)],
+            ['react/jsx-dev-runtime', require.resolve(`next/dist/compiled/react-experimental/jsx-dev-runtime`, opts)],
+            ['react-dom', require.resolve(`next/dist/compiled/react-dom-experimental/server-rendering-stub`, opts)],
+            ['react-dom/client', require.resolve(`next/dist/compiled/react-dom-experimental/client`, opts)],
+            ['react-dom/server', require.resolve(`next/dist/compiled/react-dom-experimental/server`, opts)],
+            ['react-dom/server.browser', require.resolve(`next/dist/compiled/react-dom-experimental/server.browser`, opts)],
+            ['react-dom/server.edge', require.resolve(`next/dist/compiled/react-dom-experimental/server.edge`, opts)],
+            [
+                'react-server-dom-webpack/client',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack-experimental/client`, opts),
+            ],
+            [
+                'react-server-dom-webpack/client.edge',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack-experimental/client.edge`, opts),
+            ],
+            [
+                'react-server-dom-webpack/server.edge',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack-experimental/server.edge`, opts),
+            ],
+            [
+                'react-server-dom-webpack/server.node',
+                require.resolve(`next/dist/compiled/react-server-dom-webpack-experimental/server.node`, opts),
+            ],
+            ['styled-jsx', require.resolve('styled-jsx', opts)],
+            ['styled-jsx/style', require.resolve('styled-jsx/style', opts)],
+        ]));
+    }
+};
+exports.overrideRequireHooks = overrideRequireHooks;
+const applyRequireHooks = () => {
+    // eslint-disable-next-line max-params, func-names
+    ;
+    module_1.default._resolveFilename = function (originalResolveFilename, hooks, request, parent, isMain, options) {
+        var _a, _b, _c;
+        const reactMode = (_a = process.env.__NEXT_PRIVATE_PREBUNDLED_REACT) !== null && _a !== void 0 ? _a : 'default';
+        const resolvedRequest = (_c = (_b = hooks.get(reactMode)) === null || _b === void 0 ? void 0 : _b.get(request)) !== null && _c !== void 0 ? _c : request;
+        return originalResolveFilename.call(module_1.default, resolvedRequest, parent, isMain, options);
+        // We use `bind` here to avoid referencing outside variables to create potential memory leaks.
+    }.bind(null, resolveFilename, requireHooks);
+};
+exports.applyRequireHooks = applyRequireHooks;
+/* eslint-enable n/no-extraneous-require, no-underscore-dangle, @typescript-eslint/no-explicit-any */

package/lib/templates/server.js

@@ -18,8 +18,12 @@ const getNetlifyNextServer = (NextServer) => {
         getRequestHandler() {
             const handler = super.getRequestHandler();
             return async (req, res, parsedUrl) => {
+                var _a;
                 // preserve the URL before Next.js mutates it for i18n
                 const { url, headers } = req;
+                // conditionally use the prebundled React module
+                this.netlifyPrebundleReact(url);
+                // intercept on-demand revalidation requests and handle with the Netlify API
                 if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
                     // handle on-demand revalidation by purging the ODB cache
                     await this.netlifyRevalidate(url);
@@ -27,12 +31,40 @@ const getNetlifyNextServer = (NextServer) => {
                     res.statusCode = 200;
                     res.setHeader('x-nextjs-cache', 'REVALIDATED');
                     res.send();
+                    return;
                 }
-                else {
-                    return handler(req, res, parsedUrl);
+                // force Next to revalidate all requests so that we always have fresh content
+                // for our ODBs and middleware is disabled at the origin
+                // but ignore in preview mode (prerender_bypass is set to true in preview mode)
+                // because otherwise revalidate will override preview mode
+                if (!((_a = headers.cookie) === null || _a === void 0 ? void 0 : _a.includes('__prerender_bypass'))) {
+                    // this header controls whether Next.js will revalidate the page
+                    // and needs to be set to the preview mode id to enable it
+                    headers['x-prerender-revalidate'] = this.renderOpts.previewProps.previewModeId;
                 }
+                return handler(req, res, parsedUrl);
             };
         }
+        // doing what they do in https://github.com/vercel/vercel/blob/1663db7ca34d3dd99b57994f801fb30b72fbd2f3/packages/next/src/server-build.ts#L576-L580
+        netlifyPrebundleReact(path) {
+            var _a;
+            const routesManifest = this.getRoutesManifest();
+            const appPathsManifest = this.getAppPathsManifest();
+            const routes = [...routesManifest.staticRoutes, ...routesManifest.dynamicRoutes];
+            const matchedRoute = routes.find((route) => new RegExp(route.regex).test(path));
+            const isAppRoute = appPathsManifest && matchedRoute ? appPathsManifest[(0, handlerUtils_1.joinPaths)(matchedRoute.page, 'page')] : false;
+            if (isAppRoute) {
+                // app routes should use prebundled React
+                // eslint-disable-next-line no-underscore-dangle
+                process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = ((_a = this.nextConfig.experimental) === null || _a === void 0 ? void 0 : _a.serverActions)
+                    ? 'experimental'
+                    : 'next';
+                return;
+            }
+            // pages routes should use use node_modules React
+            // eslint-disable-next-line no-underscore-dangle
+            process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = '';
+        }
         async netlifyRevalidate(route) {
             try {
                 // call netlify API to revalidate the path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.37.4",
+  "version": "4.38.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -37,12 +37,12 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.11.6",
+    "@netlify/build": "^29.12.7",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.3.0",
+    "next": "^13.4.1",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },