@netlify/plugin-nextjs 4.32.1 → 4.33.0

package/lib/constants.js

@@ -1,9 +1,14 @@
 "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_NAME = exports.ODB_FUNCTION_NAME = exports.HANDLER_FUNCTION_NAME = void 0;
+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.HANDLER_FUNCTION_NAME = '___netlify-handler';
 exports.ODB_FUNCTION_NAME = '___netlify-odb-handler';
 exports.IMAGE_FUNCTION_NAME = '_ipx';
+exports.NEXT_PLUGIN_NAME = '@netlify/next-runtime';
+exports.NEXT_PLUGIN = '@netlify/plugin-nextjs';
+exports.HANDLER_FUNCTION_TITLE = 'Next.js SSR handler';
+exports.ODB_FUNCTION_TITLE = 'Next.js ISR handler';
+exports.IMAGE_FUNCTION_TITLE = 'next/image handler';
 // These are paths in .next that shouldn't be publicly accessible
 exports.HIDDEN_PATHS = [
     '/cache/*',

package/lib/helpers/compiler.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watchForMiddlewareChanges = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const esbuild_1 = require("@netlify/esbuild");
+const chokidar_1 = require("chokidar");
+// For more information on Next.js middleware, see https://nextjs.org/docs/advanced-features/middleware
+// These are the locations that a middleware file can exist in a Next.js application
+// If other possible locations are added by Next.js, they should be added here.
+const MIDDLEWARE_FILE_LOCATIONS = [
+    'middleware.js',
+    'middleware.ts',
+    'src/middleware.js',
+    'src/middleware.ts',
+];
+const toFileList = (watched) => Object.entries(watched).flatMap(([dir, files]) => files.map((file) => (0, path_1.join)(dir, file)));
+/**
+ * Compile the middleware file using esbuild
+ */
+const buildMiddlewareFile = async (entryPoints, base) => {
+    try {
+        await (0, esbuild_1.build)({
+            entryPoints,
+            outfile: (0, path_1.join)(base, '.netlify', 'middleware.js'),
+            bundle: true,
+            format: 'esm',
+            target: 'esnext',
+            absWorkingDir: base,
+        });
+    }
+    catch (error) {
+        console.error(error.toString());
+    }
+};
+/**
+ * We only compile middleware if there's exactly one file. If there's more than one, we log a warning and don't compile.
+ */
+const shouldFilesBeCompiled = (watchedFiles, isFirstRun) => {
+    if (watchedFiles.length === 0) {
+        if (!isFirstRun) {
+            // Only log on subsequent builds, because having it on first build makes it seem like a warning, when it's a normal state
+            console.log('No middleware found');
+        }
+        return false;
+    }
+    if (watchedFiles.length > 1) {
+        console.log('Multiple middleware files found:');
+        console.log(watchedFiles.join('\n'));
+        console.log('This is not supported.');
+        return false;
+    }
+    return true;
+};
+const updateWatchedFiles = async (watcher, base, isFirstRun = false) => {
+    try {
+        // Start by deleting the old file. If we error out, we don't want to leave the old file around
+        await fs_1.promises.unlink((0, path_1.join)(base, '.netlify', 'middleware.js'));
+    }
+    catch {
+        // Ignore, because it's fine if it didn't exist
+    }
+    // The list of watched files is an object with the directory as the key and an array of files as the value.
+    // We need to flatten this into a list of files
+    const watchedFiles = toFileList(watcher.getWatched());
+    if (!shouldFilesBeCompiled(watchedFiles, isFirstRun)) {
+        watcher.emit('build');
+        return;
+    }
+    console.log(`${isFirstRun ? 'Building' : 'Rebuilding'} middleware ${watchedFiles[0]}...`);
+    await buildMiddlewareFile(watchedFiles, base);
+    console.log('...done');
+    watcher.emit('build');
+};
+/**
+ * Watch for changes to the middleware file location. When a change is detected, recompile the middleware file.
+ *
+ * @param base The base directory to watch
+ * @returns a file watcher and a promise that resolves when the initial scan is complete.
+ */
+const watchForMiddlewareChanges = (base) => {
+    const watcher = (0, chokidar_1.watch)(MIDDLEWARE_FILE_LOCATIONS, {
+        // Try and ensure renames just emit one event
+        atomic: true,
+        // Don't emit for every watched file, just once after the scan is done
+        ignoreInitial: true,
+        cwd: base,
+    });
+    watcher
+        .on('change', (path) => {
+        console.log(`File ${path} has been changed`);
+        updateWatchedFiles(watcher, base);
+    })
+        .on('add', (path) => {
+        console.log(`File ${path} has been added`);
+        updateWatchedFiles(watcher, base);
+    })
+        .on('unlink', (path) => {
+        console.log(`File ${path} has been removed`);
+        updateWatchedFiles(watcher, base);
+    });
+    return {
+        watcher,
+        isReady: new Promise((resolve) => {
+            watcher.on('ready', async () => {
+                console.log('Initial scan for middleware file complete. Ready for changes.');
+                // This only happens on the first scan
+                await updateWatchedFiles(watcher, base, true);
+                console.log('Ready');
+                resolve();
+            });
+        }),
+        nextBuild: () => new Promise((resolve) => {
+            watcher.once('build', resolve);
+        }),
+    };
+};
+exports.watchForMiddlewareChanges = watchForMiddlewareChanges;

package/lib/helpers/config.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.generateCustomHeaders = exports.configureHandlerFunctions = exports.hasManuallyAddedModule = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
+exports.generateCustomHeaders = exports.configureHandlerFunctions = exports.hasManuallyAddedModule = exports.resolveModuleRoot = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
 const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
@@ -57,6 +57,7 @@ const resolveModuleRoot = (moduleName) => {
         return null;
     }
 };
