@netlify/plugin-nextjs 4.27.2 → 4.27.3

package/lib/helpers/edge.js

@@ -12,6 +12,7 @@ const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const outdent_1 = require("outdent");
 const config_1 = require("./config");
+const matchers_1 = require("./matchers");
 const loadMiddlewareManifest = (netlifyConfig) => {
     const middlewarePath = (0, path_1.resolve)(netlifyConfig.build.publish, 'server', 'middleware-manifest.json');
     if (!(0, fs_1.existsSync)(middlewarePath)) {
@@ -61,7 +62,7 @@ const getMiddlewareBundle = async ({ edgeFunctionDefinition, netlifyConfig, }) =
 };
 const getEdgeTemplatePath = (file) => (0, path_1.join)(__dirname, '..', '..', 'src', 'templates', 'edge', file);
 const copyEdgeSourceFile = ({ file, target, edgeFunctionDir, }) => fs_1.promises.copyFile(getEdgeTemplatePath(file), (0, path_1.join)(edgeFunctionDir, target !== null && target !== void 0 ? target : file));
-const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, netlifyConfig, }) => {
+const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, netlifyConfig, nextConfig, }) => {
     const name = sanitizeName(edgeFunctionDefinition.name);
     const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, name);
     const bundle = await getMiddlewareBundle({
@@ -80,13 +81,19 @@ const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, net
     if ('regexp' in edgeFunctionDefinition) {
         matchers.push({ regexp: edgeFunctionDefinition.regexp });
     }
+    else if (nextConfig.i18n) {
+        matchers.push(...edgeFunctionDefinition.matchers.map((matcher) => ({
+            ...matcher,
+            regexp: (0, matchers_1.makeLocaleOptional)(matcher.regexp),
+        })));
+    }
     else {
         matchers.push(...edgeFunctionDefinition.matchers);
     }
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionDir, 'matchers.json'), matchers);
     // We add a defintion for each matching path
     return matchers.map((matcher) => {
-        const pattern = matcher.regexp;
+        const pattern = (0, matchers_1.stripLookahead)(matcher.regexp);
         return { function: name, pattern, name: edgeFunctionDefinition.name };
     });
 };
@@ -155,6 +162,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
                 edgeFunctionDefinition,
                 edgeFunctionRoot,
                 netlifyConfig,
+                nextConfig,
             });
             manifest.functions.push(...functionDefinitions);
         }
@@ -167,6 +175,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
                     edgeFunctionDefinition,
                     edgeFunctionRoot,
                     netlifyConfig,
+                    nextConfig,
                 });
                 manifest.functions.push(...functionDefinitions);
             }

package/lib/helpers/matchers.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeLocaleOptional = exports.stripLookahead = void 0;
+const regexp_tree_1 = require("regexp-tree");
+// The Go regexp lib doesn't support lookaheads, so we need to remove them
+const stripLookahead = (regex) => {
+    // Early return if there's no lookahead
+    if (!(regex === null || regex === void 0 ? void 0 : regex.includes('(?!'))) {
+        return regex;
+    }
+    try {
+        // Parse the regexp into an AST
+        const re = (0, regexp_tree_1.transform)(`/${regex}/`, {
+            Assertion(path) {
+                // Remove the lookahead
+                if (path.node.kind === 'Lookahead') {
+                    path.remove();
+                }
+            },
+        });
+        // Strip the leading and trailing slashes
+        return re.toString().slice(1, -1);
+    }
+    catch {
+        //  Failed to parse regex, so return unchanged
+        return regex;
+    }
+};
+exports.stripLookahead = stripLookahead;
+const LOCALIZED_REGEX_PREFIX = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))';
+const OPTIONAL_REGEX_PREFIX = '(?:\\/(_next\\/data\\/[^/]{1,}))?(?:\\/([^/.]{1,}))?';
+// Make the locale section of the matcher regex optional
+const makeLocaleOptional = (regex) => regex.replace(LOCALIZED_REGEX_PREFIX, OPTIONAL_REGEX_PREFIX);
+exports.makeLocaleOptional = makeLocaleOptional;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.27.2",
+  "version": "4.27.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -28,13 +28,14 @@
     "p-limit": "^3.1.0",
     "pathe": "^0.2.0",
     "pretty-bytes": "^5.6.0",
+    "regexp-tree": "^0.1.24",
     "semver": "^7.3.5",
     "slash": "^3.0.0",
     "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.1.0",
+    "@netlify/build": "^28.1.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",