@netlify/plugin-nextjs 4.29.3 → 4.29.5-appdir.0

package/lib/helpers/config.js

@@ -154,4 +154,3 @@ const generateCustomHeaders = (nextConfig, netlifyHeaders = []) => {
     }
 };
 exports.generateCustomHeaders = generateCustomHeaders;
-/* eslint-enable max-lines */

package/lib/helpers/edge.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeEdgeFunctions = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadMiddlewareManifest = void 0;
-/* eslint-disable max-lines */
+exports.writeEdgeFunctions = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const chalk_1 = require("chalk");
@@ -13,14 +12,15 @@ const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
 const config_1 = require("./config");
 const matchers_1 = require("./matchers");
-const loadMiddlewareManifest = (netlifyConfig) => {
-    const middlewarePath = (0, path_1.resolve)(netlifyConfig.build.publish, 'server', 'middleware-manifest.json');
-    if (!(0, fs_1.existsSync)(middlewarePath)) {
-        return null;
+const maybeLoadJson = (path) => {
+    if ((0, fs_1.existsSync)(path)) {
+        return (0, fs_extra_1.readJson)(path);
     }
-    return (0, fs_extra_1.readJson)(middlewarePath);
 };
+const loadMiddlewareManifest = (netlifyConfig) => maybeLoadJson((0, path_1.resolve)(netlifyConfig.build.publish, 'server', 'middleware-manifest.json'));
 exports.loadMiddlewareManifest = loadMiddlewareManifest;
+const loadAppPathRoutesManifest = (netlifyConfig) => maybeLoadJson((0, path_1.resolve)(netlifyConfig.build.publish, 'app-path-routes-manifest.json'));
+exports.loadAppPathRoutesManifest = loadAppPathRoutesManifest;
 /**
  * Convert the Next middleware name into a valid Edge Function name
  */
@@ -35,6 +35,7 @@ import {
 // Deno defines "window", but naughty libraries think this means it's a browser
 delete globalThis.window
 globalThis.process = { env: {...Deno.env.toObject(), NEXT_RUNTIME: 'edge', 'NEXT_PRIVATE_MINIMAL_MODE': '1' } }
+globalThis.EdgeRuntime = "netlify-edge"
 let _ENTRIES = {}
 
 // Next.js uses this extension to the Headers API implemented by Cloudflare workerd
@@ -109,7 +110,7 @@ const getMiddlewareBundle = async ({ edgeFunctionDefinition, netlifyConfig, }) =
 };
 const getEdgeTemplatePath = (file) => (0, path_1.join)(__dirname, '..', '..', 'src', 'templates', 'edge', file);
 const copyEdgeSourceFile = ({ file, target, edgeFunctionDir, }) => fs_1.promises.copyFile(getEdgeTemplatePath(file), (0, path_1.join)(edgeFunctionDir, target !== null && target !== void 0 ? target : file));
-const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, netlifyConfig, nextConfig, }) => {
+const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, netlifyConfig, pageRegexMap, appPathRoutesManifest = {}, nextConfig, cache, }) => {
     const name = sanitizeName(edgeFunctionDefinition.name);
     const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, name);
     const bundle = await getMiddlewareBundle({
@@ -137,11 +138,19 @@ const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, net
     else {
         matchers.push(...edgeFunctionDefinition.matchers);
     }
+    // If the EF matches a page, it's an app dir page so needs a matcher too
+    // The object will be empty if appDir isn't enabled in the Next config
+    if (pageRegexMap && edgeFunctionDefinition.page in appPathRoutesManifest) {
+        const regexp = pageRegexMap.get(appPathRoutesManifest[edgeFunctionDefinition.page]);
+        if (regexp) {
+            matchers.push({ regexp });
+        }
+    }
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionDir, 'matchers.json'), matchers);
     // We add a defintion for each matching path
     return matchers.map((matcher) => {
         const pattern = (0, matchers_1.stripLookahead)(matcher.regexp);
-        return { function: name, pattern, name: edgeFunctionDefinition.name };
+        return { function: name, pattern, name: edgeFunctionDefinition.name, cache };
     });
 };
 const cleanupEdgeFunctions = ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => (0, fs_extra_1.emptyDir)(INTERNAL_EDGE_FUNCTIONS_SRC);
@@ -169,7 +178,8 @@ exports.writeDevEdgeFunction = writeDevEdgeFunction;
 /**
  * Writes Edge Functions for the Next middleware
  */
