@netlify/plugin-nextjs 4.2.8 → 4.3.2

package/lib/helpers/config.js

@@ -48,7 +48,7 @@ const configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
         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`);
+            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`);
         }
         DEFAULT_EXCLUDED_MODULES.forEach((moduleName) => {
             const moduleRoot = resolveModuleRoot(moduleName);

package/lib/helpers/files.js

@@ -54,6 +54,9 @@ const matchesRewrite = (file, rewrites) => {
 exports.matchesRewrite = matchesRewrite;
 const getMiddleware = async (publish) => {
     var _a;
+    if (process.env.NEXT_SKIP_MIDDLEWARE) {
+        return [];
+    }
     const manifestPath = (0, pathe_1.join)(publish, 'server', 'middleware-manifest.json');
     if ((0, fs_extra_1.existsSync)(manifestPath)) {
         const manifest = await (0, fs_extra_1.readJson)(manifestPath, { throws: false });

package/lib/templates/getHandler.js

@@ -14,9 +14,12 @@ const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = requ
 // eslint-disable-next-line max-params
 const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
-    // Change working directory into the site root
+    // Change working directory into the site root, unless using Nx, which moves the
+    // dist directory and handles this itself
     const dir = path.resolve(__dirname, app);
-    process.chdir(dir);
+    if (pageRoot.startsWith(dir)) {
+        process.chdir(dir);
+    }
     // This is just so nft knows about the page entrypoints. It's not actually used
     try {
         // eslint-disable-next-line node/no-missing-require
@@ -30,6 +33,9 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
     // This is our flag that we use when patching the source
     // eslint-disable-next-line no-underscore-dangle
     process.env._BYPASS_SSG = 'true';
+    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;
     augmentFsModule({ promises, staticManifest, pageRoot, getBase: () => base });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.2.8",
+  "version": "4.3.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -60,7 +60,7 @@
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
     "moize": "^6.1.0",
-    "next": "^12.0.10",
+    "next": "^12.1.4",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
     "outdent": "^0.8.0",
@@ -75,8 +75,8 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.5.0",
-    "@netlify/eslint-config-node": "^5.1.6",
+    "@netlify/build": "^26.5.2",
+    "@netlify/eslint-config-node": "^5.1.8",
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
     "@testing-library/cypress": "^8.0.1",