@netlify/plugin-nextjs 4.34.0 → 4.35.1-next-server-fix.0

package/lib/helpers/analysis.js

@@ -23,16 +23,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractConfigFromFile = exports.validateConfigValue = void 0;
+exports.extractConfigFromFile = exports.validateConfigValue = exports.isEdgeConfig = void 0;
 const fs_1 = __importStar(require("fs"));
 const pathe_1 = require("pathe");
+const isEdgeConfig = (config) => ['experimental-edge', 'edge'].includes(config);
+exports.isEdgeConfig = isEdgeConfig;
 const validateConfigValue = (config, apiFilePath) => {
     if (config.type === "experimental-scheduled" /* ApiRouteType.SCHEDULED */) {
         if (!config.schedule) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: schedule is required when type is "${"experimental-scheduled" /* ApiRouteType.SCHEDULED */}"`);
             return false;
         }
-        if (config.runtime === 'experimental-edge') {
+        if ((0, exports.isEdgeConfig)(config.runtime)) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: edge runtime is not supported for scheduled functions`);
             return false;
         }
@@ -43,7 +45,7 @@ const validateConfigValue = (config, apiFilePath) => {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: schedule is not allowed unless type is "${"experimental-scheduled" /* ApiRouteType.SCHEDULED */}"`);
             return false;
         }
-        if (config.type && config.runtime === 'experimental-edge') {
+        if (config.type && (0, exports.isEdgeConfig)(config.runtime)) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: edge runtime is not supported for background functions`);
             return false;
         }

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.writeRscDataEdgeFunction = 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.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const chalk_1 = require("chalk");
@@ -12,6 +12,7 @@ const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
 const constants_1 = require("../constants");
 const config_1 = require("./config");
