@netlify/plugin-nextjs 4.28.6 → 4.29.0

package/lib/helpers/files.js

@@ -53,12 +53,12 @@ const matchesRewrite = (file, rewrites) => {
     return (0, exports.matchesRedirect)(file, rewrites.beforeFiles);
 };
 exports.matchesRewrite = matchesRewrite;
-const getMiddleware = async (publish) => {
+const getMiddleware = async (distDir) => {
     var _a;
     if (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1') {
         return [];
     }
-    const manifestPath = (0, pathe_1.join)(publish, 'server', 'middleware-manifest.json');
+    const manifestPath = (0, pathe_1.join)(distDir, 'server', 'middleware-manifest.json');
     if ((0, fs_extra_1.existsSync)(manifestPath)) {
         const manifest = await (0, fs_extra_1.readJson)(manifestPath, { throws: false });
         return (_a = manifest === null || manifest === void 0 ? void 0 : manifest.sortedMiddleware) !== null && _a !== void 0 ? _a : [];
@@ -67,18 +67,18 @@ const getMiddleware = async (publish) => {
 };
 exports.getMiddleware = getMiddleware;
 // eslint-disable-next-line max-lines-per-function
-const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
+const moveStaticPages = async ({ distDir, i18n, basePath, publishDir, }) => {
     console.log('Moving static page files to serve from CDN...');
-    const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
+    const outputDir = (0, pathe_1.join)(distDir, 'server');
     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 buildId = (0, fs_extra_1.readFileSync)((0, pathe_1.join)(distDir, '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));
+    await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(publishDir, dataDir));
     // Load the middleware manifest so we can check if a file matches it before moving
-    const middlewarePaths = await (0, exports.getMiddleware)(netlifyConfig.build.publish);
+    const middlewarePaths = await (0, exports.getMiddleware)(distDir);
     const middleware = middlewarePaths.map((path) => path.slice(1));
-    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 prerenderManifest = await (0, fs_extra_1.readJson)((0, pathe_1.join)(distDir, 'prerender-manifest.json'));
+    const { redirects, rewrites } = await (0, fs_extra_1.readJson)((0, pathe_1.join)(distDir, 'routes-manifest.json'));
     const isrFiles = new Set();
     const shortRevalidateRoutes = [];
     Object.entries(prerenderManifest.routes).forEach(([route, { initialRevalidateSeconds }]) => {
@@ -101,7 +101,7 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
         const targetPath = basePath ? (0, pathe_1.join)(basePath, targetFile) : targetFile;
         files.push(file);
         filesManifest[file] = targetPath;
-        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetPath);
+        const dest = (0, pathe_1.join)(publishDir, targetPath);
         try {
             await (0, fs_extra_1.move)(source, dest);
         }
@@ -193,9 +193,9 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
         }
     }
     // Write the manifest for use in the serverless functions
-    await (0, fs_extra_1.writeJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest));
+    await (0, fs_extra_1.writeJson)((0, pathe_1.join)(distDir, 'static-manifest.json'), Object.entries(filesManifest));
     if (i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) {
-        const rootPath = basePath ? (0, pathe_1.join)(netlifyConfig.build.publish, basePath) : netlifyConfig.build.publish;
+        const rootPath = basePath ? (0, pathe_1.join)(publishDir, basePath) : publishDir;
         // Copy the default locale into the root
         const defaultLocaleDir = (0, pathe_1.join)(rootPath, i18n.defaultLocale);
         if ((0, fs_extra_1.existsSync)(defaultLocaleDir)) {
@@ -358,7 +358,8 @@ const unpatchNextFiles = async (root) => {
     }
 };
 exports.unpatchNextFiles = unpatchNextFiles;
-const movePublicFiles = async ({ appDir, outdir, publish, }) => {
+const movePublicFiles = async ({ appDir, outdir, publishDir, }) => {
+    await (0, fs_extra_1.ensureDir)(publishDir);
     // `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.
@@ -367,7 +368,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, `${publishDir}/`);
     }
 };
 exports.movePublicFiles = movePublicFiles;

package/lib/helpers/redirects.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRedirects = exports.generateStaticRedirects = void 0;
+exports.generateRedirects = void 0;
 const chalk_1 = require("chalk");
 const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
@@ -9,12 +9,6 @@ const constants_1 = require("../constants");
 const files_1 = require("./files");
 const utils_1 = require("./utils");
 const matchesMiddleware = (middleware, route) => middleware.some((middlewarePath) => route.startsWith(middlewarePath));
-const generateHiddenPathRedirects = ({ basePath }) => constants_1.HIDDEN_PATHS.map((path) => ({
-    from: `${basePath}${path}`,
-    to: '/404.html',
-    status: 404,
-    force: true,
-}));
 const generateLocaleRedirects = ({ i18n, basePath, trailingSlash, }) => {
     const redirects = [];
     // If the cookie is set, we need to redirect at the origin
@@ -43,14 +37,6 @@ const generateLocaleRedirects = ({ i18n, basePath, trailingSlash, }) => {
     });
     return redirects;
 };
-const generateStaticRedirects = ({ netlifyConfig, nextConfig: { i18n, basePath }, }) => {
-    // Static files are in `static`
-    netlifyConfig.redirects.push({ from: `${basePath}/_next/static/*`, to: `/static/:splat`, status: 200 });
-    if (i18n) {
-        netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 });
-    }
-};
-exports.generateStaticRedirects = generateStaticRedirects;
 /**
  * Routes that match middleware need to always use the SSR function
  * This generates a rewrite for every middleware in every locale, both with and without a splat
@@ -155,7 +141,6 @@ const generateDynamicRewrites = ({ dynamicRoutes, prerenderedDynamicRoutes, midd
 const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, buildId, apiRoutes, }) => {
     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(...generateHiddenPathRedirects({ basePath }));
     if (i18n && i18n.localeDetection !== false) {
         netlifyConfig.redirects.push(...generateLocaleRedirects({ i18n, basePath, trailingSlash }));
     }

package/lib/index.js

@@ -44,10 +44,14 @@ 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, distDir } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
+        const dotNextDir = (0, path_1.join)(appDir, distDir);
+        // This is the *generated* publish dir. The user specifies .next, be we actually use this subdirectory
+        const publishDir = (0, path_1.join)(dotNextDir, 'dist');
+        await (0, fs_extra_1.ensureDir)(publishDir);
         await (0, edge_1.cleanupEdgeFunctions)(constants);
         const middlewareManifest = await (0, edge_1.loadMiddlewareManifest)(netlifyConfig);
         if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) &&
@@ -69,7 +73,7 @@ const plugin = {
         `));
         }
         if ((0, utils_1.isNextAuthInstalled)()) {
-            const config = await (0, config_1.getRequiredServerFiles)(publish);
+            const config = await (0, config_1.getRequiredServerFiles)(dotNextDir);
             const userDefinedNextAuthUrl = config.config.env.NEXTAUTH_URL;
             if (userDefinedNextAuthUrl) {
                 console.log(`NextAuth package detected, NEXTAUTH_URL environment variable set by user in next.config.js to ${userDefinedNextAuthUrl}`);
@@ -79,7 +83,7 @@ const plugin = {
                 const nextAuthUrl = `${process.env.NEXTAUTH_URL}${basePath}`;
                 console.log(`NextAuth package detected, NEXTAUTH_URL environment variable set by user in Netlify configuration to ${nextAuthUrl}`);
                 config.config.env.NEXTAUTH_URL = nextAuthUrl;
-                await (0, config_1.updateRequiredServerFiles)(publish, config);
+                await (0, config_1.updateRequiredServerFiles)(dotNextDir, config);
             }
             else {
                 // Using the deploy prime url in production leads to issues because the unique deploy ID is part of the generated URL
@@ -87,23 +91,20 @@ const plugin = {
                 const nextAuthUrl = `${process.env.CONTEXT === 'production' ? process.env.URL : process.env.DEPLOY_PRIME_URL}${basePath}`;
                 console.log(`NextAuth package detected, setting NEXTAUTH_URL environment variable to ${nextAuthUrl}`);
                 config.config.env.NEXTAUTH_URL = nextAuthUrl;
-                await (0, config_1.updateRequiredServerFiles)(publish, config);
+                await (0, config_1.updateRequiredServerFiles)(dotNextDir, config);
             }
         }
-        const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
-        await (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
-        const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir);
+        const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(dotNextDir, 'BUILD_ID'), 'utf8').trim();
+        await (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), dotNextDir) });
+        const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(dotNextDir, appDir);
         await (0, functions_1.generateFunctions)(constants, appDir, apiRoutes);
         await (0, functions_1.generatePagesResolver)({ target, constants });
-        await (0, files_1.movePublicFiles)({ appDir, outdir, publish });
+        await (0, files_1.movePublicFiles)({ appDir, outdir, publishDir });
         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 });
+            await (0, files_1.moveStaticPages)({ distDir: dotNextDir, i18n, basePath, publishDir });
         }
-        await (0, redirects_1.generateStaticRedirects)({
-            netlifyConfig,
-            nextConfig: { basePath, i18n },
-        });
+        await (0, fs_extra_1.copy)((0, path_1.join)(dotNextDir, 'static'), (0, path_1.join)(publishDir, '_next', 'static'));
         await (0, functions_1.setupImageFunction)({
             constants,
             imageconfig: images,
@@ -120,8 +121,8 @@ const plugin = {
         });
         await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
     },
-    async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
-        await (0, cache_1.saveCache)({ cache, publish });
+    async onPostBuild({ netlifyConfig, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST, PUBLISH_DIR }, }) {
+        await (0, cache_1.saveCache)({ cache, publish: netlifyConfig.build.publish });
         if ((0, utils_1.shouldSkip)()) {
             status.show({
                 title: 'Next Runtime did not run',
@@ -133,12 +134,13 @@ 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 nextConfig = await (0, config_1.getNextConfig)({ publish: netlifyConfig.build.publish, failBuild });
         const { basePath, appDir } = nextConfig;
-        (0, config_1.generateCustomHeaders)(nextConfig, headers);
-        (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
+        (0, config_1.generateCustomHeaders)(nextConfig, netlifyConfig.headers);
+        (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects: netlifyConfig.redirects });
         (0, verification_1.warnForRootRedirects)({ appDir });
         await (0, functions_1.warnOnApiRoutes)({ FUNCTIONS_DIST });
+        netlifyConfig.build.publish = (0, path_1.join)(PUBLISH_DIR, 'dist');
     },
 };
 // The types haven't been updated yet

package/lib/templates/getHandler.js

@@ -92,6 +92,13 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         const { headers, ...result } = await getBridge(event).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);
+        if (event.headers['x-next-debug-logging']) {
+            const response = {
+                headers: multiValueHeaders,
+                statusCode: result.statusCode,
+            };
+            console.log('Origin response:', JSON.stringify(response, null, 2));
+        }
         if ((_b = (_a = multiValueHeaders['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.includes('__prerender_bypass')) {
             delete multiValueHeaders.etag;
             multiValueHeaders['cache-control'] = ['no-cache'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.28.6",
+  "version": "4.29.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.1.9",
+    "@netlify/build": "^28.1.13",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",