-const writeEdgeFunctions = async (netlifyConfig) => {
+const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
+    var _a;
     const manifest = {
         functions: [],
         version: 1,
@@ -179,6 +189,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
     const { publish } = netlifyConfig.build;
     const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);
     const nextConfig = nextConfigFile.config;
+    const usesAppDir = (_a = nextConfig.experimental) === null || _a === void 0 ? void 0 : _a.appDir;
     await (0, fs_extra_1.copy)(getEdgeTemplatePath('../edge-shared'), (0, path_1.join)(edgeFunctionRoot, 'edge-shared'));
     await (0, fs_extra_1.writeJSON)((0, path_1.join)(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig);
     if (!(0, destr_1.default)(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
@@ -216,13 +227,23 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         // Older versions of the manifest format don't have the functions field
         // No, the version field was not incremented
         if (typeof middlewareManifest.functions === 'object') {
+            // When using the app dir, we also need to check if the EF matches a page
+            const appPathRoutesManifest = await (0, exports.loadAppPathRoutesManifest)(netlifyConfig);
+            const pageRegexMap = new Map([...(routesManifest.dynamicRoutes || []), ...(routesManifest.staticRoutes || [])].map((route) => [
+                route.page,
+                route.regex,
+            ]));
             for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
                 usesEdge = true;
                 const functionDefinitions = await writeEdgeFunction({
                     edgeFunctionDefinition,
                     edgeFunctionRoot,
                     netlifyConfig,
+                    pageRegexMap,
+                    appPathRoutesManifest,
                     nextConfig,
+                    // cache: "manual" is currently experimental, so we restrict it to sites that use experimental appDir
+                    cache: usesAppDir ? 'manual' : undefined,
                 });
                 manifest.functions.push(...functionDefinitions);
             }
@@ -237,4 +258,3 @@ const writeEdgeFunctions = async (netlifyConfig) => {
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionRoot, 'manifest.json'), manifest);
 };
 exports.writeEdgeFunctions = writeEdgeFunctions;
-/* eslint-enable max-lines */

package/lib/helpers/files.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.movePublicFiles = exports.unpatchNextFiles = exports.unpatchFile = exports.patchNextFiles = exports.getDependenciesOfFile = exports.getSourceFileForPage = exports.moveStaticPages = exports.getMiddleware = exports.matchesRewrite = exports.matchesRedirect = exports.matchMiddleware = exports.stripLocale = exports.isDynamicRoute = void 0;
-/* eslint-disable max-lines */
 const os_1 = require("os");
 const chalk_1 = require("chalk");
 const fs_extra_1 = require("fs-extra");
@@ -70,7 +69,6 @@ exports.getMiddleware = getMiddleware;
 const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     console.log('Moving static page files to serve from CDN...');
     const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
-    const 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)((0, pathe_1.join)(netlifyConfig.build.publish, dataDir));
@@ -92,14 +90,17 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
             }
         }
     });
-    const files = [];
+    let fileCount = 0;
     const filesManifest = {};
     const moveFile = async (file) => {
+        // Strip the initial 'app' or 'pages' directory from the output path
+        const pathname = file.split('/').slice(1).join('/');
+        // .rsc data files go next to the html file
         const isData = file.endsWith('.json');
-        const source = (0, pathe_1.join)(root, file);
-        const targetFile = isData ? (0, pathe_1.join)(dataDir, file) : file;
+        const source = (0, pathe_1.join)(outputDir, file);
+        const targetFile = isData ? (0, pathe_1.join)(dataDir, pathname) : pathname;
         const targetPath = basePath ? (0, pathe_1.join)(basePath, targetFile) : targetFile;
-        files.push(file);
+        fileCount += 1;
         filesManifest[file] = targetPath;
         const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetPath);
         try {
@@ -110,8 +111,8 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
         }
     };
     // Move all static files, except error documents and nft manifests
