@netlify/plugin-nextjs 4.1.2 → 4.2.2

package/README.md

@@ -31,6 +31,12 @@ npm install -D @netlify/plugin-nextjs
 package = "@netlify/plugin-nextjs"
 ```
 
+## Deploying
+
+If you build on Netlify, this plugin will work with no additional configuration. However if you are building and
+deploying locally using the Netlify CLI, you must deploy using `netlify deploy --build`. Running the
+build and deploy commands separately will not work, because the plugin will not generate the required configuration.
+
 ## Migrating from an older version of the plugin
 
 You can manually upgrade from the previous version of the plugin by running the following command:
@@ -58,7 +64,8 @@ it.
 
 If you currently use redirects or rewrites on your site, see
 [the Rewrites and Redirects guide](https://github.com/netlify/netlify-plugin-nextjs/blob/main/docs/redirects-rewrites.md)
-for information on changes to how they are handled in this version.
+for information on changes to how they are handled in this version. In particular, note that `_redirects` and `_headers`
+files must be placed in `public`, not in the root of the site.
 
 If you want to use Next 12's beta Middleware feature, this will mostly work as expected but please
 [read the docs on some caveats and workarounds](https://github.com/netlify/netlify-plugin-nextjs/blob/main/docs/middleware.md)
@@ -85,6 +92,20 @@ you can remove it. Alternatively you can
 support. See [`demos/next-export`](https://github.com/netlify/netlify-plugin-nextjs/tree/main/demos/next-export) for an
 example.
 
+## Asset optimization
+
+Netlify [asset optimization](https://docs.netlify.com/site-deploys/post-processing/) should not be used with Next.js
+sites. Assets are already optimized by Next.js at build time, and doing further optimization can break your site. Ensure
+that it is not enabled at **Site settings > Build & deploy > Post processing > Asset optimization**.
+
+## Generated functions
+
+This plugin works by generating three Netlify functions that handle requests that haven't been pre-rendered. These are
+`___netlify-handler` (for SSR and API routes), `___netlify-odb-handler` (for ISR and fallback routes), and `_ipx` (for
+images). You can see the requests for these in [the function logs](https://docs.netlify.com/functions/logs/). For ISR
+and fallback routes you will not see any requests that are served from the edge cache, just actual rendering requests.
+These are all internal functions, so you won't find them in your site's own functions directory.
+
 ## Feedback
 
 If you think you have found a bug in the plugin,

package/lib/helpers/cache.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveCache = exports.restoreCache = void 0;
 const path_1 = require("path");
 const restoreCache = async ({ cache, publish }) => {
-    const cacheDir = path_1.join(publish, 'cache');
+    const cacheDir = (0, path_1.join)(publish, 'cache');
     if (await cache.restore(cacheDir)) {
         console.log('Next.js cache restored.');
     }
@@ -13,8 +13,8 @@ const restoreCache = async ({ cache, publish }) => {
 };
 exports.restoreCache = restoreCache;
 const saveCache = async ({ cache, publish }) => {
-    const cacheDir = path_1.join(publish, 'cache');
-    const buildManifest = path_1.join(publish, 'build-manifest.json');
+    const cacheDir = (0, path_1.join)(publish, 'cache');
+    const buildManifest = (0, path_1.join)(publish, 'build-manifest.json');
     if (await cache.save(cacheDir, { digests: [buildManifest] })) {
         console.log('Next.js cache saved.');
     }

package/lib/helpers/config.js

@@ -13,7 +13,7 @@ const defaultFailBuild = (message, { error }) => {
 };
 const getNextConfig = async function getNextConfig({ publish, failBuild = defaultFailBuild, }) {
     try {
-        const { config, appDir, ignore } = await fs_extra_1.readJSON(pathe_1.join(publish, 'required-server-files.json'));
+        const { config, appDir, ignore } = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'required-server-files.json'));
         if (!config) {
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -28,7 +28,7 @@ const getNextConfig = async function getNextConfig({ publish, failBuild = defaul
 exports.getNextConfig = getNextConfig;
 const resolveModuleRoot = (moduleName) => {
     try {
-        return pathe_1.dirname(pathe_1.relative(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
+        return (0, pathe_1.dirname)((0, pathe_1.relative)(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
     }
     catch {
         return null;
@@ -45,7 +45,7 @@ const configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
         (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [], external_node_modules: [] });
         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', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${slash_1.default(path)}`));
+        netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${(0, slash_1.default)(path)}`));
         const nextRoot = 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`, `!${nextRoot}/dist/compiled/terser/bundle.min.js`);

package/lib/helpers/files.js

@@ -43,33 +43,33 @@ const matchesRedirect = (file, redirects) => {
 exports.matchesRedirect = matchesRedirect;
 const matchesRewrite = (file, rewrites) => {
     if (Array.isArray(rewrites)) {
-        return exports.matchesRedirect(file, rewrites);
+        return (0, exports.matchesRedirect)(file, rewrites);
     }
     if (!Array.isArray(rewrites === null || rewrites === void 0 ? void 0 : rewrites.beforeFiles)) {
         return false;
     }
-    return exports.matchesRedirect(file, rewrites.beforeFiles);
+    return (0, exports.matchesRedirect)(file, rewrites.beforeFiles);
 };
 exports.matchesRewrite = matchesRewrite;
 // eslint-disable-next-line max-lines-per-function
 const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     console.log('Moving static page files to serve from CDN...');
-    const outputDir = pathe_1.join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
-    const root = pathe_1.join(outputDir, 'pages');
-    const buildId = fs_extra_1.readFileSync(pathe_1.join(netlifyConfig.build.publish, 'BUILD_ID'), 'utf8').trim();
-    const dataDir = pathe_1.join('_next', 'data', buildId);
-    await fs_extra_1.ensureDir(dataDir);
+    const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
+    const root = (0, pathe_1.join)(outputDir, 'pages');
+    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)(dataDir);
     // Load the middleware manifest so we can check if a file matches it before moving
     let middleware;
-    const manifestPath = pathe_1.join(outputDir, 'middleware-manifest.json');
-    if (fs_extra_1.existsSync(manifestPath)) {
-        const manifest = await fs_extra_1.readJson(manifestPath);
+    const manifestPath = (0, pathe_1.join)(outputDir, 'middleware-manifest.json');
+    if ((0, fs_extra_1.existsSync)(manifestPath)) {
+        const manifest = await (0, fs_extra_1.readJson)(manifestPath);
         if (manifest === null || manifest === void 0 ? void 0 : manifest.middleware) {
             middleware = Object.keys(manifest.middleware).map((path) => path.slice(1));
         }
     }
-    const prerenderManifest = await fs_extra_1.readJson(pathe_1.join(netlifyConfig.build.publish, 'prerender-manifest.json'));
-    const { redirects, rewrites } = await fs_extra_1.readJson(pathe_1.join(netlifyConfig.build.publish, 'routes-manifest.json'));
+    const prerenderManifest = await (0, fs_extra_1.readJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'prerender-manifest.json'));
+    const { redirects, rewrites } = await (0, fs_extra_1.readJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'routes-manifest.json'));
     const isrFiles = new Set();
     const shortRevalidateRoutes = [];
     Object.entries(prerenderManifest.routes).forEach(([route, { initialRevalidateSeconds }]) => {
@@ -87,20 +87,20 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     const filesManifest = {};
     const moveFile = async (file) => {
         const isData = file.endsWith('.json');
-        const source = pathe_1.join(root, file);
-        const targetFile = isData ? pathe_1.join(dataDir, file) : file;
+        const source = (0, pathe_1.join)(root, file);
+        const targetFile = isData ? (0, pathe_1.join)(dataDir, file) : file;
         files.push(file);
         filesManifest[file] = targetFile;
-        const dest = pathe_1.join(netlifyConfig.build.publish, targetFile);
+        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetFile);
         try {
-            await fs_extra_1.move(source, dest);
+            await (0, fs_extra_1.move)(source, dest);
         }
         catch (error) {
             console.warn('Error moving file', source, error);
         }
     };
     // Move all static files, except error documents and nft manifests
-    const pages = await globby_1.default(['**/*.{html,json}', '!**/(500|404|*.js.nft).{html,json}'], {
+    const pages = await (0, globby_1.default)(['**/*.{html,json}', '!**/(500|404|*.js.nft).{html,json}'], {
         cwd: root,
         dot: true,
     });
@@ -109,27 +109,27 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     const matchedRedirects = new Set();
     const matchedRewrites = new Set();
     // Limit concurrent file moves to number of cpus or 2 if there is only 1
-    const limit = p_limit_1.default(Math.max(2, os_1.cpus().length));
+    const limit = (0, p_limit_1.default)(Math.max(2, (0, os_1.cpus)().length));
     const promises = pages.map((rawPath) => {
-        const filePath = slash_1.default(rawPath);
+        const filePath = (0, slash_1.default)(rawPath);
         // Don't move ISR files, as they're used for the first request
         if (isrFiles.has(filePath)) {
             return;
         }
-        if (exports.isDynamicRoute(filePath)) {
+        if ((0, exports.isDynamicRoute)(filePath)) {
             return;
         }
-        if (exports.matchesRedirect(filePath, redirects)) {
+        if ((0, exports.matchesRedirect)(filePath, redirects)) {
             matchedRedirects.add(filePath);
             return;
         }
-        if (exports.matchesRewrite(filePath, rewrites)) {
+        if ((0, exports.matchesRewrite)(filePath, rewrites)) {
             matchedRewrites.add(filePath);
             return;
         }
         // Middleware matches against the unlocalised path
-        const unlocalizedPath = exports.stripLocale(rawPath, i18n === null || i18n === void 0 ? void 0 : i18n.locales);
-        const middlewarePath = exports.matchMiddleware(middleware, unlocalizedPath);
+        const unlocalizedPath = (0, exports.stripLocale)(rawPath, i18n === null || i18n === void 0 ? void 0 : i18n.locales);
+        const middlewarePath = (0, exports.matchMiddleware)(middleware, unlocalizedPath);
         // If a file matches middleware it can't be offloaded to the CDN, and needs to stay at the origin to be served by next/server
         if (middlewarePath) {
             matchingMiddleware.add(middlewarePath);
@@ -141,67 +141,67 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     await Promise.all(promises);
     console.log(`Moved ${files.length} files`);
     if (matchedPages.size !== 0) {
-        console.log(chalk_1.yellowBright(outdent_1.outdent `
+        console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
         Skipped moving ${matchedPages.size} ${matchedPages.size === 1 ? 'file because it matches' : 'files because they match'} middleware, so cannot be deployed to the CDN and will be served from the origin instead.
         This is fine, but we're letting you know because it may not be what you expect.
       `));
-        console.log(outdent_1.outdent `
+        console.log((0, outdent_1.outdent) `
         The following middleware matched statically-rendered pages:
 
-        ${chalk_1.yellowBright([...matchingMiddleware].map((mid) => `- /${mid}/_middleware`).join('\n'))}
+        ${(0, chalk_1.yellowBright)([...matchingMiddleware].map((mid) => `- /${mid}/_middleware`).join('\n'))}
         ${constants_1.DIVIDER}
       `);
         // There could potentially be thousands of matching pages, so we don't want to spam the console with this
         if (matchedPages.size < 50) {
-            console.log(outdent_1.outdent `
+            console.log((0, outdent_1.outdent) `
           The following files matched middleware and were not moved to the CDN:
 
-          ${chalk_1.yellowBright([...matchedPages].map((mid) => `- ${mid}`).join('\n'))}
+          ${(0, chalk_1.yellowBright)([...matchedPages].map((mid) => `- ${mid}`).join('\n'))}
           ${constants_1.DIVIDER}
         `);
         }
     }
     if (matchedRedirects.size !== 0 || matchedRewrites.size !== 0) {
-        console.log(chalk_1.yellowBright(outdent_1.outdent `
+        console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
         Skipped moving ${matchedRedirects.size + matchedRewrites.size} files because they match redirects or beforeFiles rewrites, so cannot be deployed to the CDN and will be served from the origin instead.
       `));
         if (matchedRedirects.size < 50 && matchedRedirects.size !== 0) {
-            console.log(outdent_1.outdent `
+            console.log((0, outdent_1.outdent) `
           The following files matched redirects and were not moved to the CDN:
 
-          ${chalk_1.yellowBright([...matchedRedirects].map((mid) => `- ${mid}`).join('\n'))}
+          ${(0, chalk_1.yellowBright)([...matchedRedirects].map((mid) => `- ${mid}`).join('\n'))}
           ${constants_1.DIVIDER}
         `);
         }
         if (matchedRewrites.size < 50 && matchedRewrites.size !== 0) {
-            console.log(outdent_1.outdent `
+            console.log((0, outdent_1.outdent) `
           The following files matched beforeFiles rewrites and were not moved to the CDN:
 
-          ${chalk_1.yellowBright([...matchedRewrites].map((mid) => `- ${mid}`).join('\n'))}
+          ${(0, chalk_1.yellowBright)([...matchedRewrites].map((mid) => `- ${mid}`).join('\n'))}
           ${constants_1.DIVIDER}
         `);
         }
     }
     // Write the manifest for use in the serverless functions
-    await fs_extra_1.writeJson(pathe_1.join(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest));
+    await (0, fs_extra_1.writeJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest));
     if (i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) {
         // Copy the default locale into the root
-        const defaultLocaleDir = pathe_1.join(netlifyConfig.build.publish, i18n.defaultLocale);
-        if (fs_extra_1.existsSync(defaultLocaleDir)) {
-            await fs_extra_1.copy(defaultLocaleDir, `${netlifyConfig.build.publish}/`);
+        const defaultLocaleDir = (0, pathe_1.join)(netlifyConfig.build.publish, i18n.defaultLocale);
+        if ((0, fs_extra_1.existsSync)(defaultLocaleDir)) {
+            await (0, fs_extra_1.copy)(defaultLocaleDir, `${netlifyConfig.build.publish}/`);
         }
-        const defaultLocaleIndex = pathe_1.join(netlifyConfig.build.publish, `${i18n.defaultLocale}.html`);
-        const indexHtml = pathe_1.join(netlifyConfig.build.publish, 'index.html');
-        if (fs_extra_1.existsSync(defaultLocaleIndex) && !fs_extra_1.existsSync(indexHtml)) {
+        const defaultLocaleIndex = (0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.html`);
+        const indexHtml = (0, pathe_1.join)(netlifyConfig.build.publish, 'index.html');
+        if ((0, fs_extra_1.existsSync)(defaultLocaleIndex) && !(0, fs_extra_1.existsSync)(indexHtml)) {
             try {
-                await fs_extra_1.copy(defaultLocaleIndex, indexHtml, { overwrite: false });
-                await fs_extra_1.copy(pathe_1.join(netlifyConfig.build.publish, `${i18n.defaultLocale}.json`), pathe_1.join(netlifyConfig.build.publish, 'index.json'), { overwrite: false });
+                await (0, fs_extra_1.copy)(defaultLocaleIndex, indexHtml, { overwrite: false });
+                await (0, fs_extra_1.copy)((0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.json`), (0, pathe_1.join)(netlifyConfig.build.publish, 'index.json'), { overwrite: false });
             }
             catch { }
         }
     }
     if (shortRevalidateRoutes.length !== 0) {
-        console.log(outdent_1.outdent `
+        console.log((0, outdent_1.outdent) `
       The following routes use "revalidate" values of under ${constants_1.MINIMUM_REVALIDATE_SECONDS} seconds, which is not supported.
       They will use a revalidate time of ${constants_1.MINIMUM_REVALIDATE_SECONDS} seconds instead.
     `);
@@ -217,16 +217,16 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
 };
 exports.moveStaticPages = moveStaticPages;
 const patchFile = async ({ file, from, to }) => {
-    if (!fs_extra_1.existsSync(file)) {
+    if (!(0, fs_extra_1.existsSync)(file)) {
         return;
     }
-    const content = await fs_extra_1.readFile(file, 'utf8');
+    const content = await (0, fs_extra_1.readFile)(file, 'utf8');
     if (content.includes(to)) {
         return;
     }
     const newContent = content.replace(from, to);
-    await fs_extra_1.writeFile(`${file}.orig`, content);
-    await fs_extra_1.writeFile(file, newContent);
+    await (0, fs_extra_1.writeFile)(`${file}.orig`, content);
+    await (0, fs_extra_1.writeFile)(file, newContent);
 };
 const getServerFile = (root) => {
     let serverFile;
@@ -262,8 +262,8 @@ exports.patchNextFiles = patchNextFiles;
 const unpatchNextFiles = async (root) => {
     const serverFile = getServerFile(root);
     const origFile = `${serverFile}.orig`;
-    if (fs_extra_1.existsSync(origFile)) {
-        await fs_extra_1.move(origFile, serverFile, { overwrite: true });
+    if ((0, fs_extra_1.existsSync)(origFile)) {
+        await (0, fs_extra_1.move)(origFile, serverFile, { overwrite: true });
     }
 };
 exports.unpatchNextFiles = unpatchNextFiles;
@@ -274,9 +274,9 @@ const movePublicFiles = async ({ appDir, outdir, publish, }) => {
     // If it exists, copy the files from the public folder there in order to include
     // any files that were generated during the build. Otherwise, copy the public
     // directory from the original app directory.
-    const publicDir = outdir ? pathe_1.join(appDir, outdir, 'public') : pathe_1.join(appDir, 'public');
-    if (fs_extra_1.existsSync(publicDir)) {
-        await fs_extra_1.copy(publicDir, `${publish}/`);
+    const publicDir = outdir ? (0, pathe_1.join)(appDir, outdir, 'public') : (0, pathe_1.join)(appDir, 'public');
+    if ((0, fs_extra_1.existsSync)(publicDir)) {
+        await (0, fs_extra_1.copy)(publicDir, `${publish}/`);
     }
 };
 exports.movePublicFiles = movePublicFiles;

package/lib/helpers/functions.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupImageFunction = exports.generatePagesResolver = exports.generateFunctions = void 0;
+const node_bridge_1 = __importDefault(require("@vercel/node-bridge"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -8,15 +12,14 @@ const getHandler_1 = require("../templates/getHandler");
 const getPageResolver_1 = require("../templates/getPageResolver");
 const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir) => {
     const functionsDir = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const bridgeFile = require.resolve('@vercel/node/dist/bridge');
-    const functionDir = pathe_1.join(process.cwd(), functionsDir, constants_1.HANDLER_FUNCTION_NAME);
-    const publishDir = pathe_1.relative(functionDir, pathe_1.join(process.cwd(), PUBLISH_DIR));
+    const functionDir = (0, pathe_1.join)(process.cwd(), functionsDir, constants_1.HANDLER_FUNCTION_NAME);
+    const publishDir = (0, pathe_1.relative)(functionDir, (0, pathe_1.join)(process.cwd(), PUBLISH_DIR));
     const writeHandler = async (func, isODB) => {
-        const handlerSource = await getHandler_1.getHandler({ isODB, publishDir, appDir: pathe_1.relative(functionDir, appDir) });
-        await fs_extra_1.ensureDir(pathe_1.join(functionsDir, func));
-        await fs_extra_1.writeFile(pathe_1.join(functionsDir, func, `${func}.js`), handlerSource);
-        await fs_extra_1.copyFile(bridgeFile, pathe_1.join(functionsDir, func, 'bridge.js'));
-        await fs_extra_1.copyFile(pathe_1.join(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), pathe_1.join(functionsDir, func, 'handlerUtils.js'));
+        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, func));
+        await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, func, `${func}.js`), handlerSource);
+        await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, func, 'bridge.js'));
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, func, 'handlerUtils.js'));
     };
     await writeHandler(constants_1.HANDLER_FUNCTION_NAME, false);
     await writeHandler(constants_1.ODB_FUNCTION_NAME, true);
@@ -28,25 +31,25 @@ exports.generateFunctions = generateFunctions;
  */
 const generatePagesResolver = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, PUBLISH_DIR }, target, }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const jsSource = await getPageResolver_1.getPageResolver({
+    const jsSource = await (0, getPageResolver_1.getPageResolver)({
         publish: PUBLISH_DIR,
         target,
     });
-    await fs_extra_1.writeFile(pathe_1.join(functionsPath, constants_1.ODB_FUNCTION_NAME, 'pages.js'), jsSource);
-    await fs_extra_1.writeFile(pathe_1.join(functionsPath, constants_1.HANDLER_FUNCTION_NAME, 'pages.js'), jsSource);
+    await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.ODB_FUNCTION_NAME, 'pages.js'), jsSource);
+    await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.HANDLER_FUNCTION_NAME, 'pages.js'), jsSource);
 };
 exports.generatePagesResolver = generatePagesResolver;
 // Move our next/image function into the correct functions directory
 const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC }, imageconfig = {}, netlifyConfig, basePath, }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
     const functionName = `${constants_1.IMAGE_FUNCTION_NAME}.js`;
-    const functionDirectory = pathe_1.join(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
-    await fs_extra_1.ensureDir(functionDirectory);
-    await fs_extra_1.writeJSON(pathe_1.join(functionDirectory, 'imageconfig.json'), {
+    const functionDirectory = (0, pathe_1.join)(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
+    await (0, fs_extra_1.ensureDir)(functionDirectory);
+    await (0, fs_extra_1.writeJSON)((0, pathe_1.join)(functionDirectory, 'imageconfig.json'), {
         ...imageconfig,
         basePath: [basePath, constants_1.IMAGE_FUNCTION_NAME].join('/'),
     });
-    await fs_extra_1.copyFile(pathe_1.join(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), pathe_1.join(functionDirectory, functionName));
+    await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
     const imagePath = imageconfig.path || '/_next/image';
     netlifyConfig.redirects.push({
         from: `${imagePath}*`,

package/lib/helpers/redirects.js

@@ -42,8 +42,8 @@ const generateStaticRedirects = ({ netlifyConfig, nextConfig: { i18n, basePath }
 };
 exports.generateStaticRedirects = generateStaticRedirects;
 const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, buildId, }) => {
-    const { dynamicRoutes: prerenderedDynamicRoutes, routes: prerenderedStaticRoutes } = await fs_extra_1.readJSON(pathe_1.join(netlifyConfig.build.publish, 'prerender-manifest.json'));
-    const { dynamicRoutes, staticRoutes } = await fs_extra_1.readJSON(pathe_1.join(netlifyConfig.build.publish, 'routes-manifest.json'));
+    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'));
     netlifyConfig.redirects.push(...constants_1.HIDDEN_PATHS.map((path) => ({
         from: `${basePath}${path}`,
         to: '/404.html',
@@ -56,14 +56,14 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     // This is only used in prod, so dev uses `next dev` directly
     netlifyConfig.redirects.push(
     // API routes always need to be served from the regular function
-    ...utils_1.getApiRewrites(basePath), 
+    ...(0, utils_1.getApiRewrites)(basePath), 
     // Preview mode gets forced to the function, to bypass pre-rendered pages, but static files need to be skipped
-    ...(await utils_1.getPreviewRewrites({ basePath, appDir })));
+    ...(await (0, utils_1.getPreviewRewrites)({ basePath, appDir })));
     const staticRouteEntries = Object.entries(prerenderedStaticRoutes);
     const staticRoutePaths = new Set();
     // First add all static ISR routes
     staticRouteEntries.forEach(([route, { initialRevalidateSeconds }]) => {
-        if (utils_1.isApiRoute(route)) {
+        if ((0, utils_1.isApiRoute)(route)) {
             return;
         }
         staticRoutePaths.add(route);
@@ -75,9 +75,9 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
         if ((i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) && route.startsWith(`/${i18n.defaultLocale}/`)) {
             route = route.slice(i18n.defaultLocale.length + 1);
             staticRoutePaths.add(route);
-            netlifyConfig.redirects.push(...utils_1.redirectsForNextRouteWithData({
+            netlifyConfig.redirects.push(...(0, utils_1.redirectsForNextRouteWithData)({
                 route,
-                dataRoute: utils_1.routeToDataRoute(route, buildId, i18n.defaultLocale),
+                dataRoute: (0, utils_1.routeToDataRoute)(route, buildId, i18n.defaultLocale),
                 basePath,
                 to: constants_1.ODB_FUNCTION_PATH,
                 force: true,
@@ -87,30 +87,30 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
             // ISR routes use the ODB handler
             netlifyConfig.redirects.push(
             // No i18n, because the route is already localized
-            ...utils_1.redirectsForNextRoute({ route, basePath, to: constants_1.ODB_FUNCTION_PATH, force: true, buildId, i18n: null }));
+            ...(0, utils_1.redirectsForNextRoute)({ route, basePath, to: constants_1.ODB_FUNCTION_PATH, force: true, buildId, i18n: null }));
         }
     });
-    // Add rewrites for all static SSR routes
-    staticRoutes.forEach((route) => {
-        if (staticRoutePaths.has(route.page) || utils_1.isApiRoute(route.page)) {
+    // Add rewrites for all static SSR routes. This is Next 12+
+    staticRoutes === null || staticRoutes === void 0 ? void 0 : staticRoutes.forEach((route) => {
+        if (staticRoutePaths.has(route.page) || (0, utils_1.isApiRoute)(route.page)) {
             // Prerendered static routes are either handled by the CDN or are ISR
             return;
         }
-        netlifyConfig.redirects.push(...utils_1.redirectsForNextRoute({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
+        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)
     dynamicRoutes.forEach((route) => {
-        if (utils_1.isApiRoute(route.page)) {
+        if ((0, utils_1.isApiRoute)(route.page)) {
             return;
         }
         if (route.page in prerenderedDynamicRoutes) {
             const { fallback } = prerenderedDynamicRoutes[route.page];
-            const { to, status } = utils_1.targetForFallback(fallback);
-            netlifyConfig.redirects.push(...utils_1.redirectsForNextRoute({ buildId, route: route.page, basePath, to, status, i18n }));
+            const { to, status } = (0, utils_1.targetForFallback)(fallback);
+            netlifyConfig.redirects.push(...(0, utils_1.redirectsForNextRoute)({ buildId, route: route.page, basePath, to, status, i18n }));
         }
         else {
             // If the route isn't prerendered, it's SSR
-            netlifyConfig.redirects.push(...utils_1.redirectsForNextRoute({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
+            netlifyConfig.redirects.push(...(0, utils_1.redirectsForNextRoute)({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
         }
     });
     // Final fallback

package/lib/helpers/utils.js

@@ -36,8 +36,8 @@ const toNetlifyRoute = (nextRoute) => {
 };
 exports.toNetlifyRoute = toNetlifyRoute;
 const netlifyRoutesForNextRouteWithData = ({ route, dataRoute }) => [
-    ...exports.toNetlifyRoute(dataRoute),
-    ...exports.toNetlifyRoute(route),
+    ...(0, exports.toNetlifyRoute)(dataRoute),
+    ...(0, exports.toNetlifyRoute)(route),
 ];
 exports.netlifyRoutesForNextRouteWithData = netlifyRoutesForNextRouteWithData;
 const routeToDataRoute = (route, buildId, locale) => `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? '/index' : route}.json`;
@@ -45,16 +45,16 @@ exports.routeToDataRoute = routeToDataRoute;
 const netlifyRoutesForNextRoute = (route, buildId, i18n) => {
     var _a;
     if (!((_a = i18n === null || i18n === void 0 ? void 0 : i18n.locales) === null || _a === void 0 ? void 0 : _a.length)) {
-        return exports.netlifyRoutesForNextRouteWithData({ route, dataRoute: exports.routeToDataRoute(route, buildId) });
+        return (0, exports.netlifyRoutesForNextRouteWithData)({ route, dataRoute: (0, exports.routeToDataRoute)(route, buildId) });
     }
     const { locales, defaultLocale } = i18n;
     const routes = [];
     locales.forEach((locale) => {
         // Data route is always localized
-        const dataRoute = exports.routeToDataRoute(route, buildId, locale);
+        const dataRoute = (0, exports.routeToDataRoute)(route, buildId, locale);
         routes.push(
         // Default locale is served from root, not localized
-        ...exports.netlifyRoutesForNextRouteWithData({
+        ...(0, exports.netlifyRoutesForNextRouteWithData)({
             route: locale === defaultLocale ? route : `/${locale}${route}`,
             dataRoute,
         }));
@@ -80,7 +80,7 @@ const redirectsForNextRoute = ({ route, buildId, basePath, to, i18n, status = 20
     force,
 }));
 exports.redirectsForNextRoute = redirectsForNextRoute;
-const redirectsForNextRouteWithData = ({ route, dataRoute, basePath, to, status = 200, force = false, }) => exports.netlifyRoutesForNextRouteWithData({ route, dataRoute }).map((redirect) => ({
+const redirectsForNextRouteWithData = ({ route, dataRoute, basePath, to, status = 200, force = false, }) => (0, exports.netlifyRoutesForNextRouteWithData)({ route, dataRoute }).map((redirect) => ({
     from: `${basePath}${redirect}`,
     to,
     status,
@@ -101,7 +101,7 @@ const getApiRewrites = (basePath) => [
 ];
 exports.getApiRewrites = getApiRewrites;
 const getPreviewRewrites = async ({ basePath, appDir }) => {
-    const publicFiles = await globby_1.default('**/*', { cwd: pathe_1.join(appDir, 'public') });
+    const publicFiles = await (0, globby_1.default)('**/*', { cwd: (0, pathe_1.join)(appDir, 'public') });
     // Preview mode gets forced to the function, to bypass pre-rendered pages, but static files need to be skipped
     return [
         ...publicFiles.map((file) => ({

package/lib/helpers/verification.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnForProblematicUserRewrites = exports.getProblematicUserRewrites = exports.checkZipSize = exports.checkForRootPublish = exports.checkNextSiteHasBuilt = exports.checkForOldFunctions = exports.verifyNetlifyBuildVersion = void 0;
+exports.warnForRootRedirects = exports.warnForProblematicUserRewrites = exports.getProblematicUserRewrites = exports.checkZipSize = exports.checkForRootPublish = exports.checkNextSiteHasBuilt = exports.checkForOldFunctions = exports.verifyNetlifyBuildVersion = void 0;
 /* eslint-disable max-lines */
 const fs_1 = require("fs");
 const path_1 = __importStar(require("path"));
@@ -36,8 +36,8 @@ const constants_1 = require("../constants");
 const REQUIRED_BUILD_VERSION = '>=18.16.0';
 const verifyNetlifyBuildVersion = ({ IS_LOCAL, NETLIFY_BUILD_VERSION, failBuild, }) => {
     // We check for build version because that's what's available to us, but prompt about the cli because that's what they can upgrade
-    if (IS_LOCAL && !semver_1.satisfies(NETLIFY_BUILD_VERSION, REQUIRED_BUILD_VERSION, { includePrerelease: true })) {
-        return failBuild(outdent_1.outdent `
+    if (IS_LOCAL && !(0, semver_1.satisfies)(NETLIFY_BUILD_VERSION, REQUIRED_BUILD_VERSION, { includePrerelease: true })) {
+        return failBuild((0, outdent_1.outdent) `
       This version of the Essential Next.js plugin requires netlify-cli@6.12.4 or higher. Please upgrade and try again.
       You can do this by running: "npm install -g netlify-cli@latest" or "yarn global add netlify-cli@latest"
     `);
@@ -48,31 +48,31 @@ const checkForOldFunctions = async ({ functions }) => {
     const allOldFunctions = await functions.list();
     const oldFunctions = allOldFunctions.filter(({ name }) => name.startsWith('next_'));
     if (oldFunctions.length !== 0) {
-        console.log(chalk_1.yellowBright(outdent_1.outdent `
+        console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
         We have found the following functions in your site that seem to be left over from the old Next.js plugin (v3). We have guessed this because the name starts with "next_".
 
-        ${chalk_1.reset(oldFunctions.map(({ name }) => `- ${name}`).join('\n'))}
+        ${(0, chalk_1.reset)(oldFunctions.map(({ name }) => `- ${name}`).join('\n'))}
 
         If they were created by the old plugin, these functions are likely to cause errors so should be removed. You can do this by deleting the following directories:
 
-        ${chalk_1.reset(oldFunctions.map(({ mainFile }) => `- ${path_1.default.relative(process.cwd(), path_1.default.dirname(mainFile))}`).join('\n'))}
+        ${(0, chalk_1.reset)(oldFunctions.map(({ mainFile }) => `- ${path_1.default.relative(process.cwd(), path_1.default.dirname(mainFile))}`).join('\n'))}
       `));
     }
 };
 exports.checkForOldFunctions = checkForOldFunctions;
 const checkNextSiteHasBuilt = ({ publish, failBuild, }) => {
-    if (!fs_1.existsSync(path_1.default.join(publish, 'BUILD_ID'))) {
+    if (!(0, fs_1.existsSync)(path_1.default.join(publish, 'BUILD_ID'))) {
         const outWarning = path_1.default.basename(publish) === 'out'
             ? `Your publish directory is set to "out", but in most cases it should be ".next".`
             : `In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config.`;
-        return failBuild(outdent_1.outdent `
+        return failBuild((0, outdent_1.outdent) `
       The directory "${path_1.default.relative(process.cwd(), publish)}" does not contain a Next.js production build. Perhaps the build command was not run, or you specified the wrong publish directory.
       ${outWarning}
       If you are using "next export" then you should set the environment variable NETLIFY_NEXT_PLUGIN_SKIP to "true".
     `);
     }
-    if (fs_1.existsSync(path_1.default.join(publish, 'export-detail.json'))) {
-        failBuild(outdent_1.outdent `
+    if ((0, fs_1.existsSync)(path_1.default.join(publish, 'export-detail.json'))) {
+        failBuild((0, outdent_1.outdent) `
       Detected that "next export" was run, but site is incorrectly publishing the ".next" directory.
       The publish directory should be set to "out", and you should set the environment variable NETLIFY_NEXT_PLUGIN_SKIP to "true".
     `);
@@ -81,7 +81,7 @@ const checkNextSiteHasBuilt = ({ publish, failBuild, }) => {
 exports.checkNextSiteHasBuilt = checkNextSiteHasBuilt;
 const checkForRootPublish = ({ publish, failBuild, }) => {
     if (path_1.default.resolve(publish) === path_1.default.resolve('.')) {
-        failBuild(outdent_1.outdent `
+        failBuild((0, outdent_1.outdent) `
       Your publish directory is pointing to the base directory of your site. This is not supported for Next.js sites, and is probably a mistake. 
       In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config, or the Next site is in a subdirectory.
     `);
@@ -89,7 +89,7 @@ const checkForRootPublish = ({ publish, failBuild, }) => {
 };
 exports.checkForRootPublish = checkForRootPublish;
 const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE) => {
-    if (!fs_1.existsSync(file)) {
+    if (!(0, fs_1.existsSync)(file)) {
         console.warn(`Could not check zip size because ${file} does not exist`);
         return;
     }
@@ -98,8 +98,8 @@ const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE) => {
         return;
     }
     // We don't fail the build, because the actual hard max size is larger so it might still succeed
-    console.log(chalk_1.redBright(outdent_1.outdent `
-      The function zip ${chalk_1.yellowBright(path_1.relative(process.cwd(), file))} size is ${pretty_bytes_1.default(fileSize)}, which is larger than the maximum supported size of ${pretty_bytes_1.default(maxSize)}.
+    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)}.
       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.
     `));
@@ -110,13 +110,13 @@ const checkZipSize = async (file, maxSize = constants_1.LAMBDA_MAX_SIZE) => {
     for (let i = 0; i < 10 && i < sortedFiles.length; i++) {
         largest[`${i + 1}`] = {
             File: sortedFiles[i].name,
-            'Compressed Size': pretty_bytes_1.default(sortedFiles[i].compressedSize),
-            'Uncompressed Size': pretty_bytes_1.default(sortedFiles[i].size),
+            'Compressed Size': (0, pretty_bytes_1.default)(sortedFiles[i].compressedSize),
+            'Uncompressed Size': (0, pretty_bytes_1.default)(sortedFiles[i].size),
         };
     }
-    console.log(chalk_1.yellowBright `\n\nThese are the largest files in the zip:`);
+    console.log((0, chalk_1.yellowBright) `\n\nThese are the largest files in the zip:`);
     console.table(largest);
-    console.log(chalk_1.greenBright `\n\nFor more information on fixing this, see ${chalk_1.blueBright `https://ntl.fyi/large-next-functions`}`);
+    console.log((0, chalk_1.greenBright) `\n\nFor more information on fixing this, see ${(0, chalk_1.blueBright) `https://ntl.fyi/large-next-functions`}`);
 };
 exports.checkZipSize = checkZipSize;
 const getProblematicUserRewrites = ({ redirects, basePath, }) => {
@@ -140,17 +140,23 @@ const getProblematicUserRewrites = ({ redirects, basePath, }) => {
 };
 exports.getProblematicUserRewrites = getProblematicUserRewrites;
 const warnForProblematicUserRewrites = ({ redirects, basePath, }) => {
-    const userRewrites = exports.getProblematicUserRewrites({ redirects, basePath });
+    const userRewrites = (0, exports.getProblematicUserRewrites)({ redirects, basePath });
     if (userRewrites.length === 0) {
         return;
     }
-    console.log(chalk_1.yellowBright(outdent_1.outdent `
+    console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
       You have the following Netlify rewrite${userRewrites.length === 1 ? '' : 's'} that might cause conflicts with the Next.js plugin:
 
-      ${chalk_1.reset(userRewrites.map(({ from, to, status }) => `- ${from} ${to} ${status}`).join('\n'))}
+      ${(0, chalk_1.reset)(userRewrites.map(({ from, to, status }) => `- ${from} ${to} ${status}`).join('\n'))}
 
       For more information, see https://ntl.fyi/next-rewrites
     `));
 };
 exports.warnForProblematicUserRewrites = warnForProblematicUserRewrites;
+const warnForRootRedirects = ({ appDir }) => {
+    if ((0, fs_1.existsSync)((0, path_1.join)(appDir, '_redirects'))) {
+        console.log((0, chalk_1.yellowBright)(`You have a "_redirects" file in your root directory, which is not deployed and will be ignored. If you want it to be used, please move it into "public".`));
+    }
+};
+exports.warnForRootRedirects = warnForRootRedirects;
 /* eslint-enable max-lines */

package/lib/index.js

@@ -14,57 +14,57 @@ const plugin = {
     async onPreBuild({ constants, netlifyConfig, utils: { build: { failBuild }, cache, }, }) {
         var _a;
         const { publish } = netlifyConfig.build;
-        if (utils_1.shouldSkip()) {
-            await cache_1.restoreCache({ cache, publish });
+        if ((0, utils_1.shouldSkip)()) {
+            await (0, cache_1.restoreCache)({ cache, publish });
             console.log('Not running Essential Next.js plugin');
-            if (fs_extra_1.existsSync(path_1.join(constants.INTERNAL_FUNCTIONS_SRC, constants_1.HANDLER_FUNCTION_NAME))) {
+            if ((0, fs_extra_1.existsSync)((0, path_1.join)(constants.INTERNAL_FUNCTIONS_SRC, constants_1.HANDLER_FUNCTION_NAME))) {
                 console.log(`Please ensure you remove any generated functions from ${constants.INTERNAL_FUNCTIONS_SRC}`);
             }
             return;
         }
-        verification_1.checkForRootPublish({ publish, failBuild });
-        verification_1.verifyNetlifyBuildVersion({ failBuild, ...constants });
-        await cache_1.restoreCache({ cache, publish });
+        (0, verification_1.checkForRootPublish)({ publish, failBuild });
+        (0, verification_1.verifyNetlifyBuildVersion)({ failBuild, ...constants });
+        await (0, cache_1.restoreCache)({ cache, publish });
         (_a = netlifyConfig.build).environment || (_a.environment = {});
         // eslint-disable-next-line unicorn/consistent-destructuring
         netlifyConfig.build.environment.NEXT_PRIVATE_TARGET = 'server';
     },
     async onBuild({ constants, netlifyConfig, utils: { build: { failBuild }, }, }) {
-        if (utils_1.shouldSkip()) {
+        if ((0, utils_1.shouldSkip)()) {
             return;
         }
         const { publish } = netlifyConfig.build;
-        verification_1.checkNextSiteHasBuilt({ publish, failBuild });
-        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir } = await config_1.getNextConfig({
+        (0, verification_1.checkNextSiteHasBuilt)({ publish, failBuild });
+        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
-        const buildId = fs_extra_1.readFileSync(path_1.join(publish, 'BUILD_ID'), 'utf8').trim();
-        config_1.configureHandlerFunctions({ netlifyConfig, ignore, publish: path_1.relative(process.cwd(), publish) });
-        await functions_1.generateFunctions(constants, appDir);
-        await functions_1.generatePagesResolver({ target, constants });
-        await files_1.movePublicFiles({ appDir, outdir, publish });
-        await files_1.patchNextFiles(basePath);
+        const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
+        (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
+        await (0, functions_1.generateFunctions)(constants, appDir);
+        await (0, functions_1.generatePagesResolver)({ target, constants });
+        await (0, files_1.movePublicFiles)({ appDir, outdir, publish });
+        await (0, files_1.patchNextFiles)(basePath);
         if (process.env.EXPERIMENTAL_MOVE_STATIC_PAGES) {
             console.log("The flag 'EXPERIMENTAL_MOVE_STATIC_PAGES' is no longer required, as it is now the default. To disable this behavior, set the env var 'SERVE_STATIC_FILES_FROM_ORIGIN' to 'true'");
         }
         if (!process.env.SERVE_STATIC_FILES_FROM_ORIGIN) {
-            await files_1.moveStaticPages({ target, netlifyConfig, i18n });
+            await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n });
         }
-        await redirects_1.generateStaticRedirects({
+        await (0, redirects_1.generateStaticRedirects)({
             netlifyConfig,
             nextConfig: { basePath, i18n },
         });
-        await functions_1.setupImageFunction({ constants, imageconfig: images, netlifyConfig, basePath });
-        await redirects_1.generateRedirects({
+        await (0, functions_1.setupImageFunction)({ constants, imageconfig: images, netlifyConfig, basePath });
+        await (0, redirects_1.generateRedirects)({
             netlifyConfig,
             nextConfig: { basePath, i18n, trailingSlash, appDir },
             buildId,
         });
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
-        await cache_1.saveCache({ cache, publish });
-        if (utils_1.shouldSkip()) {
+        await (0, cache_1.saveCache)({ cache, publish });
+        if ((0, utils_1.shouldSkip)()) {
             status.show({
                 title: 'Essential Next.js plugin did not run',
                 summary: `Next cache was stored, but all other functions were skipped because ${process.env.NETLIFY_NEXT_PLUGIN_SKIP
@@ -73,11 +73,12 @@ const plugin = {
             });
             return;
         }
-        await verification_1.checkForOldFunctions({ functions });
-        await verification_1.checkZipSize(path_1.join(FUNCTIONS_DIST, `${constants_1.ODB_FUNCTION_NAME}.zip`));
-        const { basePath } = await config_1.getNextConfig({ publish, failBuild });
-        verification_1.warnForProblematicUserRewrites({ basePath, redirects });
-        await files_1.unpatchNextFiles(basePath);
+        await (0, verification_1.checkForOldFunctions)({ functions });
+        await (0, verification_1.checkZipSize)((0, path_1.join)(FUNCTIONS_DIST, `${constants_1.ODB_FUNCTION_NAME}.zip`));
+        const { basePath, appDir } = await (0, config_1.getNextConfig)({ publish, failBuild });
+        (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
+        (0, verification_1.warnForRootRedirects)({ appDir });
+        await (0, files_1.unpatchNextFiles)(basePath);
     },
 };
 module.exports = plugin;

package/lib/templates/getHandler.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandler = void 0;
+const outdent_1 = require("outdent");
+/* eslint-disable @typescript-eslint/no-var-requires */
 const { promises } = require('fs');
 const { Server } = require('http');
 const path = require('path');
 // eslint-disable-next-line node/prefer-global/url, node/prefer-global/url-search-params
 const { URLSearchParams, URL } = require('url');
-const { Bridge } = require('@vercel/node/dist/bridge');
+const { Bridge } = require('@vercel/node-bridge/bridge');
 const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils');
-const makeHandler = () => 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-params
-(conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
+const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
     // This is just so nft knows about the page entrypoints. It's not actually used
     try {
@@ -23,30 +24,47 @@ const makeHandler = () =>
     (_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
     // We don't want to write ISR files to disk in the lambda environment
     conf.experimental.isrFlushToDisk = false;
+    // This is our flag that we use when patching the source
     // eslint-disable-next-line no-underscore-dangle
     process.env._BYPASS_SSG = 'true';
     // Set during the request as it needs the host header. Hoisted so we can define the function once
     let base;
     augmentFsModule({ promises, staticManifest, pageRoot, getBase: () => base });
-    const NextServer = getNextServer();
-    const nextServer = new NextServer({
-        conf,
-        dir: path.resolve(__dirname, app),
-        customServer: false,
-    });
-    const requestHandler = nextServer.getRequestHandler();
-    const server = new Server(async (req, res) => {
-        try {
-            await requestHandler(req, res);
+    // 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) => {
+        if (bridge) {
+            return bridge;
         }
-        catch (error) {
-            console.error(error);
-            throw new Error('server function error');
-        }
-    });
-    const bridge = new Bridge(server);
-    bridge.listen();
-    return async (event, context) => {
+        const url = new URL(event.rawUrl);
+        const port = Number.parseInt(url.port) || 80;
+        const { host } = event.headers;
+        const protocol = event.headers['x-forwarded-proto'] || 'http';
+        base = `${protocol}://${host}`;
+        const NextServer = getNextServer();
+        const nextServer = new NextServer({
+            conf,
+            dir: path.resolve(__dirname, app),
+            customServer: false,
+            hostname: url.hostname,
+            port,
+        });
+        const requestHandler = nextServer.getRequestHandler();
+        const server = new Server(async (req, res) => {
+            try {
+                await requestHandler(req, res);
+            }
+            catch (error) {
+                console.error(error);
+                throw new Error('Error handling request. See function logs for details.');
+            }
+        });
+        bridge = new Bridge(server);
+        bridge.listen();
+        return bridge;
+    };
+    return async function handler(event, context) {
         var _a, _b, _c;
         let requestMode = mode;
         // Ensure that paths are encoded - but don't double-encode them
@@ -54,13 +72,7 @@ const makeHandler = () =>
         // 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;
-        // Only needed if we're intercepting static files
-        if (staticManifest.length !== 0) {
-            const { host } = event.headers;
-            const protocol = event.headers['x-forwarded-proto'] || 'http';
-            base = `${protocol}://${host}`;
-        }
-        const { headers, ...result } = await bridge.launcher(event, context);
+        const { headers, ...result } = await getBridge(event).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);
         if ((_b = (_a = multiValueHeaders['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.includes('__prerender_bypass')) {
@@ -81,6 +93,7 @@ const makeHandler = () =>
             multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate'];
         }
         multiValueHeaders['x-render-mode'] = [requestMode];
+        console.log(`[${event.httpMethod}] ${event.path} (${requestMode === null || requestMode === void 0 ? void 0 : requestMode.toUpperCase()})`);
         return {
             ...result,
             multiValueHeaders,
@@ -88,24 +101,25 @@ const makeHandler = () =>
         };
     };
 };
-const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }) => `
-const { Server } = require("http");
-const { promises } = require("fs");
-// We copy the file here rather than requiring from the node module
-const { Bridge } = require("./bridge");
-const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils')
+const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }) => 
+// This is a string, but if you have the right editor plugin it should format as js
+(0, outdent_1.outdent) `
+  const { Server } = require("http");
+  const { promises } = require("fs");
+  // We copy the file here rather than requiring from the node module
+  const { Bridge } = require("./bridge");
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils')
 
-const { builder } = require("@netlify/functions");
-const { config }  = require("${publishDir}/required-server-files.json")
-let staticManifest 
-try {
-  staticManifest = require("${publishDir}/static-manifest.json")
-} catch {}
-const path = require("path");
-const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", config.target === "server" ? "server" : "serverless", "pages"));
-exports.handler = ${isODB
-    ? `builder((${makeHandler().toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
-    : `(${makeHandler().toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}
+  const { builder } = require("@netlify/functions");
+  const { config }  = require("${publishDir}/required-server-files.json")
+  let staticManifest 
+  try {
+    staticManifest = require("${publishDir}/static-manifest.json")
+  } catch {}
+  const path = require("path");
+  const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", config.target === "server" ? "server" : "serverless", "pages"));
+  exports.handler = ${isODB
+    ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
+    : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}
 `;
 exports.getHandler = getHandler;
-/* eslint-enable @typescript-eslint/no-var-requires */

package/lib/templates/getPageResolver.js

@@ -13,15 +13,15 @@ const constants_1 = require("../constants");
 // build. This is used by the nft bundler to find all the pages.
 const getPageResolver = async ({ publish, target }) => {
     const functionDir = path_1.posix.resolve(path_1.posix.join('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME));
-    const root = path_1.posix.resolve(slash_1.default(publish), target === 'server' ? 'server' : 'serverless', 'pages');
-    const pages = await tiny_glob_1.default('**/*.js', {
+    const root = path_1.posix.resolve((0, slash_1.default)(publish), target === 'server' ? 'server' : 'serverless', 'pages');
+    const pages = await (0, tiny_glob_1.default)('**/*.js', {
         cwd: root,
         dot: true,
     });
     const pageFiles = pages
-        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, slash_1.default(page)))}')`)
+        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, (0, slash_1.default)(page)))}')`)
         .sort();
-    return outdent_1.outdent `
+    return (0, outdent_1.outdent) `
     // This file is purely to allow nft to know about these pages. It should be temporary.
     exports.resolvePages = () => {
         try {

package/lib/templates/handlerUtils.js

@@ -11,7 +11,11 @@ const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
 const stream_1 = require("stream");
 const util_1 = require("util");
-const streamPipeline = util_1.promisify(stream_1.pipeline);
+const streamPipeline = (0, util_1.promisify)(stream_1.pipeline);
+/**
+ * Downloads a file from the CDN to the local aliased filesystem. This is a fallback, because in most cases we'd expect
+ * files required at runtime to not be sent to the CDN.
+ */
 const downloadFile = async (url, destination) => {
     console.log(`Downloading ${url} to ${destination}`);
     const httpx = url.startsWith('https') ? https_1.default : http_1.default;
@@ -21,7 +25,7 @@ const downloadFile = async (url, destination) => {
                 reject(new Error(`Failed to download ${url}: ${response.statusCode} ${response.statusMessage || ''}`));
                 return;
             }
-            const fileStream = fs_1.createWriteStream(destination);
+            const fileStream = (0, fs_1.createWriteStream)(destination);
             streamPipeline(response, fileStream)
                 .then(resolve)
                 .catch((error) => {
@@ -36,6 +40,9 @@ const downloadFile = async (url, destination) => {
     });
 };
 exports.downloadFile = downloadFile;
+/**
+ * Parse maxage from a cache-control header
+ */
 const getMaxAge = (header) => {
     const parts = header.split(',');
     let maxAge;
@@ -66,6 +73,9 @@ const getMultiValueHeaders = (headers) => {
     return multiValueHeaders;
 };
 exports.getMultiValueHeaders = getMultiValueHeaders;
+/**
+ * Monkey-patch the fs module to download missing files from the CDN
+ */
 const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     // Only do this if we have some static files moved to the CDN
     if (staticManifest.length === 0) {
@@ -78,7 +88,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     const staticFiles = new Map(staticManifest);
     const downloadPromises = new Map();
     // Yes, you can cache stuff locally in a Lambda
-    const cacheDir = path_1.default.join(os_1.tmpdir(), 'next-static-cache');
+    const cacheDir = path_1.default.join((0, os_1.tmpdir)(), 'next-static-cache');
     // Grab the real fs.promises.readFile...
     const readfileOrig = promises.readFile;
     const statsOrig = promises.stat;
@@ -90,7 +100,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
             // We only want the part after `pages/`
             const filePath = file.slice(pageRoot.length + 1);
             // Is it in the CDN and not local?
-            if (staticFiles.has(filePath) && !fs_1.existsSync(file)) {
+            if (staticFiles.has(filePath) && !(0, fs_1.existsSync)(file)) {
                 // This name is safe to use, because it's one that was already created by Next
                 const cacheFile = path_1.default.join(cacheDir, filePath);
                 const url = `${base}/${staticFiles.get(filePath)}`;
@@ -99,11 +109,11 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
                     await downloadPromises.get(url);
                 }
                 // Have we already cached it? We download every time if running locally to avoid staleness
-                if ((!fs_1.existsSync(cacheFile) || process.env.NETLIFY_DEV) && base) {
+                if ((!(0, fs_1.existsSync)(cacheFile) || process.env.NETLIFY_DEV) && base) {
                     await promises.mkdir(path_1.default.dirname(cacheFile), { recursive: true });
                     try {
                         // Append the path to our host and we can load it like a regular page
-                        const downloadPromise = exports.downloadFile(url, cacheFile);
+                        const downloadPromise = (0, exports.downloadFile)(url, cacheFile);
                         downloadPromises.set(url, downloadPromise);
                         await downloadPromise;
                     }
@@ -122,7 +132,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
         if (file.startsWith(pageRoot)) {
             // We only want the part after `pages/`
             const cacheFile = path_1.default.join(cacheDir, file.slice(pageRoot.length + 1));
-            if (fs_1.existsSync(cacheFile)) {
+            if ((0, fs_1.existsSync)(cacheFile)) {
                 return statsOrig(cacheFile, options);
             }
         }
@@ -130,6 +140,9 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     });
 };
 exports.augmentFsModule = augmentFsModule;
+/**
+ * Next.js has an annoying habit of needing deep imports, but then moving those in patch releases. This is our abstraction.
+ */
 const getNextServer = () => {
     let NextServer;
     try {
@@ -142,7 +155,7 @@ const getNextServer = () => {
             // A different error, so rethrow it
             throw error;
         }
-        // Probably an old version of next
+        // Probably an old version of next, so fall through and find it elsewhere.
     }
     if (!NextServer) {
         try {

package/lib/templates/ipx.js

@@ -5,7 +5,7 @@ exports.handler = void 0;
 const ipx_1 = require("@netlify/ipx");
 // @ts-ignore Injected at build time
 const imageconfig_json_1 = require("./imageconfig.json");
-exports.handler = ipx_1.createIPXHandler({
+exports.handler = (0, ipx_1.createIPXHandler)({
     basePath: imageconfig_json_1.basePath,
     domains: imageconfig_json_1.domains,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.1.2",
+  "version": "4.2.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -27,7 +27,7 @@
     "test:jest": "jest",
     "test:jest:update": "jest --updateSnapshot",
     "test:update": "run-s build build:demo test:jest:update",
-    "prepare": "npm run build",
+    "prepare": "husky install node_modules/@netlify/eslint-config-node/.husky/ && npm run build",
     "clean": "rimraf lib",
     "build": "tsc",
     "watch": "tsc --watch"
@@ -53,9 +53,9 @@
   },
   "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
   "dependencies": {
-    "@netlify/functions": "^0.10.0",
-    "@netlify/ipx": "^0.0.8",
-    "@vercel/node": "^1.11.2-canary.4",
+    "@netlify/functions": "^0.11.0",
+    "@netlify/ipx": "^0.0.9",
+    "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
@@ -74,20 +74,21 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.1.0",
-    "@netlify/eslint-config-node": "^4.1.0",
+    "@netlify/build": "^26.2.2",
+    "@netlify/eslint-config-node": "^4.1.7",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
     "@types/mocha": "^9.0.0",
+    "@types/node": "^17.0.10",
     "babel-jest": "^27.2.5",
     "cpy": "^8.1.2",
     "cypress": "^9.0.0",
     "eslint-config-next": "^12.0.0",
-    "husky": "^4.3.0",
+    "husky": "^7.0.4",
     "jest": "^27.0.0",
     "netlify-plugin-cypress": "^2.2.0",
-    "next": "^12.0.2",
+    "next": "^12.0.8",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "react": "^17.0.1",
@@ -96,12 +97,6 @@
     "tmp-promise": "^3.0.2",
     "typescript": "^4.3.4"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "npm run format"
-    }
-  },
   "engines": {
     "node": ">=12.0.0"
   },