fix(deps): update dependency @netlify/edge-bundler to v7 (#5325)

* fix(deps): update dependency @netlify/edge-bundler to v7

* refactor: simplify import map loading

* chore: fix test

* refactor: remove unnecessary property

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Eduardo Bouças <[email protected]>

Author: renovate[bot]

npm-shrinkwrap.json

@@ -232,7 +232,7 @@
   "dependencies": {
     "@netlify/build": "^29.2.0",
     "@netlify/config": "^20.2.0",
-    "@netlify/edge-bundler": "^6.1.0",
+    "@netlify/edge-bundler": "^7.1.0",
     "@netlify/framework-info": "^9.5.3",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/zip-it-and-ship-it": "^8.2.0",

package.json

@@ -2,33 +2,11 @@
 import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
 import { cwd } from 'process'
-import { pathToFileURL } from 'url'
 
-import { warn } from '../../utils/command-helpers.mjs'
 import { getPathInProject } from '../settings.cjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
-/**
- * Reads an import map from a path and returns the parsed data, if it exists
- * and is valid. Otherwise, it returns null.
- *
- * @param {string} importMapPath
- * @returns {Promise<object | null>}
- */
-const getImportMap = async (importMapPath) => {
-  try {
-    const data = await readFile(importMapPath)
-    const importMap = JSON.parse(data)
-
-    return importMap
-  } catch {
-    warn(`Could not read the import map file for Edge Functions at ${importMapPath}`)
-
-    return null
-  }
-}
-
 export const getInternalFunctions = async () => {
   const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
@@ -59,18 +37,7 @@ export const getInternalFunctions = async () => {
     }
 
     if (manifest.import_map) {
-      const importMapPath = resolve(dirname(manifestPath), manifest.import_map)
-      const importMap = await getImportMap(importMapPath)
-
-      if (importMap !== null) {
-        return {
-          ...data,
-          importMap: {
-            baseURL: pathToFileURL(importMapPath),
-            ...importMap,
-          },
-        }
-      }
+      data.importMap = resolve(dirname(manifestPath), manifest.import_map)
     }
 
     return data

src/lib/edge-functions/internal.mjs

@@ -160,12 +160,14 @@ const prepareServer = async ({
   port,
   projectDir,
 }) => {
+  // Merging internal with user-defined import maps.
+  const importMapPaths = [...importMaps, config.functions['*'].deno_import_map]
+
   try {
     const bundler = await import('@netlify/edge-bundler')
     const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH])
     const runIsolate = await bundler.serve({
       ...getDownloadUpdateFunctions(),
-      basePath: projectDir,
       certificatePath,
       debug: env.NETLIFY_DENO_DEBUG === 'true',
       distImportMapPath,
@@ -175,7 +177,7 @@ const prepareServer = async ({
         )}. The file does not seem to have a function as the default export.`,
       formatImportError: (name) =>
         `${NETLIFYDEVERR} ${chalk.red('Failed')} to run Edge Function ${chalk.yellow(name)}:`,
-      importMaps,
+      importMapPaths,
       inspectSettings,
       port,
     })

src/lib/edge-functions/proxy.mjs

@@ -780,7 +780,7 @@ test('should respect in-source configuration from internal edge functions', asyn
   })
 })
 
-test('Serves edge functions with import maps coming from the Deno config file and from the internal manifest', async (t) => {
+test('Serves edge functions with import maps coming from the `functions.deno_import_map` config property and from the internal manifest', async (t) => {
   await withSiteBuilder('site-with-edge-functions-and-import-maps', async (builder) => {
     const internalEdgeFunctionsDir = path.join('.netlify', 'edge-functions')
 
@@ -790,6 +790,9 @@ test('Serves edge functions with import maps coming from the Deno config file an
           build: {
             publish: 'public',
           },
+          functions: {
+            deno_import_map: 'import_map.json',
+          },
         },
       })
       .withEdgeFunction({
@@ -809,10 +812,6 @@ test('Serves edge functions with import maps coming from the Deno config file an
           content: 'export const greet = (name: string) => `Hello, ${name}!`',
           path: 'greeter.ts',
         },
-        {
-          content: JSON.stringify({ importMap: 'import_map.json' }),
-          path: 'deno.json',
-        },
         {
           content: JSON.stringify({ imports: { greeter: './greeter.ts' } }),
           path: 'import_map.json',