+exports.resolveModuleRoot = resolveModuleRoot;
 const DEFAULT_EXCLUDED_MODULES = ['sharp', 'electron'];
 const hasManuallyAddedModule = ({ netlifyConfig, moduleName, }) => 
 /* eslint-disable camelcase */
@@ -68,10 +69,9 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
     const config = await (0, exports.getRequiredServerFiles)(publish);
     const files = config.files || [];
     const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`));
-    /* eslint-disable no-underscore-dangle */
     if (!(0, destr_1.default)(process.env.DISABLE_IPX)) {
-        (_a = netlifyConfig.functions)._ipx || (_a._ipx = {});
-        netlifyConfig.functions._ipx.node_bundler = 'nft';
+        (_a = netlifyConfig.functions)[constants_1.IMAGE_FUNCTION_NAME] || (_a[constants_1.IMAGE_FUNCTION_NAME] = {});
+        netlifyConfig.functions[constants_1.IMAGE_FUNCTION_NAME].node_bundler = 'nft';
     }
     // If the user has manually added the module to included_files, then don't exclude it
     const excludedModules = DEFAULT_EXCLUDED_MODULES.filter((moduleName) => !(0, exports.hasManuallyAddedModule)({ netlifyConfig, moduleName }));
@@ -81,12 +81,12 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
         netlifyConfig.functions[functionName].node_bundler = 'nft';
         (_b = netlifyConfig.functions[functionName]).included_files || (_b.included_files = []);
         netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', './public/locales/**', './next-i18next.config.js', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, `!${publish}/server/**/*.map`, '!**/node_modules/@next/swc*/**/*', ...cssFilesToInclude, ...ignore.map((path) => `!${(0, slash_1.default)(path)}`));
-        const nextRoot = resolveModuleRoot('next');
+        const nextRoot = (0, exports.resolveModuleRoot)('next');
         if (nextRoot) {
             netlifyConfig.functions[functionName].included_files.push(`!${nextRoot}/dist/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/next-server/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/compiled/webpack/bundle4.js`, `!${nextRoot}/dist/compiled/webpack/bundle5.js`);
         }
         excludedModules.forEach((moduleName) => {
-            const moduleRoot = resolveModuleRoot(moduleName);
+            const moduleRoot = (0, exports.resolveModuleRoot)(moduleName);
             if (moduleRoot) {
                 netlifyConfig.functions[functionName].included_files.push(`!${moduleRoot}/**/*`);
             }

package/lib/helpers/dev.js

@@ -5,10 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPreDev = void 0;
 const path_1 = require("path");
-const stream_1 = require("stream");
 const execa_1 = __importDefault(require("execa"));
-const fs_extra_1 = require("fs-extra");
-const merge_stream_1 = __importDefault(require("merge-stream"));
 const edge_1 = require("./edge");
 const files_1 = require("./files");
 // The types haven't been updated yet
@@ -17,32 +14,10 @@ const onPreDev = async ({ constants, netlifyConfig }) => {
     const base = (_a = netlifyConfig.build.base) !== null && _a !== void 0 ? _a : process.cwd();
     // Need to patch the files, because build might not have been run
     await (0, files_1.patchNextFiles)(base);
-    //  Clean up old functions
-    await (0, fs_extra_1.unlink)((0, path_1.resolve)('.netlify', 'middleware.js')).catch(() => {
-        // Ignore if it doesn't exist
-    });
     await (0, edge_1.writeDevEdgeFunction)(constants);
-    // Eventually we might want to do this via esbuild's API, but for now the CLI works fine
-    const common = [`--bundle`, `--outdir=${(0, path_1.resolve)('.netlify')}`, `--format=esm`, `--target=esnext`, '--watch'];
-    const opts = {
-        all: true,
-        env: { ...process.env, FORCE_COLOR: '1' },
-    };
-    // TypeScript
-    const tsout = (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.ts')], opts).all;
-    // JavaScript
-    const jsout = (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.js')], opts).all;
-    const filter = new stream_1.Transform({
-        transform(chunk, encoding, callback) {
-            const str = chunk.toString(encoding);
-            // Skip if message includes this, because we run even when the files are missing
-            if (!str.includes('[ERROR] Could not resolve')) {
-                this.push(chunk);
-            }
-            callback();
-        },
+    // Don't await this or it will never finish
+    execa_1.default.node((0, path_1.resolve)(__dirname, '..', '..', 'lib', 'helpers', 'middlewareWatcher.js'), [base, process.env.NODE_ENV === 'test' ? '--once' : ''], {
+        stdio: 'inherit',
     });
-    (0, merge_stream_1.default)(tsout, jsout).pipe(filter).pipe(process.stdout);
-    // Don't return the promise because we don't want to wait for the child process to finish
 };
 exports.onPreDev = onPreDev;

package/lib/helpers/edge.js

@@ -10,6 +10,7 @@ const chalk_1 = require("chalk");
 const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
+const constants_1 = require("../constants");
 const config_1 = require("./config");
 const matchers_1 = require("./matchers");
 const maybeLoadJson = (path) => {
@@ -286,7 +287,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'ipx');
         await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
         await copyEdgeSourceFile({ edgeFunctionDir, file: 'ipx.ts', target: 'index.ts' });
-        await (0, fs_extra_1.copyFile)((0, path_1.join)('.netlify', 'functions-internal', '_ipx', 'imageconfig.json'), (0, path_1.join)(edgeFunctionDir, 'imageconfig.json'));
+        await (0, fs_extra_1.copyFile)((0, path_1.join)('.netlify', 'functions-internal', constants_1.IMAGE_FUNCTION_NAME, 'imageconfig.json'), (0, path_1.join)(edgeFunctionDir, 'imageconfig.json'));
         manifest.functions.push({
             function: 'ipx',
             name: 'next/image handler',

package/lib/helpers/functions.js

@@ -16,6 +16,7 @@ const getHandler_1 = require("../templates/getHandler");
 const getPageResolver_1 = require("../templates/getPageResolver");
 const analysis_1 = require("./analysis");
 const files_1 = require("./files");
+const functionsMetaData_1 = require("./functionsMetaData");
 const utils_1 = require("./utils");
 const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiRoutes) => {
     const publish = (0, pathe_1.resolve)(PUBLISH_DIR);
@@ -35,8 +36,11 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         });
         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));
+        // write main API handler file
         await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, functionName, `${functionName}.js`), apiHandlerSource);
+        // copy handler dependencies (VercelNodeBridge, NetlifyNextServer, etc.)
         await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, functionName, 'bridge.js'));
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'server.js'), (0, pathe_1.join)(functionsDir, functionName, 'server.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, functionName, 'handlerUtils.js'));
         const resolveSourceFile = (file) => (0, pathe_1.join)(publish, 'server', file);
         const resolverSource = await (0, getPageResolver_1.getResolverForSourceFiles)({
@@ -46,15 +50,19 @@ 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, isODB) => {
+    const writeHandler = async (functionName, functionTitle, isODB) => {
         const handlerSource = await (0, getHandler_1.getHandler)({ isODB, publishDir, appDir: (0, pathe_1.relative)(functionDir, appDir) });
         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);
+        // copy handler dependencies (VercelNodeBridge, NetlifyNextServer, etc.)
         await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, functionName, 'bridge.js'));
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'server.js'), (0, pathe_1.join)(functionsDir, functionName, 'server.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, functionName, 'handlerUtils.js'));
+        (0, functionsMetaData_1.writeFunctionConfiguration)({ functionName, functionTitle, functionsDir });
     };
-    await writeHandler(constants_1.HANDLER_FUNCTION_NAME, false);
-    await writeHandler(constants_1.ODB_FUNCTION_NAME, true);
+    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);
 };
 exports.generateFunctions = generateFunctions;
 /**
@@ -96,6 +104,11 @@ const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIO
             responseHeaders,
         });
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
+        (0, functionsMetaData_1.writeFunctionConfiguration)({
+            functionName: constants_1.IMAGE_FUNCTION_NAME,
+            functionTitle: constants_1.IMAGE_FUNCTION_TITLE,
+            functionsDir: functionsPath,
+        });
         // If we have edge functions then the request will have already been rewritten
         // so this won't match. This is matched if edge is disabled or unavailable.
         netlifyConfig.redirects.push({

package/lib/helpers/functionsMetaData.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFunctionConfiguration = void 0;
+const fs_extra_1 = require("fs-extra");
+const pathe_1 = require("pathe");
+const constants_1 = require("../constants");
+const config_1 = require("./config");
+const getNextRuntimeVersion = async (packageJsonPath, useNodeModulesPath) => {
+    if (!(0, fs_extra_1.existsSync)(packageJsonPath)) {
+        return;
+    }
+    const packagePlugin = await (0, fs_extra_1.readJSON)(packageJsonPath);
+    return useNodeModulesPath ? packagePlugin.version : packagePlugin.dependencies[constants_1.NEXT_PLUGIN];
+};
+/**
+ * Creates a function configuration file for the given function.
+ *
+ * @param functionInfo The information needed to create a function configuration file
+ */
+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 metadata = {
+        config: {
+            name: functionTitle,
+            generator: `${constants_1.NEXT_PLUGIN_NAME}@${nextPluginVersion}`,
+        },
+        version: 1,
+    };
+    await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, functionName, `${functionName}.json`), JSON.stringify(metadata));
+};
+exports.writeFunctionConfiguration = writeFunctionConfiguration;

package/lib/helpers/middlewareWatcher.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const compiler_1 = require("./compiler");
+const run = async () => {
+    const { isReady, watcher } = (0, compiler_1.watchForMiddlewareChanges)((0, path_1.resolve)(process.argv[2]));
+    await isReady;
+    if (process.argv[3] === '--once') {
+        watcher.close();
+    }
+};
+run();

package/lib/helpers/utils.js

@@ -49,7 +49,7 @@ const toNetlifyRoute = (nextRoute) => {
 exports.toNetlifyRoute = toNetlifyRoute;
 const generateNetlifyRoutes = ({ route, dataRoute, withData = true, }) => [...(withData ? (0, exports.toNetlifyRoute)(dataRoute) : []), ...(0, exports.toNetlifyRoute)(route)];
 exports.generateNetlifyRoutes = generateNetlifyRoutes;
-const routeToDataRoute = (route, buildId, locale) => `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? '/index' : route}.json`;
+const routeToDataRoute = (route, buildId, locale) => `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? (locale ? '' : '/index') : route}.json`;
 exports.routeToDataRoute = routeToDataRoute;
 // Default locale is served from root, not localized
 const localizeRoute = (route, locale, defaultLocale) => locale === defaultLocale ? route : `/${locale}${route}`;

package/lib/templates/getHandler.js

@@ -10,9 +10,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 { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, normalizePath, } = require('./handlerUtils');
+const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, } = require('./handlerUtils');
+const { NetlifyNextServer } = 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
+// eslint-disable-next-line max-params, max-lines-per-function
 const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
     // Change working directory into the site root, unless using Nx, which moves the
@@ -43,20 +44,22 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
     // We memoize this because it can be shared between requests, but don't instantiate it until
     // the first request because we need the host and port.
     let bridge;
-    const getBridge = (event) => {
+    const getBridge = (event, context) => {
+        const { clientContext: { custom: customContext }, } = context;
         if (bridge) {
             return bridge;
         }
         const url = new URL(event.rawUrl);
         const port = Number.parseInt(url.port) || 80;
         base = url.origin;
-        const NextServer = getNextServer();
-        const nextServer = new NextServer({
+        const nextServer = new NetlifyNextServer({
             conf,
             dir,
             customServer: false,
             hostname: url.hostname,
             port,
+        }, {
+            revalidateToken: customContext.odb_refresh_hooks,
         });
         const requestHandler = nextServer.getRequestHandler();
         const server = new Server(async (req, res) => {
@@ -90,7 +93,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
             // eslint-disable-next-line no-underscore-dangle
             process.env._NETLIFY_GRAPH_TOKEN = graphToken;
         }
-        const { headers, ...result } = await getBridge(event).launcher(event, context);
+        const { headers, ...result } = await getBridge(event, context).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);
         if (event.headers['x-next-debug-logging']) {
@@ -142,6 +145,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
   const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, normalizePath } = require('./handlerUtils')
+  const { NetlifyNextServer } = require('./server')
 
   ${isODB ? `const { builder } = require("@netlify/functions")` : ''}
   const { config }  = require("${publishDir}/required-server-files.json")

package/lib/templates/getPageResolver.js

@@ -30,7 +30,7 @@ exports.getAllPageDependencies = getAllPageDependencies;
 const getResolverForDependencies = ({ dependencies, functionDir, }) => {
     const pageFiles = dependencies.map((file) => `require.resolve('${(0, pathe_1.relative)(functionDir, file)}')`);
     return (0, outdent_1.outdent /* javascript */) `
