@netlify/plugin-nextjs 4.0.0-beta.4 → 4.0.0-beta.5

package/lib/helpers/config.js

@@ -1,5 +1,5 @@
 // @ts-check
-const { readJSON } = require('fs-extra');
+const { readJSON, existsSync } = require('fs-extra');
 const { join, dirname, relative } = require('pathe');
 const slash = require('slash');
 const defaultFailBuild = (message, { error }) => {
@@ -59,12 +59,23 @@ exports.generateRedirects = async ({ netlifyConfig, basePath, i18n }) => {
     if (i18n) {
         netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 });
     }
+    const staticManifest = join(netlifyConfig.build.publish, 'static-manifest.json');
+    if (process.env.EXPERIMENTAL_MOVE_STATIC_PAGES && existsSync(staticManifest)) {
+        // Static page files need to have a forced redirect for preview mode. Otherwise it's non-forced
+        const staticFiles = await readJSON(staticManifest);
+        netlifyConfig.redirects.push(...staticFiles.map((file) => ({
+            from: `${basePath}/${file}`,
+            to: HANDLER_FUNCTION_PATH,
+            status: 200,
+            force: true,
+            conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
+        })));
+    }
     // This is only used in prod, so dev uses `next dev` directly
     netlifyConfig.redirects.push({ from: `${basePath}/_next/static/*`, to: `/static/:splat`, status: 200 }, {
         from: `${basePath}/*`,
         to: HANDLER_FUNCTION_PATH,
         status: 200,
-        force: true,
         conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
     }, ...redirects.map((redirect) => ({
         from: `${basePath}${redirect}`,
@@ -92,6 +103,7 @@ const resolveModuleRoot = (moduleName) => {
         return null;
     }
 };
+const DEFAULT_EXCLUDED_MODULES = ['sharp', 'electron'];
 exports.configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
     var _a;
     /* eslint-disable no-underscore-dangle */
@@ -102,18 +114,16 @@ exports.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(`${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, ...ignore.map((path) => `!${slash(path)}`));
+        netlifyConfig.functions[functionName].included_files.push(`${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, ...ignore.map((path) => `!${slash(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`);
         }
-        const sharpRoot = resolveModuleRoot('sharp');
-        if (sharpRoot) {
-            netlifyConfig.functions[functionName].included_files.push(`!${sharpRoot}/**/*`);
-        }
-        const electronRoot = resolveModuleRoot('electron');
-        if (electronRoot) {
-            netlifyConfig.functions[functionName].included_files.push(`!${electronRoot}/**/*`);
-        }
+        DEFAULT_EXCLUDED_MODULES.forEach((moduleName) => {
+            const moduleRoot = resolveModuleRoot(moduleName);
+            if (moduleRoot) {
+                netlifyConfig.functions[functionName].included_files.push(`!${moduleRoot}/**/*`);
+            }
+        });
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -58,7 +58,7 @@
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
     "moize": "^6.1.0",
-    "node-fetch": "^2.6.5",
+    "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
     "outdent": "^0.8.0",
     "p-limit": "^3.1.0",
@@ -83,7 +83,7 @@
     "husky": "^4.3.0",
     "jest": "^27.0.0",
     "netlify-plugin-cypress": "^2.2.0",
-    "next": "^11.1.2",
+    "next": "^12.0.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "react": "^17.0.1",