+const functionsMetaData_1 = require("./functionsMetaData");
 const matchers_1 = require("./matchers");
 const maybeLoadJson = (path) => {
     if ((0, fs_1.existsSync)(path)) {
@@ -101,19 +102,21 @@ const generateEdgeFunctionMiddlewareMatchers = ({ edgeFunctionDefinition, nextCo
     }
     return edgeFunctionDefinition.matchers;
 };
-const middlewareMatcherToEdgeFunctionDefinition = (matcher, name, cache) => {
+const middlewareMatcherToEdgeFunctionDefinition = (matcher, name, generator, cache) => {
     const pattern = (0, matchers_1.transformCaptureGroups)((0, matchers_1.stripLookahead)(matcher.regexp));
-    return { function: name, pattern, name, cache };
+    return { function: name, pattern, name, cache, generator };
 };
 const cleanupEdgeFunctions = ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => (0, fs_extra_1.emptyDir)(INTERNAL_EDGE_FUNCTIONS_SRC);
 exports.cleanupEdgeFunctions = cleanupEdgeFunctions;
 const writeDevEdgeFunction = async ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => {
+    const generator = await (0, functionsMetaData_1.getPluginVersion)();
     const manifest = {
         functions: [
             {
                 function: 'next-dev',
                 name: 'netlify dev handler',
                 path: '/*',
+                generator,
             },
         ],
         version: 1,
@@ -130,19 +133,20 @@ exports.writeDevEdgeFunction = writeDevEdgeFunction;
 /**
  * Writes an edge function that routes RSC data requests to the `.rsc` route
  */
-const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManifest, }) => {
+const generateRscDataEdgeManifest = async ({ prerenderManifest, appPathRoutesManifest, }) => {
+    const generator = await (0, functionsMetaData_1.getPluginVersion)();
     if (!prerenderManifest || !appPathRoutesManifest) {
         return [];
     }
     const staticAppdirRoutes = [];
     for (const [path, route] of Object.entries(prerenderManifest.routes)) {
-        if ((0, exports.isAppDirRoute)(route.srcRoute, appPathRoutesManifest)) {
+        if ((0, exports.isAppDirRoute)(route.srcRoute, appPathRoutesManifest) && route.dataRoute) {
             staticAppdirRoutes.push(path, route.dataRoute);
         }
     }
     const dynamicAppDirRoutes = [];
     for (const [path, route] of Object.entries(prerenderManifest.dynamicRoutes)) {
-        if ((0, exports.isAppDirRoute)(path, appPathRoutesManifest)) {
+        if ((0, exports.isAppDirRoute)(path, appPathRoutesManifest) && route.dataRouteRegex) {
             dynamicAppDirRoutes.push(route.routeRegex, route.dataRouteRegex);
         }
     }
@@ -157,15 +161,17 @@ const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManife
             function: 'rsc-data',
             name: 'RSC data routing',
             path,
+            generator,
         })),
         ...dynamicAppDirRoutes.map((pattern) => ({
             function: 'rsc-data',
             name: 'RSC data routing',
             pattern,
+            generator,
         })),
     ];
 };
-exports.writeRscDataEdgeFunction = writeRscDataEdgeFunction;
+exports.generateRscDataEdgeManifest = generateRscDataEdgeManifest;
 const getEdgeFunctionPatternForPage = ({ edgeFunctionDefinition, pageRegexMap, appPathRoutesManifest, }) => {
     // We don't just use the matcher from the edge function definition, because it doesn't handle trailing slashes
     var _a, _b;
@@ -187,6 +193,7 @@ exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
 // eslint-disable-next-line max-lines-per-function
 const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
     var _a;
+    const generator = await (0, functionsMetaData_1.getPluginVersion)();
     const manifest = {
         functions: [],
         layers: [],
@@ -206,7 +213,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         console.log('Environment variable NEXT_DISABLE_NETLIFY_EDGE has been set, skipping Netlify Edge Function creation.');
         return;
     }
-    const rscFunctions = await (0, exports.writeRscDataEdgeFunction)({
+    const rscFunctions = await (0, exports.generateRscDataEdgeManifest)({
         prerenderManifest: await (0, exports.loadPrerenderManifest)(netlifyConfig),
         appPathRoutesManifest: await (0, exports.loadAppPathRoutesManifest)(netlifyConfig),
     });
@@ -234,7 +241,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
             matchers,
             middleware: true,
         });
-        manifest.functions.push(...matchers.map((matcher) => middlewareMatcherToEdgeFunctionDefinition(matcher, functionName)));
+        manifest.functions.push(...matchers.map((matcher) => middlewareMatcherToEdgeFunctionDefinition(matcher, functionName, generator)));
     }
     // Functions (i.e. not middleware, but edge SSR and API routes)
     if (typeof middlewareManifest.functions === 'object') {
@@ -267,6 +274,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
                 pattern,
                 // cache: "manual" is currently experimental, so we restrict it to sites that use experimental appDir
                 cache: usesAppDir ? 'manual' : undefined,
+                generator,
             });
             // pages-dir page routes also have a data route. If there's a match, add an entry mapping that to the function too
             const dataRoute = dataRoutesMap.get(edgeFunctionDefinition.page);
@@ -276,6 +284,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
                     name: edgeFunctionDefinition.name,
                     pattern: dataRoute,
                     cache: usesAppDir ? 'manual' : undefined,
+                    generator,
                 });
             }
         }
@@ -293,6 +302,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
             function: 'ipx',
             name: 'next/image handler',
             path: nextConfig.images.path || '/_next/image',
+            generator,
         });
         manifest.layers.push({
             name: 'https://ipx-edge-function-layer.netlify.app/mod.ts',

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.moveStaticPages = exports.getMiddleware = exports.matchesRewrite = exports.matchesRedirect = exports.matchMiddleware = exports.stripLocale = exports.isDynamicRoute = void 0;
+exports.movePublicFiles = exports.unpatchNextFiles = exports.unpatchFile = exports.patchNextFiles = exports.getDependenciesOfFile = exports.getSourceFileForPage = exports.getNextServerModulePath = 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");
@@ -278,6 +278,54 @@ const getServerFile = (root, includeBase = true) => {
     }
     return (0, utils_1.findModuleFromBase)({ candidates, paths: [root] });
 };
+/**
+ * Try to find next-server module in few locations (to support different next versions) and in few context (try to resolve from app location and from this module)
+ */
+const getNextServerModulePath = (root) => {
+    // first let's try to use app location directory to find next-server
+    try {
+        const nextServerModuleLocation = getServerFile(root, false);
+        if (nextServerModuleLocation) {
+            return nextServerModuleLocation;
+        }
+    }
+    catch (error) {
+        if (!error.message.includes('Cannot find module')) {
+            // A different error, so rethrow it
+            throw error;
+        }
+    }
+    // if we didn't find it, let's try to resolve "next" package from this module
+    try {
+        // next >= 11.0.1. Yay breaking changes in patch releases!
+        const nextServerModuleLocation = require.resolve('next/dist/server/next-server');
+        if (nextServerModuleLocation) {
+            return nextServerModuleLocation;
+        }
+    }
+    catch (error) {
+        if (!error.message.includes("Cannot find module 'next/dist/server/next-server'")) {
+            // A different error, so rethrow it
+            throw error;
+        }
+        // Probably an old version of next, so fall through and find it elsewhere.
+    }
+    try {
+        // next < 11.0.1
+        // eslint-disable-next-line n/no-missing-require
+        const nextServerModuleLocation = require.resolve('next/dist/next-server/server/next-server');
+        if (nextServerModuleLocation) {
+            return nextServerModuleLocation;
+        }
+    }
+    catch (error) {
+        if (!error.message.includes("Cannot find module 'next/dist/next-server/server/next-server'")) {
+            throw error;
+        }
+    }
+    return null;
+};
+exports.getNextServerModulePath = getNextServerModulePath;
 /**
  * Find the source file for a given page route
  */

package/lib/helpers/functions.js

@@ -23,9 +23,13 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
     const functionsDir = (0, pathe_1.resolve)(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC);
     const functionDir = (0, pathe_1.join)(functionsDir, constants_1.HANDLER_FUNCTION_NAME);
     const publishDir = (0, pathe_1.relative)(functionDir, publish);
+    const nextServerModuleAbsoluteLocation = (0, files_1.getNextServerModulePath)(appDir);
+    const nextServerModuleRelativeLocation = nextServerModuleAbsoluteLocation
+        ? (0, pathe_1.relative)(functionDir, nextServerModuleAbsoluteLocation)
+        : undefined;
     for (const { route, config, compiled } of apiRoutes) {
         // Don't write a lambda if the runtime is edge
-        if (config.runtime === 'experimental-edge') {
+        if ((0, analysis_1.isEdgeConfig)(config.runtime)) {
             continue;
         }
         const apiHandlerSource = await (0, getApiHandler_1.getApiHandler)({
@@ -33,6 +37,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
             config,
             publishDir,
             appDir: (0, pathe_1.relative)(functionDir, appDir),
+            nextServerModuleRelativeLocation,
         });
         const functionName = (0, utils_1.getFunctionNameForPage)(route, config.type === "experimental-background" /* ApiRouteType.BACKGROUND */);
         await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(functionsDir, functionName));
@@ -51,7 +56,12 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, functionName, 'pages.js'), resolverSource);
     }
     const writeHandler = async (functionName, functionTitle, isODB) => {
-        const handlerSource = await (0, getHandler_1.getHandler)({ isODB, publishDir, appDir: (0, pathe_1.relative)(functionDir, appDir) });
+        const handlerSource = await (0, getHandler_1.getHandler)({
+            isODB,
+            publishDir,
+            appDir: (0, pathe_1.relative)(functionDir, appDir),
+            nextServerModuleRelativeLocation,
+        });
         await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(functionsDir, functionName));
         // write main handler file (standard or ODB)
         await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, functionName, `${functionName}.js`), handlerSource);

package/lib/helpers/functionsMetaData.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFunctionConfiguration = void 0;
+exports.writeFunctionConfiguration = exports.getPluginVersion = void 0;
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -12,6 +12,17 @@ const getNextRuntimeVersion = async (packageJsonPath, useNodeModulesPath) => {
     const packagePlugin = await (0, fs_extra_1.readJSON)(packageJsonPath);
     return useNodeModulesPath ? packagePlugin.version : packagePlugin.dependencies[constants_1.NEXT_PLUGIN];
 };
+const PLUGIN_PACKAGE_PATH = '.netlify/plugins/package.json';
+const nextPluginVersion = async () => {
+    const moduleRoot = (0, config_1.resolveModuleRoot)(constants_1.NEXT_PLUGIN);
+    const nodeModulesPath = moduleRoot ? (0, pathe_1.join)(moduleRoot, 'package.json') : null;
+    return ((await getNextRuntimeVersion(nodeModulesPath, true)) ||
+        (await getNextRuntimeVersion(PLUGIN_PACKAGE_PATH, false)) ||
+        // The runtime version should always be available, but if it's not, return 'unknown'
+        'unknown');
+};
+const getPluginVersion = async () => `${constants_1.NEXT_PLUGIN_NAME}@${await nextPluginVersion()}`;
+exports.getPluginVersion = getPluginVersion;
 /**
  * Creates a function configuration file for the given function.
  *
@@ -19,17 +30,11 @@ const getNextRuntimeVersion = async (packageJsonPath, useNodeModulesPath) => {
  */
 const writeFunctionConfiguration = async (functionInfo) => {
     const { functionName, functionTitle, functionsDir } = functionInfo;
-    const pluginPackagePath = '.netlify/plugins/package.json';
-    const moduleRoot = (0, config_1.resolveModuleRoot)(constants_1.NEXT_PLUGIN);
-    const nodeModulesPath = moduleRoot ? (0, pathe_1.join)(moduleRoot, 'package.json') : null;
-    const nextPluginVersion = (await getNextRuntimeVersion(nodeModulesPath, true)) ||
-        (await getNextRuntimeVersion(pluginPackagePath, false)) ||
-        // The runtime version should always be available, but if it's not, return 'unknown'
-        'unknown';
+    const generator = await (0, exports.getPluginVersion)();
     const metadata = {
         config: {
             name: functionTitle,
-            generator: `${constants_1.NEXT_PLUGIN_NAME}@${nextPluginVersion}`,
+            generator,
         },
         version: 1,
     };

package/lib/templates/getApiHandler.js

@@ -9,9 +9,10 @@ const path = require('path');
 // eslint-disable-next-line n/prefer-global/url, n/prefer-global/url-search-params
 const { URLSearchParams, URL } = require('url');
 const { Bridge } = require('@vercel/node-bridge/bridge');
-const { getMultiValueHeaders, getNextServer } = require('./handlerUtils');
+const { getMultiValueHeaders } = require('./handlerUtils');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
-const makeHandler = (conf, app, pageRoot, page) => {
+// eslint-disable-next-line max-params
+const makeHandler = (conf, app, pageRoot, page, NextServer) => {
     var _a;
     // Change working directory into the site root, unless using Nx, which moves the
     // dist directory and handles this itself
@@ -46,7 +47,6 @@ const makeHandler = (conf, app, pageRoot, page) => {
         // Scheduled functions don't have a URL, but we need to give one so Next knows the route to serve
         const url = event.rawUrl ? new URL(event.rawUrl) : new URL(path, process.env.URL || 'http://n');
         const port = Number.parseInt(url.port) || 80;
-        const NextServer = getNextServer();
         const nextServer = new NextServer({
             conf,
             dir,
@@ -91,13 +91,18 @@ const makeHandler = (conf, app, pageRoot, page) => {
 /**
  * Handlers for API routes are simpler than page routes, but they each have a separate one
  */
-const getApiHandler = ({ page, config, publishDir = '../../../.next', appDir = '../../..', }) => 
+const getApiHandler = ({ page, config, publishDir = '../../../.next', appDir = '../../..', nextServerModuleRelativeLocation, }) => 
 // This is a string, but if you have the right editor plugin it should format as js
 (0, outdent_1.outdent /* javascript */) `
+  if (!${JSON.stringify(nextServerModuleRelativeLocation)}) {
+    throw new Error('Could not find Next.js server')
+  }
+
   const { Server } = require("http");
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
-  const { getMultiValueHeaders, getNextServer } = require('./handlerUtils')
+  const { getMultiValueHeaders } = require('./handlerUtils')
+  const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default
 
   ${config.type === "experimental-scheduled" /* ApiRouteType.SCHEDULED */ ? `const { schedule } = require("@netlify/functions")` : ''}
 
@@ -106,7 +111,7 @@ const getApiHandler = ({ page, config, publishDir = '../../../.next', appDir = '
   let staticManifest
   const path = require("path");
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
-  const handler = (${makeHandler.toString()})(config, "${appDir}", pageRoot, ${JSON.stringify(page)})
+  const handler = (${makeHandler.toString()})(config, "${appDir}", pageRoot, ${JSON.stringify(page)}, NextServer)
   exports.handler = ${config.type === "experimental-scheduled" /* ApiRouteType.SCHEDULED */ ? `schedule(${JSON.stringify(config.schedule)}, handler);` : 'handler'}
 `;
 exports.getApiHandler = getApiHandler;

package/lib/templates/getHandler.js

@@ -11,10 +11,10 @@ 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 { NetlifyNextServer } = require('./server');
+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-params, max-lines-per-function
-const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
+// eslint-disable-next-line max-lines-per-function
+const makeHandler = (conf, app, pageRoot, NextServer, staticManifest = [], mode = 'ssr') => {
     var _a;
     // Change working directory into the site root, unless using Nx, which moves the
     // dist directory and handles this itself
@@ -28,6 +28,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         require.resolve('./pages.js');
     }
     catch { }
+    const NetlifyNextServer = getNetlifyNextServer(NextServer);
     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
@@ -59,7 +60,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
             hostname: url.hostname,
             port,
         }, {
-            revalidateToken: customContext.odb_refresh_hooks,
+            revalidateToken: customContext === null || customContext === void 0 ? void 0 : customContext.odb_refresh_hooks,
         });
         const requestHandler = nextServer.getRequestHandler();
         const server = new Server(async (req, res) => {
@@ -137,15 +138,20 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         };
     };
 };
-const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }) => 
+const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..', nextServerModuleRelativeLocation, }) => 
 // This is a string, but if you have the right editor plugin it should format as js
 (0, outdent_1.outdent /* javascript */) `
+  if (!${JSON.stringify(nextServerModuleRelativeLocation)}) {
+    throw new Error('Could not find Next.js server')
+  }
+
   const { Server } = require("http");
   const { promises } = require("fs");
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
-  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, normalizePath } = require('./handlerUtils')
-  const { NetlifyNextServer } = require('./server')
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath } = require('./handlerUtils')
+  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")
@@ -156,7 +162,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   const path = require("path");
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   exports.handler = ${isODB
-    ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
-    : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}
+    ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, NextServer, staticManifest, 'odb'));`
+    : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, NextServer, staticManifest, 'ssr');`}
 `;
 exports.getHandler = getHandler;

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.getNextServer = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
+exports.localizeDataRoute = exports.localizeRoute = exports.unlocalizeRoute = 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"));
@@ -91,7 +91,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     // Grab the real fs.promises.readFile...
     const readfileOrig = promises.readFile;
     const statsOrig = promises.stat;
-    // ...then money-patch it to see if it's requesting a CDN file
+    // ...then monkey-patch it to see if it's requesting a CDN file
     promises.readFile = (async (file, options) => {
         const baseUrl = getBase();
         // We only care about page files
@@ -139,39 +139,6 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     });
 };
 exports.augmentFsModule = augmentFsModule;