-    // This file is purely to allow nft to know about these pages. 
+    // This file is purely to allow nft to know about these pages.
     exports.resolvePages = () => {
         try {
             ${pageFiles.join('\n        ')}

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.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.getNextServer = 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"));
@@ -206,3 +206,51 @@ const normalizePath = (event) => {
     return new URL(event.rawUrl).pathname;
 };
 exports.normalizePath = normalizePath;
+// Simple Netlify API client
+const netlifyApiFetch = ({ endpoint, payload, token, method = 'GET', }) => new Promise((resolve, reject) => {
+    const body = JSON.stringify(payload);
+    const req = follow_redirects_1.https.request({
+        hostname: 'api.netlify.com',
+        port: 443,
+        path: `/api/v1/${endpoint}`,
+        method,
+        headers: {
+            'Content-Type': 'application/json',
+            'Content-Length': body.length,
+            Authorization: `Bearer ${token}`,
+        },
+    }, (res) => {
+        let data = '';
+        res.on('data', (chunk) => {
+            data += chunk;
+        });
+        res.on('end', () => {
+            resolve(JSON.parse(data));
+        });
+    });
+    req.on('error', reject);
+    req.write(body);
+    req.end();
+});
+exports.netlifyApiFetch = netlifyApiFetch;
+// Remove trailing slash from a route (except for the root route)
+const normalizeRoute = (route) => (route.endsWith('/') ? route.slice(0, -1) || '/' : route);
+exports.normalizeRoute = normalizeRoute;
+// Check if a route has a locale prefix (including the root route)
+const isLocalized = (route, i18n) => i18n.locales.some((locale) => route === `/${locale}` || route.startsWith(`/${locale}/`));
+// Remove the locale prefix from a route (if any)
+const unlocalizeRoute = (route, i18n) => isLocalized(route, i18n) ? `/${route.split('/').slice(2).join('/')}` : route;
+exports.unlocalizeRoute = unlocalizeRoute;
+// Add the default locale prefix to a route (if necessary)
+const localizeRoute = (route, i18n) => isLocalized(route, i18n) ? route : (0, exports.normalizeRoute)(`/${i18n.defaultLocale}${route}`);
+exports.localizeRoute = localizeRoute;
+// Normalize a data route to include the locale prefix and remove the index suffix
+const localizeDataRoute = (dataRoute, localizedRoute) => {
+    if (dataRoute.endsWith('.rsc'))
+        return dataRoute;
+    const locale = localizedRoute.split('/').find(Boolean);
+    return dataRoute
+        .replace(new RegExp(`/_next/data/(.+?)/(${locale}/)?`), `/_next/data/$1/${locale}/`)
+        .replace(/\/index\.json$/, '.json');
+};
+exports.localizeDataRoute = localizeDataRoute;

package/lib/templates/server.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetlifyNextServer = 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);
+            }
+        }
+        catch (error) {
+            console.log(`Error revalidating ${route}:`, error.message);
+            throw error;
+        }
+    }
+    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`);
+    }
+}
+exports.NetlifyNextServer = NetlifyNextServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.32.1",
+  "version": "4.33.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -16,6 +16,7 @@
     "@netlify/ipx": "^1.3.3",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
+    "chokidar": "^3.5.3",
     "destr": "^1.1.1",
     "execa": "^5.1.1",
     "follow-redirects": "^1.15.2",
@@ -36,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.6.8",
+    "@netlify/build": "^29.7.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

package/src/templates/edge/next-dev.js

@@ -38,8 +38,7 @@ const handler = async (req, context) => {
     const nextMiddleware = await import(`../../middleware.js#${++idx}`)
     middleware = nextMiddleware.middleware
   } catch (importError) {
-    // Error message is `Module not found "file://<path>/middleware.js#123456".` in Deno
-    if (importError.code === 'ERR_MODULE_NOT_FOUND' && importError.message.includes(`middleware.js#${idx}`)) {
+    if (importError.code === 'ERR_MODULE_NOT_FOUND' && importError.message.includes(`middleware.js`)) {
       //  No middleware, so we silently return
       return
     }

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

@@ -8,6 +8,22 @@ export interface FetchEventResult {
 
 type NextDataTransform = <T>(data: T) => T
 
+function normalizeDataUrl(redirect: string) {
+  // If the redirect is a data URL, we need to normalize it.
+  // next.js code reference: https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/get-next-pathname-info.ts#L46
+  if (redirect.startsWith('/_next/data/') && redirect.includes('.json')) {
+    const paths = redirect
+      .replace(/^\/_next\/data\//, '')
+      .replace(/\.json/, '')
+      .split('/')
+
+    const buildId = paths[0]
+    redirect = paths[1] !== 'index' ? `/${paths.slice(1).join('/')}` : '/'
+  }
+
+  return redirect
+}
+
 /**
  * This is how Next handles rewritten URLs.
  */
@@ -196,7 +212,9 @@ export const buildResponse = async ({
               // Apply all of the transforms to the props
               const props = response.dataTransforms.reduce((prev, transform) => transform(prev), data.props)
               // Replace the data with the transformed props
-              textChunk.replace(JSON.stringify({ ...data, props }))
+              // With `html: true` the input is treated as raw HTML
+              // @see https://developers.cloudflare.com/workers/runtime-apis/html-rewriter/#global-types
+              textChunk.replace(JSON.stringify({ ...data, props }), { html: true })
             } catch (err) {
               console.log('Could not parse', err)
             }
@@ -249,6 +267,12 @@ export const buildResponse = async ({
     res.headers.set('x-nextjs-redirect', relativizeURL(redirect, request.url))
   }
 
+  const nextRedirect = res.headers.get('x-nextjs-redirect')
+
+  if (nextRedirect && isDataReq) {
+    res.headers.set('x-nextjs-redirect', normalizeDataUrl(nextRedirect))
+  }
+
   if (res.headers.get('x-middleware-next') === '1') {
     return addMiddlewareHeaders(context.next(), res)
   }