@netlify/edge-bundler 11.0.0 → 11.1.0

package/dist/node/feature_flags.d.ts

@@ -1,6 +1,10 @@
-declare const defaultFlags: {};
+declare const defaultFlags: {
+    edge_bundler_pcre_regexp: boolean;
+};
 type FeatureFlag = keyof typeof defaultFlags;
 type FeatureFlags = Partial<Record<FeatureFlag, boolean>>;
-declare const getFlags: (input?: Record<string, boolean>, flags?: {}) => FeatureFlags;
+declare const getFlags: (input?: Record<string, boolean>, flags?: {
+    edge_bundler_pcre_regexp: boolean;
+}) => FeatureFlags;
 export { defaultFlags, getFlags };
 export type { FeatureFlag, FeatureFlags };

package/dist/node/feature_flags.js

@@ -1,4 +1,6 @@
-const defaultFlags = {};
+const defaultFlags = {
+    edge_bundler_pcre_regexp: false,
+};
 const getFlags = (input = {}, flags = defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({
     ...result,
     [key]: input[key] === undefined ? defaultValue : input[key],

package/dist/node/manifest.d.ts

@@ -42,7 +42,7 @@ interface GenerateManifestOptions {
     layers?: Layer[];
     userFunctionConfig?: Record<string, FunctionConfig>;
 }
-declare const generateManifest: ({ bundles, declarations, functions, userFunctionConfig, internalFunctionConfig, importMap, layers, }: GenerateManifestOptions) => {
+declare const generateManifest: ({ bundles, declarations, featureFlags, functions, userFunctionConfig, internalFunctionConfig, importMap, layers, }: GenerateManifestOptions) => {
     declarationsWithoutFunction: string[];
     manifest: Manifest;
     unroutedFunctions: string[];

package/dist/node/manifest.js

@@ -46,7 +46,7 @@ const normalizeMethods = (method, name) => {
         return method.toUpperCase();
     });
 };
-const generateManifest = ({ bundles = [], declarations = [], functions, userFunctionConfig = {}, internalFunctionConfig = {}, importMap, layers = [], }) => {
+const generateManifest = ({ bundles = [], declarations = [], featureFlags, functions, userFunctionConfig = {}, internalFunctionConfig = {}, importMap, layers = [], }) => {
     const preCacheRoutes = [];
     const postCacheRoutes = [];
     const manifestFunctionConfig = Object.fromEntries(functions.map(({ name }) => [name, { excluded_patterns: [] }]));
@@ -74,14 +74,14 @@ const generateManifest = ({ bundles = [], declarations = [], functions, userFunc
             declarationsWithoutFunction.add(declaration.function);
             return;
         }
-        const pattern = getRegularExpression(declaration);
+        const pattern = getRegularExpression(declaration, Boolean(featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.edge_bundler_pcre_regexp));
         // If there is no `pattern`, the declaration will never be triggered, so we
         // can discard it.
         if (!pattern) {
             return;
         }
         routedFunctions.add(declaration.function);
-        const excludedPattern = getExcludedRegularExpressions(declaration);
+        const excludedPattern = getExcludedRegularExpressions(declaration, Boolean(featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.edge_bundler_pcre_regexp));
         const route = {
             function: func.name,
             pattern: serializePattern(pattern),
@@ -135,8 +135,11 @@ const pathToRegularExpression = (path) => {
         throw wrapBundleError(error);
     }
 };
-const getRegularExpression = (declaration) => {
+const getRegularExpression = (declaration, pcreRegexpEngine) => {
     if ('pattern' in declaration) {
+        if (pcreRegexpEngine) {
+            return declaration.pattern;
+        }
         try {
             return parsePattern(declaration.pattern);
         }
@@ -146,11 +149,14 @@ const getRegularExpression = (declaration) => {
     }
     return pathToRegularExpression(declaration.path);
 };
-const getExcludedRegularExpressions = (declaration) => {
+const getExcludedRegularExpressions = (declaration, pcreRegexpEngine) => {
     if ('excludedPattern' in declaration && declaration.excludedPattern) {
         const excludedPatterns = Array.isArray(declaration.excludedPattern)
             ? declaration.excludedPattern
             : [declaration.excludedPattern];
+        if (pcreRegexpEngine) {
+            return excludedPatterns;
+        }
         return excludedPatterns.map((excludedPattern) => {
             try {
                 return parsePattern(excludedPattern);

package/dist/node/manifest.test.js

@@ -386,15 +386,29 @@ test('Generates a manifest with layers', () => {
     expect(manifest2.routes).toEqual(expectedRoutes);
     expect(manifest2.layers).toEqual(layers);
 });
-test('Throws an error if the regular expression contains a negative lookahead', () => {
+test('Throws an error if the regular expression contains a negative lookahead and support for the PCRE engine is disabled', () => {
     const functions = [{ name: 'func-1', path: '/path/to/func-1.ts' }];
-    const declarations = [{ function: 'func-1', pattern: '^/\\w+(?=\\d)$' }];
+    const declarations = [{ function: 'func-1', pattern: '^\\/((?!api|_next\\/static|_next\\/image|favicon.ico).*)$' }];
     expect(() => generateManifest({
         bundles: [],
         declarations,
         functions,
     })).toThrowError(/^Could not parse path declaration of function 'func-1': Regular expressions with lookaheads are not supported$/);
 });
+test('Accepts regular expressions with lookaheads if support for the PCRE engine is enabled', () => {
+    const functions = [{ name: 'func-1', path: '/path/to/func-1.ts' }];
+    const declarations = [{ function: 'func-1', pattern: '^\\/((?!api|_next\\/static|_next\\/image|favicon.ico).*)$' }];
+    const { manifest } = generateManifest({
+        bundles: [],
+        declarations,
+        featureFlags: { edge_bundler_pcre_regexp: true },
+        functions,
+    });
+    const [route] = manifest.routes;
+    const regexp = new RegExp(route.pattern);
+    expect(regexp.test('/foo')).toBeTruthy();
+    expect(regexp.test('/_next/static/foo')).toBeFalsy();
+});
 test('Converts named capture groups to unnamed capture groups in regular expressions', () => {
     const functions = [{ name: 'func-1', path: '/path/to/func-1.ts' }];
     const declarations = [{ function: 'func-1', pattern: '^/(?<name>\\w+)$' }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -75,13 +75,13 @@
   },
   "dependencies": {
     "@import-maps/resolve": "^1.0.1",
-    "@vercel/nft": "^0.24.3",
+    "@vercel/nft": "^0.26.0",
     "ajv": "^8.11.2",
     "ajv-errors": "^3.0.0",
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.19.9",
+    "esbuild": "0.19.11",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",