@netlify/edge-bundler 10.1.3 → 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/dist/node/server/server.d.ts

@@ -12,6 +12,7 @@ import type { ModuleGraphJson } from '../vendor/module_graph/module_graph.js';
 export type FormatFunction = (name: string) => string;
 interface StartServerOptions {
     getFunctionsConfig?: boolean;
+    importMapPaths?: string[];
 }
 interface InspectSettings {
     enabled: boolean;
@@ -26,7 +27,6 @@ interface ServeOptions {
     distImportMapPath?: string;
     featureFlags?: FeatureFlags;
     inspectSettings?: InspectSettings;
-    importMapPaths?: string[];
     onAfterDownload?: OnAfterDownloadHook;
     onBeforeDownload?: OnBeforeDownloadHook;
     formatExportTypeError?: FormatFunction;
@@ -37,7 +37,7 @@ interface ServeOptions {
     userLogger?: LogFunction;
     systemLogger?: LogFunction;
 }
-export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, rootPath, servePath, userLogger, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, onAfterDownload, onBeforeDownload, port, rootPath, servePath, userLogger, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
     features: Record<string, boolean>;
     functionsConfig: FunctionConfig[];
     graph: ModuleGraphJson;

package/dist/node/server/server.js

@@ -18,9 +18,10 @@ const cleanDirectory = async (directory, except) => {
     const toBeDeleted = files.filter((file) => !except.includes(join(directory, file)));
     await Promise.all(toBeDeleted.map((file) => unlink(join(directory, file))));
 };
-const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, rootPath, }) => {
+const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, logger, port, rootPath, }) => {
     const processRef = {};
     const startServer = async (functions, env = {}, options = {}) => {
+        var _a;
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
             await killProcess(processRef.ps);
         }
@@ -38,7 +39,8 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
             formatImportError,
         });
         const features = {};
-        const importMap = baseImportMap.clone();
+        const importMap = new ImportMap();
+        await importMap.addFiles((_a = options.importMapPaths) !== null && _a !== void 0 ? _a : [], logger);
         const npmSpecifiersWithExtraneousFiles = [];
         // we keep track of the files that are relevant to the user's code, so we can clean up leftovers from past executions later
         const relevantFiles = [stage2Path];
@@ -138,10 +140,6 @@ formatExportTypeError,
  * a function.
  */
 formatImportError, 
-/**
- * Paths to any additional import map files.
- */
-importMapPaths = [], 
 /**
  * Callback function to be triggered after the Deno CLI has been downloaded.
  */
@@ -205,8 +203,6 @@ systemLogger, }) => {
             flags.push(inspectSettings.address ? `--inspect=${inspectSettings.address}` : '--inspect');
         }
     }
-    const importMap = new ImportMap();
-    await importMap.addFiles(importMapPaths, logger);
     const server = prepareServer({
         basePath,
         bootstrapURL,
@@ -217,7 +213,6 @@ systemLogger, }) => {
         flags,
         formatExportTypeError,
         formatImportError,
-        importMap,
         logger,
         port,
         rootPath,

package/dist/node/server/server.test.js

@@ -19,7 +19,6 @@ test('Starts a server and serves requests for edge functions', async () => {
     const server = await serve({
         basePath,
         bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
-        importMapPaths,
         port,
         servePath,
     });
@@ -39,6 +38,7 @@ test('Starts a server and serves requests for edge functions', async () => {
     ];
     const options = {
         getFunctionsConfig: true,
+        importMapPaths,
     };
     const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(functions, {
         very_secret_secret: 'i love netlify',
@@ -97,7 +97,6 @@ test('Serves edge functions in a monorepo setup', async () => {
     const server = await serve({
         basePath,
         bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
-        importMapPaths,
         port,
         rootPath,
         servePath,
@@ -110,6 +109,7 @@ test('Serves edge functions in a monorepo setup', async () => {
     ];
     const options = {
         getFunctionsConfig: true,
+        importMapPaths,
     };
     const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(functions, {
         very_secret_secret: 'i love netlify',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "10.1.3",
+  "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.6",
+    "esbuild": "0.19.11",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",