@netlify/plugin-nextjs 4.30.1 → 4.30.2

package/lib/helpers/config.js

@@ -9,6 +9,7 @@ const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
 const constants_1 = require("../constants");
+const utils_1 = require("./utils");
 const ROUTES_MANIFEST_FILE = 'routes-manifest.json';
 const defaultFailBuild = (message, { error }) => {
     throw new Error(`${message}\n${error && error.stack}`);
@@ -133,7 +134,8 @@ const generateCustomHeaders = (nextConfig, netlifyHeaders = []) => {
         const useLocale = ((_a = i18n === null || i18n === void 0 ? void 0 : i18n.locales) === null || _a === void 0 ? void 0 : _a.length) > 0 && localeEnabled !== false;
         if (useLocale) {
             const { locales } = i18n;
-            const joinedLocales = locales.join('|');
+            // escape the locale strings to match the way Next writes the routes-manifest.json file
+            const joinedLocales = locales.map((locale) => (0, utils_1.escapeStringRegexp)(locale)).join('|');
             /**
              *  converts e.g.
              *  /:nextInternalLocale(en|fr)/some-path

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.writeRscDataEdgeFunction = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
+exports.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.writeRscDataEdgeFunction = 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");
@@ -212,12 +212,19 @@ const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManife
 exports.writeRscDataEdgeFunction = writeRscDataEdgeFunction;
 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;
+    var _a, _b;
     // appDir functions have a name that _isn't_ the route name, but rather the route with `/page` appended
     const regexp = pageRegexMap.get((_a = appPathRoutesManifest === null || appPathRoutesManifest === void 0 ? void 0 : appPathRoutesManifest[edgeFunctionDefinition.page]) !== null && _a !== void 0 ? _a : edgeFunctionDefinition.page);
+    if (regexp) {
+        return regexp;
+    }
+    if ('regexp' in edgeFunctionDefinition) {
+        return edgeFunctionDefinition.regexp.replace(/([^/])\$$/, '$1/?$');
+    }
     // If we need to fall back to the matcher, we need to add an optional trailing slash
-    return regexp !== null && regexp !== void 0 ? regexp : edgeFunctionDefinition.matchers[0].regexp.replace(/([^/])\$$/, '$1/?$');
+    return (_b = edgeFunctionDefinition.matchers) === null || _b === void 0 ? void 0 : _b[0].regexp.replace(/([^/])\$$/, '$1/?$');
 };
+exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
 /**
  * Writes Edge Functions for the Next middleware
  */
@@ -298,7 +305,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
                     netlifyConfig,
                     functionName,
                 });
-                const pattern = getEdgeFunctionPatternForPage({
+                const pattern = (0, exports.getEdgeFunctionPatternForPage)({
                     edgeFunctionDefinition,
                     pageRegexMap,
                     appPathRoutesManifest,

package/lib/helpers/utils.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.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNext404Route = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.localizeRoute = exports.routeToDataRoute = exports.generateNetlifyRoutes = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
+exports.escapeStringRegexp = exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNext404Route = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.localizeRoute = exports.routeToDataRoute = exports.generateNetlifyRoutes = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
 const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -207,3 +207,8 @@ const getRemotePatterns = (experimental, images) => {
     return [];
 };
 exports.getRemotePatterns = getRemotePatterns;
+// Taken from next/src/shared/lib/escape-regexp.ts
+const reHasRegExp = /[|\\{}()[\]^$+*?.-]/;
+const reReplaceRegExp = /[|\\{}()[\]^$+*?.-]/g;
+const escapeStringRegexp = (str) => (reHasRegExp.test(str) ? str.replace(reReplaceRegExp, '\\$&') : str);
+exports.escapeStringRegexp = escapeStringRegexp;

package/package.json

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