-    const pages = await (0, globby_1.default)(['**/*.{html,json}', '!**/(500|404|*.js.nft).{html,json}'], {
-        cwd: root,
+    const pages = await (0, globby_1.default)(['{app,pages}/**/*.{html,json,rsc}', '!**/(500|404|*.js.nft).{html,json}'], {
+        cwd: outputDir,
         dot: true,
     });
     const matchingMiddleware = new Set();
@@ -121,35 +122,38 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     // Limit concurrent file moves to number of cpus or 2 if there is only 1
     const limit = (0, p_limit_1.default)(Math.max(2, (0, os_1.cpus)().length));
     const promises = pages.map((rawPath) => {
+        // Convert to POSIX path
         const filePath = (0, slash_1.default)(rawPath);
+        // Remove the initial 'app' or 'pages' directory from the output path
+        const pagePath = filePath.split('/').slice(1).join('/');
         // Don't move ISR files, as they're used for the first request
-        if (isrFiles.has(filePath)) {
+        if (isrFiles.has(pagePath)) {
             return;
         }
-        if ((0, exports.isDynamicRoute)(filePath)) {
+        if ((0, exports.isDynamicRoute)(pagePath)) {
             return;
         }
-        if ((0, exports.matchesRedirect)(filePath, redirects)) {
-            matchedRedirects.add(filePath);
+        if ((0, exports.matchesRedirect)(pagePath, redirects)) {
+            matchedRedirects.add(pagePath);
             return;
         }
-        if ((0, exports.matchesRewrite)(filePath, rewrites)) {
-            matchedRewrites.add(filePath);
+        if ((0, exports.matchesRewrite)(pagePath, rewrites)) {
+            matchedRewrites.add(pagePath);
             return;
         }
         // Middleware matches against the unlocalised path
-        const unlocalizedPath = (0, exports.stripLocale)(rawPath, i18n === null || i18n === void 0 ? void 0 : i18n.locales);
+        const unlocalizedPath = (0, exports.stripLocale)(pagePath, 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);
-            matchedPages.add(rawPath);
+            matchedPages.add(filePath);
             return;
         }
         return limit(moveFile, filePath);
     });
     await Promise.all(promises);
-    console.log(`Moved ${files.length} files`);
+    console.log(`Moved ${fileCount} files`);
     if (matchedPages.size !== 0) {
         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.
@@ -360,7 +364,7 @@ const unpatchNextFiles = async (root) => {
     }
 };
 exports.unpatchNextFiles = unpatchNextFiles;
-const movePublicFiles = async ({ appDir, outdir, publish, }) => {
+const movePublicFiles = async ({ appDir, outdir, publish, basePath, }) => {
     // `outdir` is a config property added when using Next.js with Nx. It's typically
     // a relative path outside of the appDir, e.g. '../../dist/apps/<app-name>', and
     // the parent directory of the .next directory.
@@ -369,8 +373,7 @@ const movePublicFiles = async ({ appDir, outdir, publish, }) => {
     // directory from the original app directory.
     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}/`);
+        await (0, fs_extra_1.copy)(publicDir, `${publish}${basePath}/`);
     }
 };
 exports.movePublicFiles = movePublicFiles;
-/* eslint-enable max-lines */

package/lib/helpers/functions.js

@@ -20,10 +20,13 @@ const utils_1 = require("./utils");
 const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiRoutes) => {
     const publish = (0, pathe_1.resolve)(PUBLISH_DIR);
     const functionsDir = (0, pathe_1.resolve)(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC);
-    console.log({ functionsDir });
     const functionDir = (0, pathe_1.join)(functionsDir, constants_1.HANDLER_FUNCTION_NAME);
     const publishDir = (0, pathe_1.relative)(functionDir, publish);
     for (const { route, config, compiled } of apiRoutes) {
+        // Don't write a lambda if the runtime is edge
+        if (config.runtime === 'experimental-edge') {
+            continue;
+        }
         const apiHandlerSource = await (0, getApiHandler_1.getApiHandler)({
             page: route,
             config,
@@ -167,4 +170,3 @@ const warnOnApiRoutes = async ({ FUNCTIONS_DIST, }) => {
     }
 };
 exports.warnOnApiRoutes = warnOnApiRoutes;
-/* eslint-enable max-lines */

package/lib/helpers/redirects.js

@@ -127,7 +127,7 @@ const generateStaticIsrRewrites = ({ staticRouteEntries, basePath, i18n, buildId
 /**
  * Generate rewrites for all dynamic routes
  */
-const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, middleware, basePath, buildId, i18n, }) => {
+const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, middleware, basePath, buildId, i18n, is404Isr, }) => {
     const dynamicRewrites = [];
     const dynamicRoutesThatMatchMiddleware = [];
     dynamicRoutes.forEach((route) => {
@@ -138,8 +138,11 @@ const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, midd
             if (matchesMiddleware(middleware, route.page)) {
                 dynamicRoutesThatMatchMiddleware.push(route.page);
             }
+            else if (prerenderedDynamicRoutes[route.page].fallback === false && !is404Isr) {
+                dynamicRewrites.push(...(0, utils_1.redirectsForNext404Route)({ route: route.page, buildId, basePath, i18n }));
+            }
             else {
-                dynamicRewrites.push(...(0, utils_1.redirectsForNextRoute)({ buildId, route: route.page, basePath, to: constants_1.ODB_FUNCTION_PATH, status: 200, i18n }));
+                dynamicRewrites.push(...(0, utils_1.redirectsForNextRoute)({ route: route.page, buildId, basePath, to: constants_1.ODB_FUNCTION_PATH, i18n }));
             }
         }
         else {
@@ -168,6 +171,7 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     const middleware = await (0, files_1.getMiddleware)(netlifyConfig.build.publish);
     netlifyConfig.redirects.push(...generateMiddlewareRewrites({ basePath, i18n, middleware, buildId }));
     const staticRouteEntries = Object.entries(prerenderedStaticRoutes);
+    const is404Isr = staticRouteEntries.some(([route, { initialRevalidateSeconds }]) => (0, utils_1.is404Route)(route, i18n) && initialRevalidateSeconds !== false);
     const routesThatMatchMiddleware = [];
     const { staticRoutePaths, staticIsrRewrites, staticIsrRoutesThatMatchMiddleware } = generateStaticIsrRewrites({
         staticRouteEntries,
@@ -194,6 +198,7 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
         basePath,
         buildId,
         i18n,
+        is404Isr,
     });
     netlifyConfig.redirects.push(...dynamicRewrites);
     routesThatMatchMiddleware.push(...dynamicRoutesThatMatchMiddleware);
@@ -214,4 +219,3 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     }
 };
 exports.generateRedirects = generateRedirects;
-/* eslint-enable max-lines */

package/lib/helpers/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
+exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNext404Route = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
 const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -57,7 +57,10 @@ 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 (0, exports.netlifyRoutesForNextRouteWithData)({ route, dataRoute: (0, exports.routeToDataRoute)(route, buildId) });
+        return (0, exports.netlifyRoutesForNextRouteWithData)({ route, dataRoute: (0, exports.routeToDataRoute)(route, buildId) }).map((redirect) => ({
+            redirect,
+            locale: false,
+        }));
     }
     const { locales, defaultLocale } = i18n;
     const routes = [];
@@ -69,7 +72,10 @@ const netlifyRoutesForNextRoute = (route, buildId, i18n) => {
         ...(0, exports.netlifyRoutesForNextRouteWithData)({
             route: locale === defaultLocale ? route : `/${locale}${route}`,
             dataRoute,
-        }));
+        }).map((redirect) => ({
+            redirect,
+            locale,
+        })));
     });
     return routes;
 };
@@ -77,13 +83,20 @@ const isApiRoute = (route) => route.startsWith('/api/') || route === '/api';
 exports.isApiRoute = isApiRoute;
 const is404Route = (route, i18n) => i18n ? i18n.locales.some((locale) => route === `/${locale}/404`) : route === '/404';
 exports.is404Route = is404Route;
-const redirectsForNextRoute = ({ route, buildId, basePath, to, i18n, status = 200, force = false, }) => netlifyRoutesForNextRoute(route, buildId, i18n).map((redirect) => ({
+const redirectsForNextRoute = ({ route, buildId, basePath, to, i18n, status = 200, force = false, }) => netlifyRoutesForNextRoute(route, buildId, i18n).map(({ redirect }) => ({
     from: `${basePath}${redirect}`,
     to,
     status,
     force,
 }));
 exports.redirectsForNextRoute = redirectsForNextRoute;
+const redirectsForNext404Route = ({ route, buildId, basePath, i18n, force = false, }) => netlifyRoutesForNextRoute(route, buildId, i18n).map(({ redirect, locale }) => ({
+    from: `${basePath}${redirect}`,
+    to: locale ? `${basePath}/server/pages/${locale}/404.html` : `${basePath}/server/pages/404.html`,
+    status: 404,
+    force,
+}));
+exports.redirectsForNext404Route = redirectsForNext404Route;
 const redirectsForNextRouteWithData = ({ route, dataRoute, basePath, to, status = 200, force = false, }) => (0, exports.netlifyRoutesForNextRouteWithData)({ route, dataRoute }).map((redirect) => ({
     from: `${basePath}${redirect}`,
     to,
@@ -193,4 +206,3 @@ const getRemotePatterns = (experimental, images) => {
     return [];
 };
 exports.getRemotePatterns = getRemotePatterns;
-/* eslint-enable max-lines */

package/lib/helpers/verification.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
 const chalk_1 = require("chalk");
@@ -180,4 +179,3 @@ const warnForRootRedirects = ({ appDir }) => {
     }
 };
 exports.warnForRootRedirects = warnForRootRedirects;
-/* eslint-enable max-lines */

package/lib/index.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable max-lines */
 const path_1 = require("path");
 const chalk_1 = require("chalk");
 const destr_1 = __importDefault(require("destr"));
@@ -44,7 +43,7 @@ const plugin = {
         }
         const { publish } = netlifyConfig.build;
         (0, verification_1.checkNextSiteHasBuilt)({ publish, failBuild });
-        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental } = await (0, config_1.getNextConfig)({
+        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental, routesManifest } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
@@ -95,7 +94,7 @@ const plugin = {
         const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir);
         await (0, functions_1.generateFunctions)(constants, appDir, apiRoutes);
         await (0, functions_1.generatePagesResolver)(constants);
-        await (0, files_1.movePublicFiles)({ appDir, outdir, publish });
+        await (0, files_1.movePublicFiles)({ appDir, outdir, publish, basePath });
         await (0, files_1.patchNextFiles)(appDir);
         if (!(0, destr_1.default)(process.env.SERVE_STATIC_FILES_FROM_ORIGIN)) {
             await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n, basePath });
@@ -118,7 +117,7 @@ const plugin = {
             buildId,
             apiRoutes,
         });
-        await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
+        await (0, edge_1.writeEdgeFunctions)({ netlifyConfig, routesManifest });
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
         await (0, cache_1.saveCache)({ cache, publish });
@@ -134,11 +133,14 @@ const plugin = {
         await (0, verification_1.checkForOldFunctions)({ functions });
         await (0, verification_1.checkZipSize)((0, path_1.join)(FUNCTIONS_DIST, `${constants_1.ODB_FUNCTION_NAME}.zip`));
         const nextConfig = await (0, config_1.getNextConfig)({ publish, failBuild });
-        const { basePath, appDir } = nextConfig;
+        const { basePath, appDir, experimental } = nextConfig;
         (0, config_1.generateCustomHeaders)(nextConfig, headers);
         (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
         (0, verification_1.warnForRootRedirects)({ appDir });
         await (0, functions_1.warnOnApiRoutes)({ FUNCTIONS_DIST });
+        if (experimental === null || experimental === void 0 ? void 0 : experimental.appDir) {
+            console.log('🧪 Thank you for testing "appDir" support on Netlify. For known issues and to give feedback, visit https://ntl.fyi/next-13-feedback');
+        }
     },
 };
 // The types haven't been updated yet
@@ -161,4 +163,3 @@ const nextRuntime = (_inputs, meta = {}) => {
     };
 };
 module.exports = nextRuntime;
-/* eslint-enable max-lines */

package/lib/templates/getApiHandler.js

@@ -105,7 +105,7 @@ const getApiHandler = ({ page, config, publishDir = '../../../.next', appDir = '
   const { config }  = require("${publishDir}/required-server-files.json")
   let staticManifest
   const path = require("path");
-  const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "serverless", "pages"));
+  const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   const handler = (${makeHandler.toString()})(config, "${appDir}", pageRoot, ${JSON.stringify(page)})
   exports.handler = ${config.type === "experimental-scheduled" /* ApiRouteType.SCHEDULED */ ? `schedule(${JSON.stringify(config.schedule)}, handler);` : 'handler'}
 `;

package/lib/templates/getHandler.js

@@ -10,7 +10,7 @@ const path = require('path');
 // eslint-disable-next-line n/prefer-global/url, n/prefer-global/url-search-params
 const { URLSearchParams, URL } = require('url');
 const { Bridge } = require('@vercel/node-bridge/bridge');
-const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils');
+const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, } = require('./handlerUtils');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-params
 const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
@@ -37,8 +37,8 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
     for (const [key, value] of Object.entries(conf.env)) {
         process.env[key] = String(value);
     }
-    // Set during the request as it needs the host header. Hoisted so we can define the function once
-    let base;
+    // Set during the request as it needs to get it from the request URL. Defaults to the URL env var
+    let base = process.env.URL;
     augmentFsModule({ promises, staticManifest, pageRoot, getBase: () => base });
     // 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.
@@ -49,9 +49,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         }
         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}`;
+        base = url.origin;
         const NextServer = getNextServer();
         const nextServer = new NextServer({
             conf,
@@ -77,6 +75,10 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
     return async function handler(event, context) {
         var _a, _b, _c;
         let requestMode = mode;
+        const prefetchResponse = getPrefetchResponse(event, mode);
+        if (prefetchResponse) {
+            return prefetchResponse;
+        }
         // Ensure that paths are encoded - but don't double-encode them
         event.path = new URL(event.rawUrl).pathname;
         // Next expects to be able to parse the query from the URL
@@ -140,7 +142,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   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 { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer } = require('./handlerUtils')
 
   ${isODB ? `const { builder } = require("@netlify/functions")` : ''}
   const { config }  = require("${publishDir}/required-server-files.json")
@@ -149,7 +151,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
     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"));
+  const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   exports.handler = ${isODB
     ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
     : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}

package/lib/templates/handlerUtils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextServer = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
+exports.getPrefetchResponse = exports.getNextServer = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
@@ -93,22 +93,22 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     const statsOrig = promises.stat;
     // ...then money-patch it to see if it's requesting a CDN file
     promises.readFile = (async (file, options) => {
-        const base = getBase();
+        const baseUrl = getBase();
         // We only care about page files
         if (file.startsWith(pageRoot)) {
-            // We only want the part after `pages/`
+            // We only want the part after `.next/server/`
             const filePath = file.slice(pageRoot.length + 1);
             // Is it in the CDN and not local?
             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)}`;
+                const url = `${baseUrl}/${staticFiles.get(filePath)}`;
                 // If it's already downloading we can wait for it to finish
                 if (downloadPromises.has(url)) {
                     await downloadPromises.get(url);
                 }
                 // Have we already cached it? We download every time if running locally to avoid staleness
-                if ((!(0, fs_1.existsSync)(cacheFile) || process.env.NETLIFY_DEV) && base) {
+                if ((!(0, fs_1.existsSync)(cacheFile) || process.env.NETLIFY_DEV) && baseUrl) {
                     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
@@ -129,7 +129,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     promises.stat = ((file, options) => {
         // We only care about page files
         if (file.startsWith(pageRoot)) {
-            // We only want the part after `pages/`
+            // We only want the part after `.next/server`
             const cacheFile = path_1.default.join(cacheDir, file.slice(pageRoot.length + 1));
             if ((0, fs_1.existsSync)(cacheFile)) {
                 return statsOrig(cacheFile, options);
@@ -172,3 +172,22 @@ const getNextServer = () => {
     return NextServer;
 };
 exports.getNextServer = getNextServer;
+/**
+ * Prefetch requests are used to check for middleware redirects, and shouldn't trigger SSR.
+ */
+const getPrefetchResponse = (event, mode) => {
+    if (event.headers['x-middleware-prefetch'] && mode === 'ssr') {
+        return {
+            statusCode: 200,
+            body: '{}',
+            headers: {
+                'Content-Type': 'application/json',
+                'x-middleware-skip': '1',
+                // https://github.com/vercel/next.js/pull/42936/files#r1027563953
+                vary: 'x-middleware-prefetch',
+            },
+        };
+    }
+    return false;
+};
+exports.getPrefetchResponse = getPrefetchResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.29.3",
+  "version": "4.29.5-appdir.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -13,7 +13,7 @@
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.3.0",
-    "@netlify/ipx": "^1.3.1",
+    "@netlify/ipx": "^1.3.2",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "destr": "^1.1.1",
@@ -36,12 +36,12 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.4.5",
+    "@netlify/build": "^29.3.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.0.3",
+    "next": "^13.0.7",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },

package/src/templates/edge/runtime.ts

@@ -13,6 +13,12 @@ export interface FetchEventResult {
   waitUntil: Promise<any>
 }
 
+export interface I18NConfig {
+  defaultLocale: string
+  localeDetection?: false
+  locales: string[]
+}
+
 export interface RequestData {
   geo?: {
     city?: string
@@ -27,7 +33,7 @@ export interface RequestData {
   method: string
   nextConfig?: {
     basePath?: string
-    i18n?: Record<string, unknown>
+    i18n?: I18NConfig | null
     trailingSlash?: boolean
   }
   page?: {