@netlify/plugin-nextjs 4.34.0 → 4.35.0

package/lib/helpers/analysis.js

@@ -23,16 +23,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractConfigFromFile = exports.validateConfigValue = void 0;
+exports.extractConfigFromFile = exports.validateConfigValue = exports.isEdgeConfig = void 0;
 const fs_1 = __importStar(require("fs"));
 const pathe_1 = require("pathe");
+const isEdgeConfig = (config) => ['experimental-edge', 'edge'].includes(config);
+exports.isEdgeConfig = isEdgeConfig;
 const validateConfigValue = (config, apiFilePath) => {
     if (config.type === "experimental-scheduled" /* ApiRouteType.SCHEDULED */) {
         if (!config.schedule) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: schedule is required when type is "${"experimental-scheduled" /* ApiRouteType.SCHEDULED */}"`);
             return false;
         }
-        if (config.runtime === 'experimental-edge') {
+        if ((0, exports.isEdgeConfig)(config.runtime)) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: edge runtime is not supported for scheduled functions`);
             return false;
         }
@@ -43,7 +45,7 @@ const validateConfigValue = (config, apiFilePath) => {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: schedule is not allowed unless type is "${"experimental-scheduled" /* ApiRouteType.SCHEDULED */}"`);
             return false;
         }
-        if (config.type && config.runtime === 'experimental-edge') {
+        if (config.type && (0, exports.isEdgeConfig)(config.runtime)) {
             console.error(`Invalid config value in ${(0, pathe_1.relative)(process.cwd(), apiFilePath)}: edge runtime is not supported for background functions`);
             return false;
         }

package/lib/helpers/edge.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.writeRscDataEdgeFunction = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
+exports.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.generateRscDataEdgeManifest = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const chalk_1 = require("chalk");
@@ -130,19 +130,19 @@ exports.writeDevEdgeFunction = writeDevEdgeFunction;
 /**
  * Writes an edge function that routes RSC data requests to the `.rsc` route
  */
-const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManifest, }) => {
+const generateRscDataEdgeManifest = async ({ prerenderManifest, appPathRoutesManifest, }) => {
     if (!prerenderManifest || !appPathRoutesManifest) {
         return [];
     }
     const staticAppdirRoutes = [];
     for (const [path, route] of Object.entries(prerenderManifest.routes)) {
-        if ((0, exports.isAppDirRoute)(route.srcRoute, appPathRoutesManifest)) {
+        if ((0, exports.isAppDirRoute)(route.srcRoute, appPathRoutesManifest) && route.dataRoute) {
             staticAppdirRoutes.push(path, route.dataRoute);
         }
     }
     const dynamicAppDirRoutes = [];
     for (const [path, route] of Object.entries(prerenderManifest.dynamicRoutes)) {
-        if ((0, exports.isAppDirRoute)(path, appPathRoutesManifest)) {
+        if ((0, exports.isAppDirRoute)(path, appPathRoutesManifest) && route.dataRouteRegex) {
             dynamicAppDirRoutes.push(route.routeRegex, route.dataRouteRegex);
         }
     }
@@ -165,7 +165,7 @@ const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManife
         })),
     ];
 };
-exports.writeRscDataEdgeFunction = writeRscDataEdgeFunction;
+exports.generateRscDataEdgeManifest = generateRscDataEdgeManifest;
 const getEdgeFunctionPatternForPage = ({ edgeFunctionDefinition, pageRegexMap, appPathRoutesManifest, }) => {
     // We don't just use the matcher from the edge function definition, because it doesn't handle trailing slashes
     var _a, _b;
@@ -206,7 +206,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         console.log('Environment variable NEXT_DISABLE_NETLIFY_EDGE has been set, skipping Netlify Edge Function creation.');
         return;
     }
-    const rscFunctions = await (0, exports.writeRscDataEdgeFunction)({
+    const rscFunctions = await (0, exports.generateRscDataEdgeManifest)({
         prerenderManifest: await (0, exports.loadPrerenderManifest)(netlifyConfig),
         appPathRoutesManifest: await (0, exports.loadAppPathRoutesManifest)(netlifyConfig),
     });

package/lib/helpers/functions.js

@@ -25,7 +25,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
     const publishDir = (0, pathe_1.relative)(functionDir, publish);
     for (const { route, config, compiled } of apiRoutes) {
         // Don't write a lambda if the runtime is edge
-        if (config.runtime === 'experimental-edge') {
+        if ((0, analysis_1.isEdgeConfig)(config.runtime)) {
             continue;
         }
         const apiHandlerSource = await (0, getApiHandler_1.getApiHandler)({

package/lib/templates/handlerUtils.js

@@ -91,7 +91,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     // Grab the real fs.promises.readFile...
     const readfileOrig = promises.readFile;
     const statsOrig = promises.stat;
-    // ...then money-patch it to see if it's requesting a CDN file
+    // ...then monkey-patch it to see if it's requesting a CDN file
     promises.readFile = (async (file, options) => {
         const baseUrl = getBase();
         // We only care about page files

package/package.json

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

package/src/templates/edge-shared/rsc-data.ts

@@ -44,7 +44,7 @@ export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: Preren
   )
 
   const dynamicRouteMatcher = Object.values(dynamicRoutes)
-    .filter(({ dataRoute }) => dataRoute.endsWith('.rsc'))
+    .filter(({ dataRoute }) => dataRoute?.endsWith('.rsc'))
     .map(({ routeRegex }) => new RegExp(routeRegex))
 
   const matchesDynamicRscDataRoute = (pathname: string) => {