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

package/README.md

@@ -1,4 +1,4 @@
-![Next.js Runtime](https://github.com/netlify/next-runtime/raw/main/next-on-netlify.png)
+![Next.js Runtime](https://github.com/netlify/next-runtime/raw/main/next-js-runtime.png)
 
 # `@netlify/plugin-nextjs`
 

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DIVIDER = exports.LAMBDA_MAX_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.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.HANDLER_FUNCTION_NAME = '___netlify-handler';
 exports.ODB_FUNCTION_NAME = '___netlify-odb-handler';
 exports.IMAGE_FUNCTION_NAME = '_ipx';
@@ -29,8 +29,10 @@ exports.CATCH_ALL_REGEX = /\/\[\.{3}(.*)](.json)?$/;
 exports.OPTIONAL_CATCH_ALL_REGEX = /\/\[{2}\.{3}(.*)]{2}(.json)?$/;
 exports.DYNAMIC_PARAMETER_REGEX = /\/\[(.*?)]/g;
 exports.MINIMUM_REVALIDATE_SECONDS = 60;
-// 50MB, which is the documented max, though the hard max seems to be higher
-exports.LAMBDA_MAX_SIZE = 1024 * 1024 * 50;
+// 50MB, which is the warning max
+exports.LAMBDA_WARNING_SIZE = 1024 * 1024 * 50;
+// 250MB, which is the hard max
+exports.LAMBDA_MAX_SIZE = 1024 * 1024 * 250;
 exports.DIVIDER = `
 ────────────────────────────────────────────────────────────────
 `;

package/lib/helpers/analysis.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractConfigFromFile = exports.validateConfigValue = exports.isEdgeConfig = void 0;
 const fs_1 = __importStar(require("fs"));
 const pathe_1 = require("pathe");
+const utils_1 = require("./utils");
 const isEdgeConfig = (config) => ['experimental-edge', 'edge'].includes(config);
 exports.isEdgeConfig = isEdgeConfig;
 const validateConfigValue = (config, apiFilePath) => {
@@ -61,29 +62,33 @@ let hasWarnedAboutNextVersion = false;
 /**
  * Uses Next's swc static analysis to extract the config values from a file.
  */
-const extractConfigFromFile = async (apiFilePath) => {
+const extractConfigFromFile = async (apiFilePath, appDir) => {
     if (!apiFilePath || !(0, fs_1.existsSync)(apiFilePath)) {
         return {};
     }
-    try {
-        if (!extractConstValue) {
-            extractConstValue = require('next/dist/build/analysis/extract-const-value');
-        }
-        if (!parseModule) {
-            // eslint-disable-next-line prefer-destructuring, @typescript-eslint/no-var-requires
-            parseModule = require('next/dist/build/analysis/parse-module').parseModule;
+    const extractConstValueModulePath = (0, utils_1.findModuleFromBase)({
+        paths: [appDir],
+        candidates: ['next/dist/build/analysis/extract-const-value'],
+    });
+    const parseModulePath = (0, utils_1.findModuleFromBase)({
+        paths: [appDir],
+        candidates: ['next/dist/build/analysis/parse-module'],
+    });
+    if (!extractConstValueModulePath || !parseModulePath) {
+        if (!hasWarnedAboutNextVersion) {
+            console.log("This version of Next.js doesn't support advanced API routes. Skipping...");
+            hasWarnedAboutNextVersion = true;
         }
+        // Old Next.js version
+        return {};
     }
-    catch (error) {
-        if (error.code === 'MODULE_NOT_FOUND') {
-            if (!hasWarnedAboutNextVersion) {
-                console.log("This version of Next.js doesn't support advanced API routes. Skipping...");
-                hasWarnedAboutNextVersion = true;
-            }
-            // Old Next.js version
-            return {};
-        }
-        throw error;
+    if (!extractConstValue && extractConstValueModulePath) {
+        // eslint-disable-next-line import/no-dynamic-require
+        extractConstValue = require(extractConstValueModulePath);
+    }
+    if (!parseModule && parseModulePath) {
+        // eslint-disable-next-line prefer-destructuring, @typescript-eslint/no-var-requires, import/no-dynamic-require
+        parseModule = require(parseModulePath).parseModule;
     }
     const { extractExportedConstValue, UnsupportedValueError } = extractConstValue;
     const fileContent = await fs_1.default.promises.readFile(apiFilePath, 'utf8');

package/lib/helpers/compiler.js

@@ -27,6 +27,7 @@ const buildMiddlewareFile = async (entryPoints, base) => {
             format: 'esm',
             target: 'esnext',
             absWorkingDir: base,
+            external: ['next/dist/compiled/@vercel/og'],
         });
     }
     catch (error) {

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.getNextServerModulePath = 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.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");
@@ -16,7 +16,6 @@ const constants_1 = require("../constants");
 const edge_1 = require("./edge");
 const utils_1 = require("./utils");
 const TEST_ROUTE = /(|\/)\[[^/]+?](\/|\.html|$)/;
-const SOURCE_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx'];
 const isDynamicRoute = (route) => TEST_ROUTE.test(route);
 exports.isDynamicRoute = isDynamicRoute;
 const stripLocale = (rawPath, locales = []) => {
@@ -69,7 +68,7 @@ exports.getMiddleware = getMiddleware;
 // eslint-disable-next-line max-lines-per-function
 const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     console.log('Moving static page files to serve from CDN...');
-    const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
+    const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'serverless' ? 'serverless' : 'server');
     const buildId = (0, fs_extra_1.readFileSync)((0, pathe_1.join)(netlifyConfig.build.publish, 'BUILD_ID'), 'utf8').trim();
     const dataDir = (0, pathe_1.join)('_next', 'data', buildId);
     await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(netlifyConfig.build.publish, dataDir));
@@ -278,60 +277,16 @@ 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;
+exports.getServerFile = getServerFile;
+// Next.js already defines a default `pageExtensions` array in its `required-server-files.json` file
+// In case it gets `undefined`, this is a fallback
+const SOURCE_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx'];
 /**
  * Find the source file for a given page route
  */
-const getSourceFileForPage = (page, roots) => {
+const getSourceFileForPage = (page, roots, pageExtensions = SOURCE_FILE_EXTENSIONS) => {
     for (const root of roots) {
-        for (const extension of SOURCE_FILE_EXTENSIONS) {
+        for (const extension of pageExtensions) {
             const file = (0, pathe_1.join)(root, `${page}.${extension}`);
             if ((0, fs_extra_1.existsSync)(file)) {
                 return file;
@@ -359,6 +314,11 @@ const baseServerReplacements = [
         `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`],
 ];
@@ -381,7 +341,7 @@ const nextServerReplacements = [
     ],
 ];
 const patchNextFiles = async (root) => {
-    const baseServerFile = getServerFile(root);
+    const baseServerFile = (0, exports.getServerFile)(root);
     console.log(`Patching ${baseServerFile}`);
     if (baseServerFile) {
         await patchFile({
@@ -389,7 +349,7 @@ const patchNextFiles = async (root) => {
             replacements: baseServerReplacements,
         });
     }
-    const nextServerFile = getServerFile(root, false);
+    const nextServerFile = (0, exports.getServerFile)(root, false);
     console.log(`Patching ${nextServerFile}`);
     if (nextServerFile) {
         await patchFile({
@@ -407,9 +367,9 @@ const unpatchFile = async (file) => {
 };
 exports.unpatchFile = unpatchFile;
 const unpatchNextFiles = async (root) => {
-    const baseServerFile = getServerFile(root);
+    const baseServerFile = (0, exports.getServerFile)(root);
     await (0, exports.unpatchFile)(baseServerFile);
-    const nextServerFile = getServerFile(root, false);
+    const nextServerFile = (0, exports.getServerFile)(root, false);
     if (nextServerFile !== baseServerFile) {
         await (0, exports.unpatchFile)(nextServerFile);
     }

package/lib/helpers/functions.js

@@ -23,7 +23,7 @@ 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 nextServerModuleAbsoluteLocation = (0, files_1.getServerFile)(appDir, false);
     const nextServerModuleRelativeLocation = nextServerModuleAbsoluteLocation
         ? (0, pathe_1.relative)(functionDir, nextServerModuleAbsoluteLocation)
         : undefined;
@@ -146,24 +146,24 @@ exports.setupImageFunction = setupImageFunction;
 /**
  * Look for API routes, and extract the config from the source file.
  */
-const getApiRouteConfigs = async (publish, baseDir) => {
+const getApiRouteConfigs = async (publish, appDir, pageExtensions) => {
     const pages = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'server', 'pages-manifest.json'));
     const apiRoutes = Object.keys(pages).filter((page) => page.startsWith('/api/'));
     // two possible places
     // Ref: https://nextjs.org/docs/advanced-features/src-directory
-    const pagesDir = (0, pathe_1.join)(baseDir, 'pages');
-    const srcPagesDir = (0, pathe_1.join)(baseDir, 'src', 'pages');
+    const pagesDir = (0, pathe_1.join)(appDir, 'pages');
+    const srcPagesDir = (0, pathe_1.join)(appDir, 'src', 'pages');
     return await Promise.all(apiRoutes.map(async (apiRoute) => {
-        const filePath = (0, files_1.getSourceFileForPage)(apiRoute, [pagesDir, srcPagesDir]);
-        return { route: apiRoute, config: await (0, analysis_1.extractConfigFromFile)(filePath), compiled: pages[apiRoute] };
+        const filePath = (0, files_1.getSourceFileForPage)(apiRoute, [pagesDir, srcPagesDir], pageExtensions);
+        return { route: apiRoute, config: await (0, analysis_1.extractConfigFromFile)(filePath, appDir), compiled: pages[apiRoute] };
     }));
 };
 exports.getApiRouteConfigs = getApiRouteConfigs;
 /**
  * Looks for extended API routes (background and scheduled functions) and extract the config from the source file.
  */
-const getExtendedApiRouteConfigs = async (publish, baseDir) => {
-    const settledApiRoutes = await (0, exports.getApiRouteConfigs)(publish, baseDir);
+const getExtendedApiRouteConfigs = async (publish, appDir, pageExtensions) => {
+    const settledApiRoutes = await (0, exports.getApiRouteConfigs)(publish, appDir, pageExtensions);
     // We only want to return the API routes that are background or scheduled functions
     return settledApiRoutes.filter((apiRoute) => apiRoute.config.type !== undefined);
 };

package/lib/helpers/matchers.js

@@ -10,7 +10,7 @@ const stripLookahead = (regex) => {
     }
     try {
         // Parse the regexp into an AST
-        const re = (0, regexp_tree_1.transform)(`/${regex}/`, {
+        const re = (0, regexp_tree_1.transform)(new RegExp(regex), {
             Assertion(path) {
                 // Remove the lookahead
                 if (path.node.kind === 'Lookahead') {
@@ -30,8 +30,12 @@ exports.stripLookahead = stripLookahead;
 // The Go regexp lib has alternative syntax for named capture groups
 const transformCaptureGroups = (regex) => regex.replace(/\(\?<\w+>/, '(');
 exports.transformCaptureGroups = transformCaptureGroups;
-const LOCALIZED_REGEX_PREFIX = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))';
-const OPTIONAL_REGEX_PREFIX = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))?';
+const LOCALIZED_REGEX_PREFIX_13_1 = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))';
+const OPTIONAL_REGEX_PREFIX_13_1 = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))?';
+const LOCALIZED_REGEX_PREFIX_13_3 = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/((?!_next\\/)[^/.]{1,}))';
+const OPTIONAL_REGEX_PREFIX_13_3 = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/((?!_next\\/)[^/.]{1,}))?';
 // Make the locale section of the matcher regex optional
-const makeLocaleOptional = (regex) => regex.replace(LOCALIZED_REGEX_PREFIX, OPTIONAL_REGEX_PREFIX);
+const makeLocaleOptional = (regex) => regex
+    .replace(LOCALIZED_REGEX_PREFIX_13_1, OPTIONAL_REGEX_PREFIX_13_1)
+    .replace(LOCALIZED_REGEX_PREFIX_13_3, OPTIONAL_REGEX_PREFIX_13_3);
 exports.makeLocaleOptional = makeLocaleOptional;

package/lib/helpers/redirects.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRedirects = exports.generateStaticRedirects = void 0;
+exports.generateRedirects = exports.generateDynamicRewrites = exports.generateStaticRedirects = void 0;
 const chalk_1 = require("chalk");
+const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
 const pathe_1 = require("pathe");
@@ -160,7 +164,9 @@ const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, midd
                     withData: true,
                 }));
             }
-            else if (prerenderedDynamicRoutes[route.page].fallback === false && !is404Isr) {
+            else if (prerenderedDynamicRoutes[route.page].fallback === false &&
+                !is404Isr &&
+                !(0, destr_1.default)(process.env.LEGACY_FALLBACK_FALSE)) {
                 dynamicRewrites.push(...(0, utils_1.redirectsForNext404Route)({ route: route.page, buildId, basePath, i18n }));
             }
             else {
@@ -177,6 +183,7 @@ const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, midd
         dynamicRewrites,
     };
 };
+exports.generateDynamicRewrites = generateDynamicRewrites;
 const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, buildId, apiRoutes, }) => {
     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'));
@@ -215,7 +222,7 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
         netlifyConfig.redirects.push(...(0, utils_1.redirectsForNextRoute)({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
     });
     // Add rewrites for all dynamic routes (both SSR and ISR)
-    const { dynamicRewrites, dynamicRoutesThatMatchMiddleware } = generateDynamicRewrites({
+    const { dynamicRewrites, dynamicRoutesThatMatchMiddleware } = (0, exports.generateDynamicRewrites)({
         dynamicRoutes,
         prerenderedDynamicRoutes,
         middleware,

package/lib/helpers/utils.js

@@ -169,6 +169,18 @@ const findModuleFromBase = ({ paths, candidates }) => {
             // Ignore the error
         }
     }
+    // if we couldn't find a module from paths, let's try to resolve from here
+    for (const candidate of candidates) {
+        try {
+            const modulePath = require.resolve(candidate);
+            if (modulePath) {
+                return modulePath;
+            }
+        }
+        catch {
+            // Ignore the error
+        }
+    }
     return null;
 };
 exports.findModuleFromBase = findModuleFromBase;

package/lib/helpers/verification.js

@@ -102,7 +102,7 @@ const checkForRootPublish = ({ publish, failBuild, }) => {
     }
 };
 exports.checkForRootPublish = checkForRootPublish;
-const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE) => {
+const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE, warningSize = constants_1.LAMBDA_WARNING_SIZE) => {
     // Requires contacting the Netlify Support team to fully enable.
     // Enabling this without contacting them can result in failed deploys.
     if ((0, utils_1.isBundleSizeCheckDisabled)()) {
@@ -114,12 +114,13 @@ const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE) => {
         return;
     }
     const fileSize = await fs_1.promises.stat(file).then(({ size }) => size);
-    if (fileSize < maxSize) {
+    if (fileSize < warningSize) {
         return;
     }
     // We don't fail the build, because the actual hard max size is larger so it might still succeed
-    console.log((0, chalk_1.redBright)((0, outdent_1.outdent) `
-      The function zip ${(0, chalk_1.yellowBright)((0, path_1.relative)(process.cwd(), file))} size is ${(0, pretty_bytes_1.default)(fileSize)}, which is larger than the maximum supported size of ${(0, pretty_bytes_1.default)(maxSize)}.
+    console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
+      The function zip ${(0, chalk_1.blueBright)((0, path_1.relative)(process.cwd(), file))} size is ${(0, pretty_bytes_1.default)(fileSize)}, which is larger than the recommended maximum size of ${(0, pretty_bytes_1.default)(warningSize)}.
+      This will fail the build if the unzipped size is bigger than the maximum size of ${(0, pretty_bytes_1.default)(maxSize)}.
       There are a few reasons this could happen. You may have accidentally bundled a large dependency, or you might have a
       large number of pre-rendered pages included.
     `));

package/lib/index.js

@@ -37,13 +37,14 @@ const plugin = {
         // eslint-disable-next-line unicorn/consistent-destructuring
         netlifyConfig.build.environment.NEXT_PRIVATE_TARGET = 'server';
     },
+    // eslint-disable-next-line max-lines-per-function
     async onBuild({ constants, netlifyConfig, utils: { build: { failBuild }, }, }) {
         if ((0, utils_1.shouldSkip)()) {
             return;
         }
         const { publish } = netlifyConfig.build;
         (0, verification_1.checkNextSiteHasBuilt)({ publish, failBuild });
-        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental, routesManifest } = await (0, config_1.getNextConfig)({
+        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental, routesManifest, pageExtensions, } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
@@ -91,7 +92,7 @@ const plugin = {
         }
         const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
         await (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
-        const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir);
+        const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir, pageExtensions);
         await (0, functions_1.generateFunctions)(constants, appDir, apiRoutes);
         await (0, functions_1.generatePagesResolver)(constants);
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish, basePath });

package/lib/templates/getApiHandler.js

@@ -11,8 +11,7 @@ const { URLSearchParams, URL } = require('url');
 const { Bridge } = require('@vercel/node-bridge/bridge');
 const { getMultiValueHeaders } = require('./handlerUtils');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
-// eslint-disable-next-line max-params
-const makeHandler = (conf, app, pageRoot, page, NextServer) => {
+const makeApiHandler = ({ 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
@@ -111,7 +110,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)}, NextServer)
+  const handler = (${makeApiHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, page:${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

@@ -14,7 +14,7 @@ const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, n
 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
-const makeHandler = (conf, app, pageRoot, NextServer, staticManifest = [], mode = 'ssr') => {
+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
@@ -87,13 +87,6 @@ const makeHandler = (conf, app, pageRoot, NextServer, staticManifest = [], mode
         // Next expects to be able to parse the query from the URL
         const query = new URLSearchParams(event.queryStringParameters).toString();
         event.path = query ? `${event.path}?${query}` : event.path;
-        const graphToken = event.netlifyGraphToken;
-        if (graphToken && requestMode !== 'ssr') {
-            // Prefix with underscore to help us determine the origin of the token
-            // allows us to write better error messages
-            // eslint-disable-next-line no-underscore-dangle
-            process.env._NETLIFY_GRAPH_TOKEN = graphToken;
-        }
         const { headers, ...result } = await getBridge(event, context).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);
@@ -162,7 +155,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, NextServer, staticManifest, 'odb'));`
-    : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, NextServer, staticManifest, 'ssr');`}
+    ? `builder((${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'odb' }));`
+    : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr' });`}
 `;
 exports.getHandler = getHandler;

package/lib/templates/getPageResolver.js

@@ -33,7 +33,7 @@ const getResolverForDependencies = ({ dependencies, functionDir, }) => {
     // This file is purely to allow nft to know about these pages.
     exports.resolvePages = () => {
         try {
-            ${pageFiles.join('\n        ')}
+            ${pageFiles.sort().join('\n        ')}
         } catch {}
     }
   `;

package/lib/templates/server.js

@@ -64,7 +64,7 @@ const getNetlifyNextServer = (NextServer) => {
             for (const dynamicRoute in dynamicRoutes) {
                 const { dataRoute, routeRegex } = dynamicRoutes[dynamicRoute];
                 const matches = unlocalizedRoute.match(routeRegex);
-                if (matches && matches.length !== 0) {
+                if ((matches === null || matches === void 0 ? void 0 : matches.length) > 0) {
                     // remove the first match, which is the full route
                     matches.shift();
                     // replace the dynamic segments with the actual values

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.35.1-next-server-fix.0",
+  "version": "4.36.1",
   "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.9.2",
+    "@netlify/build": "^29.11.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.1.6",
+    "next": "^13.3.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },

package/src/templates/edge/shims.js

@@ -1,7 +1,11 @@
 // @ts-check
-// deno-lint-ignore-file no-var prefer-const no-unused-vars no-explicit-any
+// deno-lint-ignore-file prefer-const no-unused-vars
 import { decode as _base64Decode } from 'https://deno.land/std@0.175.0/encoding/base64.ts'
-import { AsyncLocalStorage as ALSCompat } from 'https://deno.land/std@0.175.0/node/async_hooks.ts'
+import BufferCompat from 'https://deno.land/std@0.175.0/node/buffer.ts'
+import EventsCompat from 'https://deno.land/std@0.175.0/node/events.ts'
+import AsyncHooksCompat from 'https://deno.land/std@0.175.0/node/async_hooks.ts'
+import AssertCompat from 'https://deno.land/std@0.175.0/node/assert.ts'
+import UtilCompat from 'https://deno.land/std@0.175.0/node/util.ts'
 
 /**
  * These are the shims, polyfills and other kludges to make Next.js work in standards-compliant runtime.
@@ -18,7 +22,7 @@ globalThis.EdgeRuntime = 'netlify-edge'
 let _ENTRIES = {}
 
 // Next.js expects this as a global
-globalThis.AsyncLocalStorage = ALSCompat
+globalThis.AsyncLocalStorage = AsyncHooksCompat.AsyncLocalStorage
 
 // Next.js uses this extension to the Headers API implemented by Cloudflare workerd
 if (!('getAll' in Headers.prototype)) {
@@ -48,6 +52,26 @@ const fetch /* type {typeof globalThis.fetch} */ = async (url, init) => {
   }
 }
 
+// Shim native modules that Vercel makes available
+if (typeof require === 'undefined') {
+  globalThis.require = (name) => {
+    switch (name.replace(/^node:/, '')) {
+      case 'buffer':
+        return BufferCompat
+      case 'events':
+        return EventsCompat
+      case 'async_hooks':
+        return AsyncHooksCompat
+      case 'assert':
+        return AssertCompat
+      case 'util':
+        return UtilCompat
+      default:
+        throw new ReferenceError(`Native module not found: ${name}`)
+    }
+  }
+}
+
 // Next edge runtime uses "self" as a function-scoped global-like object, but some of the older polyfills expect it to equal globalThis
 // See https://nextjs.org/docs/basic-features/supported-browsers-features#polyfills
 const self = { ...globalThis, fetch }