feat!: provide import maps when starting the isolate, not server (net…

…lify/edge-bundler#548) * feat!: provide import maps when starting the isolate, not server * fix: tests * chore: remove unused type
netlify · Dec 11, 2023 · 53a9366 · 53a9366
1 parent 2f374c2
commit 53a9366
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/packages/edge-bundler/node/server/server.test.ts b/packages/edge-bundler/node/server/server.test.ts
@@ -22,7 +22,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,
   })
@@ -43,6 +42,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(
@@ -118,7 +118,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,
@@ -132,6 +131,7 @@ test('Serves edge functions in a monorepo setup', async () => {
   ]
   const options = {
     getFunctionsConfig: true,
+    importMapPaths,
   }
 
   const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(

diff --git a/packages/edge-bundler/node/server/server.ts b/packages/edge-bundler/node/server/server.ts
@@ -27,14 +27,14 @@ interface PrepareServerOptions {
   flags: string[]
   formatExportTypeError?: FormatFunction
   formatImportError?: FormatFunction
-  importMap: ImportMap
   logger: Logger
   port: number
   rootPath?: string
 }
 
 interface StartServerOptions {
   getFunctionsConfig?: boolean
+  importMapPaths?: string[]
 }
 
 /**
@@ -57,7 +57,6 @@ const prepareServer = ({
   flags: denoFlags,
   formatExportTypeError,
   formatImportError,
-  importMap: baseImportMap,
   logger,
   port,
   rootPath,
@@ -88,7 +87,10 @@ const prepareServer = ({
     })
 
     const features: Record<string, boolean> = {}
-    const importMap = baseImportMap.clone()
+
+    const importMap = new ImportMap()
+    await importMap.addFiles(options.importMapPaths ?? [], logger)
+
     const npmSpecifiersWithExtraneousFiles: string[] = []
 
     // we keep track of the files that are relevant to the user's code, so we can clean up leftovers from past executions later
@@ -181,7 +183,6 @@ interface ServeOptions {
   distImportMapPath?: string
   featureFlags?: FeatureFlags
   inspectSettings?: InspectSettings
-  importMapPaths?: string[]
   onAfterDownload?: OnAfterDownloadHook
   onBeforeDownload?: OnBeforeDownloadHook
   formatExportTypeError?: FormatFunction
@@ -243,11 +244,6 @@ export const serve = async ({
    */
   formatImportError,
 
-  /**
-   * Paths to any additional import map files.
-   */
-  importMapPaths = [],
-
   /**
    * Callback function to be triggered after the Deno CLI has been downloaded.
    */
@@ -323,10 +319,6 @@ export const serve = async ({
     }
   }
 
-  const importMap = new ImportMap()
-
-  await importMap.addFiles(importMapPaths, logger)
-
   const server = prepareServer({
     basePath,
     bootstrapURL,
@@ -337,7 +329,6 @@ export const serve = async ({
     flags,
     formatExportTypeError,
     formatImportError,
-    importMap,
     logger,
     port,
     rootPath,