@netlify/plugin-nextjs 4.1.1 → 4.2.1

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,9 +28,9 @@ 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 (error) {
+    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

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRedirects = exports.generateStaticRedirects = void 0;
 const fs_extra_1 = require("fs-extra");
-const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
 const utils_1 = require("./utils");
@@ -45,8 +41,9 @@ const generateStaticRedirects = ({ netlifyConfig, nextConfig: { i18n, basePath }
     }
 };
 exports.generateStaticRedirects = generateStaticRedirects;
-const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, }) => {
-    const { dynamicRoutes, routes: staticRoutes } = await fs_extra_1.readJSON(pathe_1.join(netlifyConfig.build.publish, 'prerender-manifest.json'));
+const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, buildId, }) => {
+    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,78 +53,71 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     if (i18n && i18n.localeDetection !== false) {
         netlifyConfig.redirects.push(...generateLocaleRedirects({ i18n, basePath, trailingSlash }));
     }
-    const dataRedirects = [];
-    const pageRedirects = [];
-    const isrRedirects = [];
-    const dynamicRouteEntries = Object.entries(dynamicRoutes);
-    const staticRouteEntries = Object.entries(staticRoutes);
-    staticRouteEntries.forEach(([route, { dataRoute, initialRevalidateSeconds }]) => {
-        // Only look for revalidate as we need to rewrite these to SSR rather than ODB
+    // 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
+    ...(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 (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 ((0, utils_1.isApiRoute)(route)) {
+            return;
+        }
+        staticRoutePaths.add(route);
         if (initialRevalidateSeconds === false) {
             // These can be ignored, as they're static files handled by the CDN
             return;
         }
+        // The default locale is served from the root, not the localised path
         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(...(0, utils_1.redirectsForNextRouteWithData)({
+                route,
+                dataRoute: (0, utils_1.routeToDataRoute)(route, buildId, i18n.defaultLocale),
+                basePath,
+                to: constants_1.ODB_FUNCTION_PATH,
+                force: true,
+            }));
+        }
+        else {
+            // ISR routes use the ODB handler
+            netlifyConfig.redirects.push(
+            // No i18n, because the route is already localized
+            ...(0, utils_1.redirectsForNextRoute)({ route, basePath, to: constants_1.ODB_FUNCTION_PATH, force: true, buildId, i18n: null }));
         }
-        isrRedirects.push(...utils_1.netlifyRoutesForNextRoute(dataRoute), ...utils_1.netlifyRoutesForNextRoute(route));
     });
-    dynamicRouteEntries.forEach(([route, { dataRoute, fallback }]) => {
-        // Add redirects if fallback is "null" (aka blocking) or true/a string
-        if (fallback === false) {
+    // 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;
         }
-        pageRedirects.push(...utils_1.netlifyRoutesForNextRoute(route));
-        dataRedirects.push(...utils_1.netlifyRoutesForNextRoute(dataRoute));
+        netlifyConfig.redirects.push(...(0, utils_1.redirectsForNextRoute)({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
     });
-    const publicFiles = await globby_1.default('**/*', { cwd: pathe_1.join(appDir, 'public') });
-    // 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
-    {
-        from: `${basePath}/api`,
-        to: constants_1.HANDLER_FUNCTION_PATH,
-        status: 200,
-    }, {
-        from: `${basePath}/api/*`,
-        to: constants_1.HANDLER_FUNCTION_PATH,
-        status: 200,
-    }, 
-    // Preview mode gets forced to the function, to bypass pre-rendered pages, but static files need to be skipped
-    ...publicFiles.map((file) => ({
-        from: `${basePath}/${file}`,
-        // This is a no-op, but we do it to stop it matching the following rule
-        to: `${basePath}/${file}`,
-        conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
-        status: 200,
-    })), {
+    // Add rewrites for all dynamic routes (both SSR and ISR)
+    dynamicRoutes.forEach((route) => {
+        if ((0, utils_1.isApiRoute)(route.page)) {
+            return;
+        }
+        if (route.page in prerenderedDynamicRoutes) {
+            const { fallback } = prerenderedDynamicRoutes[route.page];
+            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(...(0, utils_1.redirectsForNextRoute)({ route: route.page, buildId, basePath, to: constants_1.HANDLER_FUNCTION_PATH, i18n }));
+        }
+    });
+    // Final fallback
+    netlifyConfig.redirects.push({
         from: `${basePath}/*`,
         to: constants_1.HANDLER_FUNCTION_PATH,
         status: 200,
-        conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
-        force: true,
-    }, 
-    // ISR redirects are handled by the regular function. Forced to avoid pre-rendered pages
-    ...isrRedirects.map((redirect) => ({
-        from: `${basePath}${redirect}`,
-        to: constants_1.ODB_FUNCTION_PATH,
-        status: 200,
-        force: true,
-    })), 
-    // These are pages with fallback set, which need an ODB
-    // Data redirects go first, to avoid conflict with splat redirects
-    ...dataRedirects.map((redirect) => ({
-        from: `${basePath}${redirect}`,
-        to: constants_1.ODB_FUNCTION_PATH,
-        status: 200,
-    })), 
-    // ...then all the other fallback pages
-    ...pageRedirects.map((redirect) => ({
-        from: `${basePath}${redirect}`,
-        to: constants_1.ODB_FUNCTION_PATH,
-        status: 200,
-    })), 
-    // Everything else is handled by the regular function
-    { from: `${basePath}/*`, to: constants_1.HANDLER_FUNCTION_PATH, status: 200 });
+    });
 };
 exports.generateRedirects = generateRedirects;

package/lib/helpers/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });