@netlify/plugin-nextjs 4.9.2 → 4.10.1

package/lib/helpers/edge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateConfig = exports.writeEdgeFunctions = void 0;
+exports.updateConfig = exports.writeEdgeFunctions = exports.loadMiddlewareManifest = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -11,6 +11,7 @@ const loadMiddlewareManifest = (netlifyConfig) => {
     }
     return (0, fs_extra_1.readJson)(middlewarePath);
 };
+exports.loadMiddlewareManifest = loadMiddlewareManifest;
 /**
  * Convert the Next middleware name into a valid Edge Function name
  */
@@ -69,7 +70,7 @@ const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, net
  * Writes Edge Functions for the Next middleware
  */
 const writeEdgeFunctions = async (netlifyConfig) => {
-    const middlewareManifest = await loadMiddlewareManifest(netlifyConfig);
+    const middlewareManifest = await (0, exports.loadMiddlewareManifest)(netlifyConfig);
     if (!middlewareManifest) {
         console.error("Couldn't find the middleware manifest");
         return;
@@ -94,13 +95,17 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         });
         manifest.functions.push(functionDefinition);
     }
-    for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
-        const functionDefinition = await writeEdgeFunction({
-            edgeFunctionDefinition,
-            edgeFunctionRoot,
-            netlifyConfig,
-        });
-        manifest.functions.push(functionDefinition);
+    // Older versions of the manifest format don't have the functions field
+    // No, the version field was not incremented
+    if (typeof middlewareManifest.functions === 'object') {
+        for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
+            const functionDefinition = await writeEdgeFunction({
+                edgeFunctionDefinition,
+                edgeFunctionRoot,
+                netlifyConfig,
+            });
+            manifest.functions.push(functionDefinition);
+        }
     }
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionRoot, 'manifest.json'), manifest);
 };

package/lib/index.js

@@ -34,6 +34,7 @@ const plugin = {
         netlifyConfig.build.environment.NEXT_PRIVATE_TARGET = 'server';
     },
     async onBuild({ constants, netlifyConfig, utils: { build: { failBuild }, }, }) {
+        var _a;
         if ((0, utils_1.shouldSkip)()) {
             return;
         }
@@ -93,6 +94,14 @@ const plugin = {
             await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
             await (0, edge_1.updateConfig)(publish);
         }
+        const middlewareManifest = await (0, edge_1.loadMiddlewareManifest)(netlifyConfig);
+        if (!process.env.NEXT_USE_NETLIFY_EDGE && ((_a = middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.sortedMiddleware) === null || _a === void 0 ? void 0 : _a.length)) {
+            console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
+          You are using Next.js Middleware without Netlify Edge Functions.
+          This will soon be deprecated because it negatively affects performance and will disable ISR and static rendering.
+          To get the best performance and use Netlify Edge Functions, set the env var ${(0, chalk_1.bold) `NEXT_USE_NETLIFY_EDGE=true`}.
+        `));
+        }
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
         await (0, cache_1.saveCache)({ cache, publish });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.9.2",
+  "version": "4.10.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -28,11 +28,11 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.2.0",
+    "@netlify/build": "^27.3.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
-    "next": "^12.1.7-canary.33",
+    "next": "^12.2.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },