@netlify/plugin-nextjs 4.23.0 → 4.23.2

package/lib/helpers/edge.js

@@ -118,7 +118,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
             path: '/_next/image*',
         });
     }
-    if (!process.env.NEXT_DISABLE_NETLIFY_EDGE) {
+    if (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1') {
         const middlewareManifest = await (0, exports.loadMiddlewareManifest)(netlifyConfig);
         if (!middlewareManifest) {
             console.error("Couldn't find the middleware manifest");

package/lib/helpers/files.js

@@ -54,7 +54,7 @@ const matchesRewrite = (file, rewrites) => {
 exports.matchesRewrite = matchesRewrite;
 const getMiddleware = async (publish) => {
     var _a;
-    if (!process.env.NEXT_DISABLE_NETLIFY_EDGE) {
+    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');
@@ -282,19 +282,19 @@ const baseServerReplacements = [
 const nextServerReplacements = [
     [
         `getMiddlewareManifest() {\n        if (this.minimalMode) return null;`,
-        `getMiddlewareManifest() {\n        if (this.minimalMode || !process.env.NEXT_DISABLE_NETLIFY_EDGE) return null;`,
+        `getMiddlewareManifest() {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return null;`,
     ],
     [
         `generateCatchAllMiddlewareRoute(devReady) {\n        if (this.minimalMode) return []`,
-        `generateCatchAllMiddlewareRoute(devReady) {\n        if (this.minimalMode || !process.env.NEXT_DISABLE_NETLIFY_EDGE) return [];`,
+        `generateCatchAllMiddlewareRoute(devReady) {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return [];`,
     ],
     [
         `generateCatchAllMiddlewareRoute() {\n        if (this.minimalMode) return undefined;`,
-        `generateCatchAllMiddlewareRoute() {\n        if (this.minimalMode || !process.env.NEXT_DISABLE_NETLIFY_EDGE) return undefined;`,
+        `generateCatchAllMiddlewareRoute() {\n        if (this.minimalMode || (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1')) return undefined;`,
     ],
     [
         `getMiddlewareManifest() {\n        if (this.minimalMode) {`,
-        `getMiddlewareManifest() {\n        if (!this.minimalMode && process.env.NEXT_DISABLE_NETLIFY_EDGE) {`,
+        `getMiddlewareManifest() {\n        if (!this.minimalMode && (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1')) {`,
     ],
 ];
 const patchNextFiles = async (root) => {

package/lib/index.js

@@ -49,21 +49,21 @@ const plugin = {
         let usingEdge = false;
         if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) && Object.keys(middlewareManifest.functions).length !== 0) {
             usingEdge = true;
-            if (process.env.NEXT_DISABLE_NETLIFY_EDGE) {
+            if (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1') {
                 failBuild((0, outdent_1.outdent) `
           You are using Next.js experimental edge runtime, but have set NEXT_DISABLE_NETLIFY_EDGE to true. This is not supported.
-          To use edge runtime, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`}.
+          To use edge runtime, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`} or set it to false.
         `);
             }
         }
         if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.middleware) && Object.keys(middlewareManifest.middleware).length !== 0) {
             usingEdge = true;
-            if (process.env.NEXT_DISABLE_NETLIFY_EDGE) {
+            if (process.env.NEXT_DISABLE_NETLIFY_EDGE === 'true' || process.env.NEXT_DISABLE_NETLIFY_EDGE === '1') {
                 console.log((0, chalk_1.redBright)((0, outdent_1.outdent) `
             You are using Next.js Middleware without Netlify Edge Functions.
             This is deprecated because it negatively affects performance and will disable ISR and static rendering.
             It also disables advanced middleware features from @netlify/next
-            To get the best performance and use Netlify Edge Functions, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`}.
+            To get the best performance and use Netlify Edge Functions, remove the env var ${(0, chalk_1.bold) `NEXT_DISABLE_NETLIFY_EDGE`} or set it to false.
           `));
             }
         }
@@ -71,10 +71,17 @@ const plugin = {
             const config = await (0, config_1.getRequiredServerFiles)(publish);
             const userDefinedNextAuthUrl = config.config.env.NEXTAUTH_URL;
             if (userDefinedNextAuthUrl) {
-                console.log(`NextAuth package detected, NEXTAUTH_URL environment variable set by user to ${userDefinedNextAuthUrl}`);
+                console.log(`NextAuth package detected, NEXTAUTH_URL environment variable set by user in next.config.js to ${userDefinedNextAuthUrl}`);
+            }
+            else if (process.env.NEXTAUTH_URL) {
+                // When the value is specified in the netlify.toml or the Netlify UI (will be evaluated in this order)
+                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);
             }
             else {
-                const nextAuthUrl = `${process.env.URL}${basePath}`;
+                const nextAuthUrl = `${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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.23.0",
+  "version": "4.23.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -10,7 +10,7 @@
     "manifest.yml"
   ],
   "dependencies": {
-    "@netlify/esbuild": "0.14.25",
+    "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.2.0",
     "@netlify/ipx": "^1.2.5",
     "@vercel/node-bridge": "^2.1.0",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.17.2",
+    "@netlify/build": "^27.18.6",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",