-/**
- * Next.js has an annoying habit of needing deep imports, but then moving those in patch releases. This is our abstraction.
- */
-const getNextServer = () => {
-    let NextServer;
-    try {
-        // next >= 11.0.1. Yay breaking changes in patch releases!
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        NextServer = require('next/dist/server/next-server').default;
-    }
-    catch (error) {
-        if (!error.message.includes("Cannot find module 'next/dist/server/next-server'")) {
-            // A different error, so rethrow it
-            throw error;
-        }
-        // Probably an old version of next, so fall through and find it elsewhere.
-    }
-    if (!NextServer) {
-        try {
-            // next < 11.0.1
-            // eslint-disable-next-line n/no-missing-require, import/no-unresolved, @typescript-eslint/no-var-requires
-            NextServer = require('next/dist/next-server/server/next-server').default;
-        }
-        catch (error) {
-            if (!error.message.includes("Cannot find module 'next/dist/next-server/server/next-server'")) {
-                throw error;
-            }
-            throw new Error('Could not find Next.js server');
-        }
-    }
-    return NextServer;
-};
-exports.getNextServer = getNextServer;
 /**
  * Prefetch requests are used to check for middleware redirects, and shouldn't trigger SSR.
  */

package/lib/templates/server.js

@@ -1,81 +1,83 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetlifyNextServer = void 0;
+exports.getNetlifyNextServer = void 0;
 const handlerUtils_1 = require("./handlerUtils");
