@netlify/edge-bundler 8.11.0 → 8.12.0

package/dist/node/bundler.js

@@ -6,7 +6,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { importMapSpecifier } from '../shared/consts.js';
 import { DenoBridge } from './bridge.js';
 import { getFunctionConfig } from './config.js';
-import { getDeclarationsFromConfig } from './declaration.js';
+import { mergeDeclarations } from './declaration.js';
 import { load as loadDeployConfig } from './deploy_config.js';
 import { getFlags } from './feature_flags.js';
 import { findFunctions } from './finder.js';
@@ -66,7 +66,7 @@ const bundle = async (sourceDirectories, distDirectory, tomlDeclarations = [], {
     const functionsWithConfig = functions.reduce((acc, func, index) => ({ ...acc, [func.name]: functionsConfig[index] }), {});
     // Creating a final declarations array by combining the TOML file with the
     // deploy configuration API and the in-source configuration.
-    const declarationsFromConfig = getDeclarationsFromConfig(tomlDeclarations, functionsWithConfig, deployConfig);
+    const declarationsFromConfig = mergeDeclarations(tomlDeclarations, functionsWithConfig, deployConfig.declarations);
     // If any declarations are autogenerated and are missing the generator field
     // add a default string.
     const declarations = internalFunctionsPath

package/dist/node/declaration.d.ts

@@ -1,5 +1,4 @@
 import { FunctionConfig } from './config.js';
-import type { DeployConfig } from './deploy_config.js';
 interface BaseDeclaration {
     cache?: string;
     function: string;
@@ -14,7 +13,7 @@ type DeclarationWithPattern = BaseDeclaration & {
     pattern: string;
     excludedPattern?: string;
 };
-type Declaration = DeclarationWithPath | DeclarationWithPattern;
-export declare const getDeclarationsFromConfig: (tomlDeclarations: Declaration[], functionsConfig: Record<string, FunctionConfig>, deployConfig: DeployConfig) => Declaration[];
+export type Declaration = DeclarationWithPath | DeclarationWithPattern;
+export declare const mergeDeclarations: (tomlDeclarations: Declaration[], functionsConfig: Record<string, FunctionConfig>, deployConfigDeclarations: Declaration[]) => Declaration[];
 export declare const parsePattern: (pattern: string) => string;
-export { Declaration, DeclarationWithPath, DeclarationWithPattern };
+export {};

package/dist/node/declaration.js

@@ -1,5 +1,5 @@
 import regexpAST from 'regexp-tree';
-export const getDeclarationsFromConfig = (tomlDeclarations, functionsConfig, deployConfig) => {
+export const mergeDeclarations = (tomlDeclarations, functionsConfig, deployConfigDeclarations) => {
     var _a;
     const declarations = [];
     const functionsVisited = new Set();
@@ -7,23 +7,22 @@ export const getDeclarationsFromConfig = (tomlDeclarations, functionsConfig, dep
     // the deploy configuration file. For any declaration for which we also have
     // a function configuration object, we replace the path because that object
     // takes precedence.
-    for (const declaration of [...tomlDeclarations, ...deployConfig.declarations]) {
+    for (const declaration of [...tomlDeclarations, ...deployConfigDeclarations]) {
         const config = functionsConfig[declaration.function];
-        // If no config is found, add the declaration as is
         if (!config) {
+            // If no config is found, add the declaration as is.
             declarations.push(declaration);
-            // If we have a path specified as either a string or non-empty array
-            // create a declaration for each path
         }
         else if ((_a = config.path) === null || _a === void 0 ? void 0 : _a.length) {
+            // If we have a path specified as either a string or non-empty array,
+            // create a declaration for each path.
             const paths = Array.isArray(config.path) ? config.path : [config.path];
             paths.forEach((path) => {
                 declarations.push({ ...declaration, cache: config.cache, path });
             });
-            // With an in-source config without a path, add the config to the declaration
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            // With an in-source config without a path, add the config to the declaration.
             const { path, excludedPath, ...rest } = config;
             declarations.push({ ...declaration, ...rest });
         }
@@ -33,7 +32,7 @@ export const getDeclarationsFromConfig = (tomlDeclarations, functionsConfig, dep
     // in the TOML at all.
     for (const name in functionsConfig) {
         const { cache, path } = functionsConfig[name];
-        // If we have path specified create a declaration for each path
+        // If we have a path specified, create a declaration for each path.
         if (!functionsVisited.has(name) && path) {
             const paths = Array.isArray(path) ? path : [path];
             paths.forEach((singlePath) => {

package/dist/node/declaration.test.js

@@ -1,10 +1,7 @@
 import { test, expect } from 'vitest';
-import { getDeclarationsFromConfig } from './declaration.js';
+import { mergeDeclarations } from './declaration.js';
 // TODO: Add tests with the deploy config.
-const deployConfig = {
-    declarations: [],
-    layers: [],
-};
+const deployConfigDeclarations = [];
 test('In-source config takes precedence over netlify.toml config', () => {
     const tomlConfig = [
         { function: 'geolocation', path: '/geo', cache: 'off' },
@@ -19,7 +16,7 @@ test('In-source config takes precedence over netlify.toml config', () => {
         { function: 'geolocation', path: '/*', cache: 'manual' },
         { function: 'json', path: '/json', cache: 'off' },
     ];
-    const declarations = getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig);
+    const declarations = mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations);
     expect(declarations).toEqual(expectedDeclarations);
 });
 test("Declarations don't break if no in-source config is provided", () => {
@@ -35,7 +32,7 @@ test("Declarations don't break if no in-source config is provided", () => {
         { function: 'geolocation', path: '/geo-isc', cache: 'manual' },
         { function: 'json', path: '/json', cache: 'manual' },
     ];
-    const declarations = getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig);
+    const declarations = mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations);
     expect(declarations).toEqual(expectedDeclarations);
 });
 test('In-source config works independent of the netlify.toml file if a path is defined and otherwise if no path is set', () => {
@@ -52,9 +49,9 @@ test('In-source config works independent of the netlify.toml file if a path is d
         { function: 'json', path: '/json-isc', cache: 'off' },
     ];
     const expectedDeclarationsWithoutISCPath = [{ function: 'geolocation', path: '/geo', cache: 'off' }];
-    const declarationsWithISCPath = getDeclarationsFromConfig(tomlConfig, funcConfigWithPath, deployConfig);
+    const declarationsWithISCPath = mergeDeclarations(tomlConfig, funcConfigWithPath, deployConfigDeclarations);
     expect(declarationsWithISCPath).toEqual(expectedDeclarationsWithISCPath);
-    const declarationsWithoutISCPath = getDeclarationsFromConfig(tomlConfig, funcConfigWithoutPath, deployConfig);
+    const declarationsWithoutISCPath = mergeDeclarations(tomlConfig, funcConfigWithoutPath, deployConfigDeclarations);
     expect(declarationsWithoutISCPath).toEqual(expectedDeclarationsWithoutISCPath);
 });
 test('In-source config works if only the cache config property is set', () => {
@@ -63,7 +60,7 @@ test('In-source config works if only the cache config property is set', () => {
         geolocation: { cache: 'manual' },
     };
     const expectedDeclarations = [{ function: 'geolocation', path: '/geo', cache: 'manual' }];
-    expect(getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig)).toEqual(expectedDeclarations);
+    expect(mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations)).toEqual(expectedDeclarations);
 });
 test("In-source config path property works if it's not an array", () => {
     const tomlConfig = [{ function: 'json', path: '/json-toml', cache: 'off' }];
@@ -71,7 +68,7 @@ test("In-source config path property works if it's not an array", () => {
         json: { path: '/json', cache: 'manual' },
     };
     const expectedDeclarations = [{ function: 'json', path: '/json', cache: 'manual' }];
-    expect(getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig)).toEqual(expectedDeclarations);
+    expect(mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations)).toEqual(expectedDeclarations);
 });
 test("In-source config path property works if it's not an array and it's not present in toml or deploy config", () => {
     const tomlConfig = [{ function: 'geolocation', path: '/geo', cache: 'off' }];
@@ -82,7 +79,7 @@ test("In-source config path property works if it's not an array and it's not pre
         { function: 'geolocation', path: '/geo', cache: 'off' },
         { function: 'json', path: '/json-isc', cache: 'manual' },
     ];
-    expect(getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig)).toEqual(expectedDeclarations);
+    expect(mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations)).toEqual(expectedDeclarations);
 });
 test('In-source config works if path property is an empty array with cache value specified', () => {
     const tomlConfig = [{ function: 'json', path: '/json-toml', cache: 'off' }];
@@ -90,12 +87,12 @@ test('In-source config works if path property is an empty array with cache value
         json: { path: [], cache: 'manual' },
     };
     const expectedDeclarations = [{ function: 'json', path: '/json-toml', cache: 'manual' }];
-    expect(getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig)).toEqual(expectedDeclarations);
+    expect(mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations)).toEqual(expectedDeclarations);
 });
 test('netlify.toml-defined excludedPath are respected', () => {
     const tomlConfig = [{ function: 'geolocation', path: '/geo/*', excludedPath: '/geo/exclude' }];
     const funcConfig = {};
     const expectedDeclarations = [{ function: 'geolocation', path: '/geo/*', excludedPath: '/geo/exclude' }];
-    const declarations = getDeclarationsFromConfig(tomlConfig, funcConfig, deployConfig);
+    const declarations = mergeDeclarations(tomlConfig, funcConfig, deployConfigDeclarations);
     expect(declarations).toEqual(expectedDeclarations);
 });

package/dist/node/formats/javascript.d.ts

@@ -1,17 +1,18 @@
 import { EdgeFunction } from '../edge_function.js';
 import type { FormatFunction } from '../server/server.js';
 interface GenerateStage2Options {
+    bootstrapURL: string;
     distDirectory: string;
     fileName: string;
     formatExportTypeError?: FormatFunction;
     formatImportError?: FormatFunction;
     functions: EdgeFunction[];
 }
-declare const generateStage2: ({ distDirectory, fileName, formatExportTypeError, formatImportError, functions, }: GenerateStage2Options) => Promise<string>;
-declare const getBootstrapURL: () => string;
+declare const generateStage2: ({ bootstrapURL, distDirectory, fileName, formatExportTypeError, formatImportError, functions, }: GenerateStage2Options) => Promise<string>;
 interface GetLocalEntryPointOptions {
+    bootstrapURL: string;
     formatExportTypeError?: FormatFunction;
     formatImportError?: FormatFunction;
 }
-declare const getLocalEntryPoint: (functions: EdgeFunction[], { formatExportTypeError, formatImportError, }: GetLocalEntryPointOptions) => string;
-export { generateStage2, getBootstrapURL, getLocalEntryPoint };
+declare const getLocalEntryPoint: (functions: EdgeFunction[], { bootstrapURL, formatExportTypeError, formatImportError, }: GetLocalEntryPointOptions) => string;
+export { generateStage2, getLocalEntryPoint };

package/dist/node/formats/javascript.js

@@ -1,25 +1,22 @@
 import { promises as fs } from 'fs';
 import { join } from 'path';
-import { env } from 'process';
 import { pathToFileURL } from 'url';
 import { deleteAsync } from 'del';
-const BOOTSTRAP_LATEST = 'https://64071f3033a1800007cc20f8--edge.netlify.com/bootstrap/index-combined.ts';
 const defaultFormatExportTypeError = (name) => `The Edge Function "${name}" has failed to load. Does it have a function as the default export?`;
 const defaultFormatImpoortError = (name) => `There was an error with Edge Function "${name}".`;
-const generateStage2 = async ({ distDirectory, fileName, formatExportTypeError, formatImportError, functions, }) => {
+const generateStage2 = async ({ bootstrapURL, distDirectory, fileName, formatExportTypeError, formatImportError, functions, }) => {
     await deleteAsync(distDirectory, { force: true });
     await fs.mkdir(distDirectory, { recursive: true });
-    const entryPoint = getLocalEntryPoint(functions, { formatExportTypeError, formatImportError });
+    const entryPoint = getLocalEntryPoint(functions, { bootstrapURL, formatExportTypeError, formatImportError });
     const stage2Path = join(distDirectory, fileName);
     await fs.writeFile(stage2Path, entryPoint);
     return stage2Path;
 };
-const getBootstrapURL = () => { var _a; return (_a = env.NETLIFY_EDGE_BOOTSTRAP) !== null && _a !== void 0 ? _a : BOOTSTRAP_LATEST; };
 // For the local development environment, we import the user functions with
 // dynamic imports to gracefully handle the case where the file doesn't have
 // a valid default export.
-const getLocalEntryPoint = (functions, { formatExportTypeError = defaultFormatExportTypeError, formatImportError = defaultFormatImpoortError, }) => {
-    const bootImport = `import { boot } from "${getBootstrapURL()}";`;
+const getLocalEntryPoint = (functions, { bootstrapURL, formatExportTypeError = defaultFormatExportTypeError, formatImportError = defaultFormatImpoortError, }) => {
+    const bootImport = `import { boot } from "${bootstrapURL}";`;
     const declaration = `const functions = {}; const metadata = { functions: {} };`;
     const imports = functions.map((func) => {
         const url = pathToFileURL(func.path);
@@ -45,4 +42,4 @@ const getLocalEntryPoint = (functions, { formatExportTypeError = defaultFormatEx
     const bootCall = `boot(functions, metadata);`;
     return [bootImport, declaration, ...imports, bootCall].join('\n\n');
 };
-export { generateStage2, getBootstrapURL, getLocalEntryPoint };
+export { generateStage2, getLocalEntryPoint };

package/dist/node/index.d.ts

@@ -1,5 +1,8 @@
 export { bundle } from './bundler.js';
 export { DenoBridge } from './bridge.js';
+export type { FunctionConfig } from './config.js';
+export { Declaration, mergeDeclarations } from './declaration.js';
+export type { EdgeFunction } from './edge_function.js';
 export { findFunctions as find } from './finder.js';
 export { generateManifest } from './manifest.js';
 export { serve } from './server/server.js';

package/dist/node/index.js

@@ -1,5 +1,6 @@
 export { bundle } from './bundler.js';
 export { DenoBridge } from './bridge.js';
+export { mergeDeclarations } from './declaration.js';
 export { findFunctions as find } from './finder.js';
 export { generateManifest } from './manifest.js';
 export { serve } from './server/server.js';

package/dist/node/server/server.d.ts

@@ -17,6 +17,7 @@ interface InspectSettings {
     address?: string;
 }
 interface ServeOptions {
+    bootstrapURL: string;
     certificatePath?: string;
     debug?: boolean;
     distImportMapPath?: string;
@@ -29,7 +30,7 @@ interface ServeOptions {
     port: number;
     systemLogger?: LogFunction;
 }
-declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+declare const serve: ({ bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
     functionsConfig: FunctionConfig[];
     graph: any;
     success: boolean;

package/dist/node/server/server.js

@@ -6,7 +6,7 @@ import { ImportMap } from '../import_map.js';
 import { getLogger } from '../logger.js';
 import { ensureLatestTypes } from '../types.js';
 import { killProcess, waitForServer } from './util.js';
-const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, importMap, logger, port, }) => {
+const prepareServer = ({ bootstrapURL, deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, importMap, logger, port, }) => {
     const processRef = {};
     const startServer = async (functions, env = {}, options = {}) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
@@ -14,6 +14,7 @@ const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportType
         }
         let graph;
         const stage2Path = await generateStage2({
+            bootstrapURL,
             distDirectory,
             fileName: 'dev.js',
             functions,
@@ -53,7 +54,7 @@ const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportType
     };
     return startServer;
 };
-const serve = async ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths = [], onAfterDownload, onBeforeDownload, port, systemLogger, }) => {
+const serve = async ({ bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths = [], onAfterDownload, onBeforeDownload, port, systemLogger, }) => {
     const logger = getLogger(systemLogger, debug);
     const deno = new DenoBridge({
         debug,
@@ -89,6 +90,7 @@ const serve = async ({ certificatePath, debug, distImportMapPath, inspectSetting
         }
     }
     const server = prepareServer({
+        bootstrapURL,
         deno,
         distDirectory,
         flags,

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

@@ -14,6 +14,7 @@ test('Starts a server and serves requests for edge functions', async () => {
     const port = await getPort();
     const importMapPaths = [join(paths.internal, 'import_map.json'), join(paths.user, 'import-map.json')];
     const server = await serve({
+        bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
         importMapPaths,
         port,
     });

package/dist/node/stage_2.test.js

@@ -1,6 +1,5 @@
 import { promises as fs } from 'fs';
 import { join } from 'path';
-import process from 'process';
 import { pathToFileURL } from 'url';
 import { deleteAsync } from 'del';
 import { execa } from 'execa';
@@ -23,8 +22,8 @@ test('`getLocalEntryPoint` returns a valid stage 2 file for local development',
     }
   `;
     const printerPath = join(tmpDir, 'printer.mjs');
+    const bootstrapURL = pathToFileURL(printerPath).toString();
     await fs.writeFile(printerPath, printer);
-    process.env.NETLIFY_EDGE_BOOTSTRAP = pathToFileURL(printerPath).toString();
     const functions = [
         { name: 'func1', path: join(tmpDir, 'func1.mjs'), response: 'Hello from function 1' },
         { name: 'func2', path: join(tmpDir, 'func2.mjs'), response: 'Hello from function 2' },
@@ -33,7 +32,7 @@ test('`getLocalEntryPoint` returns a valid stage 2 file for local development',
         const contents = `export default () => ${JSON.stringify(func.response)}`;
         await fs.writeFile(func.path, contents);
     }
-    const stage2 = getLocalEntryPoint(functions.map(({ name, path }) => ({ name, path })), {});
+    const stage2 = getLocalEntryPoint(functions.map(({ name, path }) => ({ name, path })), { bootstrapURL });
     const stage2Path = join(tmpDir, 'stage2.mjs');
     await fs.writeFile(stage2Path, stage2);
     const { stdout, stderr } = await execa('deno', ['run', '--allow-all', stage2Path]);
@@ -44,5 +43,4 @@ test('`getLocalEntryPoint` returns a valid stage 2 file for local development',
         expect(metadata.functions[func.name].url).toBe(pathToFileURL(func.path).toString());
     }
     await deleteAsync(tmpDir, { force: true });
-    delete process.env.NETLIFY_EDGE_BOOTSTRAP;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "8.11.0",
+  "version": "8.12.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",

package/dist/node/bootstrap.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/node/bootstrap.test.js

@@ -1,26 +0,0 @@
-import { Buffer } from 'buffer';
-import { env } from 'process';
-import fetch, { Headers } from 'node-fetch';
-import { test, expect } from 'vitest';
-import { getBootstrapURL } from './formats/javascript.js';
-test('Imports the bootstrap layer from a valid URL', async () => {
-    const importURL = new URL(getBootstrapURL());
-    const headers = new Headers();
-    // `node-fetch` doesn't let us send credentials as part of the URL, so we
-    // have to transform them into an `Authorization` header.
-    if (importURL.username) {
-        const auth = Buffer.from(`${importURL.username}:${importURL.password}`);
-        importURL.username = '';
-        importURL.password = '';
-        headers.set('Authorization', `Basic ${auth.toString('base64')}`);
-    }
-    const canonicalURL = importURL.toString();
-    const { status } = await fetch(canonicalURL, { headers });
-    expect(status).toBe(200);
-});
-test('Imports the bootstrap layer from the URL present in the `NETLIFY_EDGE_BOOTSTRAP` environment variable, if present', () => {
-    const mockURL = 'https://example.com/boot.ts';
-    env.NETLIFY_EDGE_BOOTSTRAP = mockURL;
-    expect(getBootstrapURL()).toBe(mockURL);
-    env.NETLIFY_EDGE_BOOTSTRAP = undefined;
-});