@netlify/plugin-nextjs 4.38.1 → 4.39.0

package/lib/helpers/config.js

@@ -69,8 +69,8 @@ exports.hasManuallyAddedModule = hasManuallyAddedModule;
  * 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 configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [], apiLambdas, ssrLambdas, splitApiRoutes, }) => {
+    var _a;
     const config = await (0, exports.getRequiredServerFiles)(publish);
     const files = config.files || [];
     const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`));
@@ -97,16 +97,23 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
             }
         });
     };
-    configureFunction(constants_1.HANDLER_FUNCTION_NAME);
-    configureFunction(constants_1.ODB_FUNCTION_NAME);
+    const configureLambda = (lambda) => {
+        var _a, _b;
+        const { functionName, includedFiles } = lambda;
+        (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [] });
+        netlifyConfig.functions[functionName].node_bundler = 'none';
+        (_b = netlifyConfig.functions[functionName]).included_files || (_b.included_files = []);
+        netlifyConfig.functions[functionName].included_files.push(...includedFiles.map(escapeGlob));
+    };
+    if (ssrLambdas.length === 0) {
+        configureFunction(constants_1.HANDLER_FUNCTION_NAME);
+        configureFunction(constants_1.ODB_FUNCTION_NAME);
+    }
+    else {
+        ssrLambdas.forEach(configureLambda);
+    }
     if (splitApiRoutes) {
-        for (const apiLambda of apiLambdas) {
-            const { functionName, includedFiles } = apiLambda;
-            (_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.map(escapeGlob));
-        }
+        apiLambdas.forEach(configureLambda);
     }
     else {
         configureFunction('_api_*');

package/lib/helpers/flags.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.splitApiRoutes = void 0;
+exports.bundleBasedOnNftFiles = exports.splitApiRoutes = void 0;
 const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
@@ -32,3 +32,9 @@ const splitApiRoutes = (featureFlags, publish) => {
     return isEnabled;
 };
 exports.splitApiRoutes = splitApiRoutes;
+const bundleBasedOnNftFiles = (featureFlags) => {
+    var _a, _b;
+    const isEnabled = (_b = (_a = (0, destr_1.default)(process.env.NEXT_BUNDLE_BASED_ON_NFT_FILES)) !== null && _a !== void 0 ? _a : featureFlags.next_bundle_based_on_nft_files) !== null && _b !== void 0 ? _b : false;
+    return isEnabled;
+};
+exports.bundleBasedOnNftFiles = bundleBasedOnNftFiles;

package/lib/helpers/functions.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.warnOnApiRoutes = exports.packSingleFunction = exports.getExtendedApiRouteConfigs = exports.getApiRouteConfigs = exports.getAPILambdas = exports.getAPIPRouteCommonDependencies = exports.traceNPMPackage = exports.setupImageFunction = exports.generatePagesResolver = exports.generateFunctions = void 0;
+exports.warnOnApiRoutes = exports.packSingleFunction = exports.getExtendedApiRouteConfigs = exports.getApiRouteConfigs = exports.getAPILambdas = exports.getSSRLambdas = exports.getCommonDependencies = exports.traceNPMPackage = exports.setupImageFunction = exports.generatePagesResolver = exports.generateFunctions = void 0;
 const node_bridge_1 = __importDefault(require("@vercel/node-bridge"));
 const chalk_1 = __importDefault(require("chalk"));
 const destr_1 = __importDefault(require("destr"));
@@ -21,7 +21,7 @@ const files_1 = require("./files");
 const functionsMetaData_1 = require("./functionsMetaData");
 const pack_1 = require("./pack");
 const utils_1 = require("./utils");
-const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiLambdas) => {
+const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiLambdas, ssrLambdas) => {
     const publish = (0, pathe_1.resolve)(PUBLISH_DIR);
     const functionsDir = (0, pathe_1.resolve)(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC);
     const functionDir = (0, pathe_1.join)(functionsDir, constants_1.HANDLER_FUNCTION_NAME);
@@ -81,6 +81,11 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         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'));
         await (0, functionsMetaData_1.writeFunctionConfiguration)({ functionName, functionTitle, functionsDir });
+        const nfInternalFiles = await (0, tiny_glob_1.default)((0, pathe_1.join)(functionsDir, functionName, '**'));
+        const lambda = ssrLambdas.find((l) => l.functionName === functionName);
+        if (lambda) {
+            lambda.includedFiles.push(...nfInternalFiles);
+        }
     };
     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);
@@ -199,16 +204,19 @@ const traceNPMPackage = async (packageName, publish) => {
     }
 };
 exports.traceNPMPackage = traceNPMPackage;
-const getAPIPRouteCommonDependencies = async (publish) => {
+const getCommonDependencies = async (publish) => {
     const deps = await Promise.all([
         traceRequiredServerFiles(publish),
         traceNextServer(publish),
         // used by our own bridge.js
         (0, exports.traceNPMPackage)('follow-redirects', publish),
+        // using package.json because otherwise, we'd find some /dist/... path
+        (0, exports.traceNPMPackage)('@netlify/functions/package.json', publish),
+        (0, exports.traceNPMPackage)('is-promise', publish),
     ]);
     return deps.flat(1);
 };
-exports.getAPIPRouteCommonDependencies = getAPIPRouteCommonDependencies;
+exports.getCommonDependencies = getCommonDependencies;
 const sum = (arr) => arr.reduce((v, current) => v + current, 0);
 // TODO: cache results
 const getBundleWeight = async (patterns) => {
@@ -224,8 +232,81 @@ const getBundleWeight = async (patterns) => {
     }));
     return sum(sizes.flat(1));
 };
+const changeExtension = (file, extension) => {
+    const base = (0, pathe_1.basename)(file, (0, pathe_1.extname)(file));
+    return (0, pathe_1.join)((0, pathe_1.dirname)(file), base + extension);
+};
+const getSSRDependencies = async (publish) => {
+    const prerenderManifest = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'prerender-manifest.json'));
+    return [
+        ...Object.entries(prerenderManifest.routes).flatMap(([route, ssgRoute]) => {
+            if (ssgRoute.initialRevalidateSeconds === false) {
+                return [];
+            }
+            if (ssgRoute.dataRoute.endsWith('.rsc')) {
+                return [
+                    (0, pathe_1.join)(publish, 'server', 'app', ssgRoute.dataRoute),
+                    (0, pathe_1.join)(publish, 'server', 'app', changeExtension(ssgRoute.dataRoute, '.html')),
+                ];
+            }
+            const trimmedPath = route === '/' ? 'index' : route.slice(1);
+            return [
+                (0, pathe_1.join)(publish, 'server', 'pages', `${trimmedPath}.html`),
+                (0, pathe_1.join)(publish, 'server', 'pages', `${trimmedPath}.json`),
+            ];
+        }),
+        (0, pathe_1.join)(publish, '**', '*.html'),
+        (0, pathe_1.join)(publish, 'static-manifest.json'),
+    ];
+};
+const getSSRLambdas = async (publish) => {
+    const commonDependencies = await (0, exports.getCommonDependencies)(publish);
+    const ssrRoutes = await getSSRRoutes(publish);
+    // TODO: for now, they're the same - but we should separate them
+    const nonOdbRoutes = ssrRoutes;
+    const odbRoutes = ssrRoutes;
+    const ssrDependencies = await getSSRDependencies(publish);
+    return [
+        {
+            functionName: constants_1.HANDLER_FUNCTION_NAME,
+            functionTitle: constants_1.HANDLER_FUNCTION_TITLE,
+            includedFiles: [
+                ...commonDependencies,
+                ...ssrDependencies,
+                ...nonOdbRoutes.flatMap((route) => route.includedFiles),
+            ],
+            routes: nonOdbRoutes,
+        },
+        {
+            functionName: constants_1.ODB_FUNCTION_NAME,
+            functionTitle: constants_1.ODB_FUNCTION_TITLE,
+            includedFiles: [...commonDependencies, ...ssrDependencies, ...odbRoutes.flatMap((route) => route.includedFiles)],
+            routes: odbRoutes,
+        },
+    ];
+};
+exports.getSSRLambdas = getSSRLambdas;
+const getSSRRoutes = async (publish) => {
+    const pageManifest = (await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'server', 'pages-manifest.json')));
+    const pageManifestRoutes = Object.entries(pageManifest).filter(([page, compiled]) => !page.startsWith('/api/') && !compiled.endsWith('.html'));
+    const appPathsManifest = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'server', 'app-paths-manifest.json')).catch(() => ({}));
+    const appRoutes = Object.entries(appPathsManifest);
+    const routes = [...pageManifestRoutes, ...appRoutes];
+    return await Promise.all(routes.map(async ([route, compiled]) => {
+        const functionName = (0, utils_1.getFunctionNameForPage)(route);
+        const compiledPath = (0, pathe_1.join)(publish, 'server', compiled);
+        const routeDependencies = await (0, files_1.getDependenciesOfFile)(compiledPath);
+        const includedFiles = [compiledPath, ...routeDependencies];
+        return {
+            functionName,
+            route,
+            compiled,
+            includedFiles,
+        };
+    }));
+};
 const getAPILambdas = async (publish, baseDir, pageExtensions) => {
-    const commonDependencies = await (0, exports.getAPIPRouteCommonDependencies)(publish);
+    const commonDependencies = await (0, exports.getCommonDependencies)(publish);
     const threshold = constants_1.LAMBDA_WARNING_SIZE - (await getBundleWeight(commonDependencies));
     const apiRoutes = await (0, exports.getApiRouteConfigs)(publish, baseDir, pageExtensions);
     const packFunctions = async (routes, type) => {

package/lib/index.js

@@ -95,13 +95,15 @@ const plugin = {
         const apiLambdas = (0, flags_1.splitApiRoutes)(featureFlags, publish)
             ? await (0, functions_1.getAPILambdas)(publish, appDir, pageExtensions)
             : await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir, pageExtensions).then((extendedRoutes) => extendedRoutes.map(functions_1.packSingleFunction));
-        await (0, functions_1.generateFunctions)(constants, appDir, apiLambdas);
+        const ssrLambdas = (0, flags_1.bundleBasedOnNftFiles)(featureFlags) ? await (0, functions_1.getSSRLambdas)(publish) : [];
+        await (0, functions_1.generateFunctions)(constants, appDir, apiLambdas, ssrLambdas);
         await (0, functions_1.generatePagesResolver)(constants);
         await (0, config_1.configureHandlerFunctions)({
             netlifyConfig,
             ignore,
             publish: (0, path_1.relative)(process.cwd(), publish),
             apiLambdas,
+            ssrLambdas,
             splitApiRoutes: (0, flags_1.splitApiRoutes)(featureFlags, publish),
         });
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish, basePath });

package/lib/templates/getHandler.js

@@ -148,6 +148,8 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
     throw new Error('Could not find Next.js server')
   }
 
+  process.env.NODE_ENV = 'production';
+
   const { Server } = require("http");
   const { promises } = require("fs");
   // We copy the file here rather than requiring from the node module

package/lib/templates/handlerUtils.js

@@ -169,6 +169,12 @@ const normalizePath = (event) => {
             return originalPath;
         }
     }
+    if (event.headers['x-original-path']) {
+        if (event.headers['x-next-debug-logging']) {
+            console.log('Original path:', event.headers['x-original-path']);
+        }
+        return event.headers['x-original-path'];
+    }
     // Ensure that paths are encoded - but don't double-encode them
     return new URL(event.rawUrl).pathname;
 };

package/lib/templates/requireHooks.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable n/no-extraneous-require, no-underscore-dangle, @typescript-eslint/no-explicit-any */
+/* eslint-disable no-underscore-dangle, @typescript-eslint/no-explicit-any */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -11,86 +11,95 @@ 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()],
-    };
+    setRequireHooks(config);
+    resolveRequireHooks();
+};
+exports.overrideRequireHooks = overrideRequireHooks;
+const setRequireHooks = (config) => {
     requireHooks.set('default', new Map([
-        ['react', require.resolve(`react`, opts)],
-        ['react/jsx-runtime', require.resolve(`react/jsx-runtime`, opts)],
+        ['react', `react`],
+        ['react/jsx-runtime', `react/jsx-runtime`],
     ]));
     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)],
-        ]));
+        if (config.experimental.serverActions) {
+            requireHooks.set('experimental', new Map([
+                ['react', `next/dist/compiled/react-experimental`],
+                ['react/jsx-runtime', `next/dist/compiled/react-experimental/jsx-runtime`],
+                ['react/jsx-dev-runtime', `next/dist/compiled/react-experimental/jsx-dev-runtime`],
+                ['react-dom', `next/dist/compiled/react-dom-experimental/server-rendering-stub`],
+                ['react-dom/client', `next/dist/compiled/react-dom-experimental/client`],
+                ['react-dom/server', `next/dist/compiled/react-dom-experimental/server`],
+                ['react-dom/server.browser', `next/dist/compiled/react-dom-experimental/server.browser`],
+                ['react-dom/server.edge', `next/dist/compiled/react-dom-experimental/server.edge`],
+                ['react-server-dom-webpack/client', `next/dist/compiled/react-server-dom-webpack-experimental/client`],
+                [
+                    'react-server-dom-webpack/client.edge',
+                    `next/dist/compiled/react-server-dom-webpack-experimental/client.edge`,
+                ],
+                [
+                    'react-server-dom-webpack/server.edge',
+                    `next/dist/compiled/react-server-dom-webpack-experimental/server.edge`,
+                ],
+                [
+                    'react-server-dom-webpack/server.node',
+                    `next/dist/compiled/react-server-dom-webpack-experimental/server.node`,
+                ],
+                ['styled-jsx', 'styled-jsx'],
+                ['styled-jsx/style', 'styled-jsx/style'],
+            ]));
+        }
+        else {
+            requireHooks.set('next', new Map([
+                ['react', `next/dist/compiled/react`],
+                ['react/jsx-runtime', `next/dist/compiled/react/jsx-runtime`],
+                ['react/jsx-dev-runtime', `next/dist/compiled/react/jsx-dev-runtime`],
+                ['react-dom', `next/dist/compiled/react-dom/server-rendering-stub`],
+                ['react-dom/client', `next/dist/compiled/react-dom/client`],
+                ['react-dom/server', `next/dist/compiled/react-dom/server`],
+                ['react-dom/server.browser', `next/dist/compiled/react-dom/server.browser`],
+                ['react-dom/server.edge', `next/dist/compiled/react-dom/server.edge`],
+                ['react-server-dom-webpack/client', `next/dist/compiled/react-server-dom-webpack/client`],
+                ['react-server-dom-webpack/client.edge', `next/dist/compiled/react-server-dom-webpack/client.edge`],
+                ['react-server-dom-webpack/server.edge', `next/dist/compiled/react-server-dom-webpack/server.edge`],
+                ['react-server-dom-webpack/server.node', `next/dist/compiled/react-server-dom-webpack/server.node`],
+                ['styled-jsx', 'styled-jsx'],
+                ['styled-jsx/style', 'styled-jsx/style'],
+            ]));
+        }
     }
 };
-exports.overrideRequireHooks = overrideRequireHooks;
+const resolveRequireHooks = () => {
+    // we may have changed the working directory in the handler
+    const opts = { paths: [process.cwd()] };
+    // resolve require hooks with module paths
+    requireHooks.forEach((mode) => {
+        mode.forEach((path, hook) => {
+            try {
+                const resolvedPath = require.resolve(path, opts);
+                mode.set(hook, resolvedPath);
+            }
+            catch (error) {
+                if (error.code === 'MODULE_NOT_FOUND') {
+                    // module not present (older version of Next.js)
+                    mode.delete(hook);
+                }
+                else {
+                    throw error;
+                }
+            }
+        });
+    });
+};
 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;
+        var _a, _b;
+        const reactMode = process.env.__NEXT_PRIVATE_PREBUNDLED_REACT || 'default';
+        const resolvedRequest = (_b = (_a = hooks.get(reactMode)) === null || _a === void 0 ? void 0 : _a.get(request)) !== null && _b !== void 0 ? _b : 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 */
+/* eslint-enable no-underscore-dangle, @typescript-eslint/no-explicit-any */

package/lib/templates/server.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNetlifyNextServer = void 0;
+// eslint-disable-next-line n/no-deprecated-api -- this is what Next.js uses as well
+const url_1 = require("url");
 const handlerUtils_1 = require("./handlerUtils");
 const getNetlifyNextServer = (NextServer) => {
     class NetlifyNextServer extends NextServer {
@@ -18,7 +20,10 @@ const getNetlifyNextServer = (NextServer) => {
         getRequestHandler() {
             const handler = super.getRequestHandler();
             return async (req, res, parsedUrl) => {
-                var _a;
+                var _a, _b;
+                if (!parsedUrl && typeof ((_a = req === null || req === void 0 ? void 0 : req.headers) === null || _a === void 0 ? void 0 : _a['x-middleware-rewrite']) === 'string') {
+                    parsedUrl = (0, url_1.parse)(req.headers['x-middleware-rewrite'], true);
+                }
                 // preserve the URL before Next.js mutates it for i18n
                 const { url, headers } = req;
                 // conditionally use the prebundled React module
@@ -37,7 +42,7 @@ const getNetlifyNextServer = (NextServer) => {
                 // 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'))) {
+                if (!((_b = headers.cookie) === null || _b === void 0 ? void 0 : _b.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;
@@ -51,7 +56,7 @@ const getNetlifyNextServer = (NextServer) => {
             const routesManifest = (_a = this.getRoutesManifest) === null || _a === void 0 ? void 0 : _a.call(this);
             const appPathsManifest = (_b = this.getAppPathsManifest) === null || _b === void 0 ? void 0 : _b.call(this);
             const routes = routesManifest && [...routesManifest.staticRoutes, ...routesManifest.dynamicRoutes];
-            const matchedRoute = routes === null || routes === void 0 ? void 0 : routes.find((route) => new RegExp(route.regex).test(path));
+            const matchedRoute = routes === null || routes === void 0 ? void 0 : routes.find((route) => new RegExp(route.regex).test(path.split('?')[0]));
             const isAppRoute = appPathsManifest && matchedRoute ? appPathsManifest[(0, handlerUtils_1.joinPaths)(matchedRoute.page, 'page')] : false;
             if (isAppRoute) {
                 // app routes should use prebundled React

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.38.1",
+  "version": "4.39.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -28,7 +28,7 @@
     "node-stream-zip": "^1.15.0",
     "outdent": "^0.8.0",
     "p-limit": "^3.1.0",
-    "pathe": "^0.2.0",
+    "pathe": "^0.3.0",
     "pretty-bytes": "^5.6.0",
     "regexp-tree": "^0.1.24",
     "semver": "^7.3.5",
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.12.7",
+    "@netlify/build": "^29.15.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

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

@@ -270,6 +270,9 @@ export const buildResponse = async ({
     }
     res.headers.set('x-middleware-rewrite', relativeUrl)
 
+    request.headers.set('x-original-path', new URL(request.url, `http://n`).pathname)
+    request.headers.set('x-middleware-rewrite', rewrite)
+
     return addMiddlewareHeaders(context.rewrite(rewrite), res)
   }