-const NextServer = (0, handlerUtils_1.getNextServer)();
-class NetlifyNextServer extends NextServer {
-    constructor(options, netlifyConfig) {
-        super(options);
-        this.netlifyConfig = netlifyConfig;
-        // copy the prerender manifest so it doesn't get mutated by Next.js
-        const manifest = this.getPrerenderManifest();
-        this.netlifyPrerenderManifest = {
-            ...manifest,
-            routes: { ...manifest.routes },
-            dynamicRoutes: { ...manifest.dynamicRoutes },
-        };
-    }
-    getRequestHandler() {
-        const handler = super.getRequestHandler();
-        return async (req, res, parsedUrl) => {
-            // preserve the URL before Next.js mutates it for i18n
-            const { url, headers } = req;
-            // handle the original res.revalidate() request
-            await handler(req, res, parsedUrl);
-            // handle on-demand revalidation by purging the ODB cache
-            if (res.statusCode === 200 && headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
-                await this.netlifyRevalidate(url);
-            }
-        };
-    }
-    async netlifyRevalidate(route) {
-        try {
-            // call netlify API to revalidate the path
-            const result = await (0, handlerUtils_1.netlifyApiFetch)({
-                endpoint: `sites/${process.env.SITE_ID}/refresh_on_demand_builders`,
-                payload: {
-                    paths: this.getNetlifyPathsForRoute(route),
-                    domain: this.hostname,
-                },
-                token: this.netlifyConfig.revalidateToken,
-                method: 'POST',
-            });
-            if (!result.ok) {
-                throw new Error(result.message);
-            }
+const getNetlifyNextServer = (NextServer) => {
+    class NetlifyNextServer extends NextServer {
+        constructor(options, netlifyConfig) {
+            super(options);
+            this.netlifyConfig = netlifyConfig;
+            // copy the prerender manifest so it doesn't get mutated by Next.js
+            const manifest = this.getPrerenderManifest();
+            this.netlifyPrerenderManifest = {
+                ...manifest,
+                routes: { ...manifest.routes },
+                dynamicRoutes: { ...manifest.dynamicRoutes },
+            };
         }
-        catch (error) {
-            console.log(`Error revalidating ${route}:`, error.message);
-            throw error;
+        getRequestHandler() {
+            const handler = super.getRequestHandler();
+            return async (req, res, parsedUrl) => {
+                // preserve the URL before Next.js mutates it for i18n
+                const { url, headers } = req;
+                // handle the original res.revalidate() request
+                await handler(req, res, parsedUrl);
+                // handle on-demand revalidation by purging the ODB cache
+                if (res.statusCode === 200 && headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
+                    await this.netlifyRevalidate(url);
+                }
+            };
         }
-    }
-    getNetlifyPathsForRoute(route) {
-        const { i18n } = this.nextConfig;
-        const { routes, dynamicRoutes } = this.netlifyPrerenderManifest;
-        // matches static routes
-        const normalizedRoute = (0, handlerUtils_1.normalizeRoute)(i18n ? (0, handlerUtils_1.localizeRoute)(route, i18n) : route);
-        if (normalizedRoute in routes) {
-            const { dataRoute } = routes[normalizedRoute];
-            const normalizedDataRoute = i18n ? (0, handlerUtils_1.localizeDataRoute)(dataRoute, normalizedRoute) : dataRoute;
-            return [route, normalizedDataRoute];
+        async netlifyRevalidate(route) {
+            try {
+                // call netlify API to revalidate the path
+                const result = await (0, handlerUtils_1.netlifyApiFetch)({
+                    endpoint: `sites/${process.env.SITE_ID}/refresh_on_demand_builders`,
+                    payload: {
+                        paths: this.getNetlifyPathsForRoute(route),
+                        domain: this.hostname,
+                    },
+                    token: this.netlifyConfig.revalidateToken,
+                    method: 'POST',
+                });
+                if (!result.ok) {
+                    throw new Error(result.message);
+                }
+            }
+            catch (error) {
+                console.log(`Error revalidating ${route}:`, error.message);
+                throw error;
+            }
         }
-        // matches dynamic routes
-        const unlocalizedRoute = i18n ? (0, handlerUtils_1.unlocalizeRoute)(normalizedRoute, i18n) : normalizedRoute;
-        for (const dynamicRoute in dynamicRoutes) {
-            const { dataRoute, routeRegex } = dynamicRoutes[dynamicRoute];
-            const matches = unlocalizedRoute.match(routeRegex);
-            if (matches && matches.length !== 0) {
-                // remove the first match, which is the full route
-                matches.shift();
-                // replace the dynamic segments with the actual values
-                const interpolatedDataRoute = dataRoute.replace(/\[(.*?)]/g, () => matches.shift());
-                const normalizedDataRoute = i18n
-                    ? (0, handlerUtils_1.localizeDataRoute)(interpolatedDataRoute, normalizedRoute)
-                    : interpolatedDataRoute;
+        getNetlifyPathsForRoute(route) {
+            const { i18n } = this.nextConfig;
+            const { routes, dynamicRoutes } = this.netlifyPrerenderManifest;
+            // matches static routes
+            const normalizedRoute = (0, handlerUtils_1.normalizeRoute)(i18n ? (0, handlerUtils_1.localizeRoute)(route, i18n) : route);
+            if (normalizedRoute in routes) {
+                const { dataRoute } = routes[normalizedRoute];
+                const normalizedDataRoute = i18n ? (0, handlerUtils_1.localizeDataRoute)(dataRoute, normalizedRoute) : dataRoute;
                 return [route, normalizedDataRoute];
             }
+            // matches dynamic routes
+            const unlocalizedRoute = i18n ? (0, handlerUtils_1.unlocalizeRoute)(normalizedRoute, i18n) : normalizedRoute;
+            for (const dynamicRoute in dynamicRoutes) {
+                const { dataRoute, routeRegex } = dynamicRoutes[dynamicRoute];
+                const matches = unlocalizedRoute.match(routeRegex);
+                if (matches && matches.length !== 0) {
+                    // remove the first match, which is the full route
+                    matches.shift();
+                    // replace the dynamic segments with the actual values
+                    const interpolatedDataRoute = dataRoute.replace(/\[(.*?)]/g, () => matches.shift());
+                    const normalizedDataRoute = i18n
+                        ? (0, handlerUtils_1.localizeDataRoute)(interpolatedDataRoute, normalizedRoute)
+                        : interpolatedDataRoute;
+                    return [route, normalizedDataRoute];
+                }
+            }
+            throw new Error(`not an ISR route`);
         }
-        throw new Error(`not an ISR route`);
     }
-}
-exports.NetlifyNextServer = NetlifyNextServer;
+    return NetlifyNextServer;
+};
+exports.getNetlifyNextServer = getNetlifyNextServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.34.0",
+  "version": "4.35.1-next-server-fix.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.9.0",
+    "@netlify/build": "^29.9.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

package/src/templates/edge-shared/rsc-data.ts

@@ -44,7 +44,7 @@ export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: Preren
   )
 
   const dynamicRouteMatcher = Object.values(dynamicRoutes)
-    .filter(({ dataRoute }) => dataRoute.endsWith('.rsc'))
+    .filter(({ dataRoute }) => dataRoute?.endsWith('.rsc'))
     .map(({ routeRegex }) => new RegExp(routeRegex))
 
   const matchesDynamicRscDataRoute = (pathname: string) => {