@netlify/edge-bundler 10.1.3 → 11.0.0

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.0.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -81,7 +81,7 @@
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.19.6",
+    "esbuild": "0.19.9",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",