@netlify/edge-bundler 14.9.6 → 14.9.8

package/dist/node/formats/tarball.js

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { builtinModules } from 'module';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import commonPathPrefix from 'common-path-prefix';
@@ -71,6 +72,11 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
     }
     // Map common path to relative paths
     prefixes[pathToFileURL(commonPath + path.sep).href] = './';
+    // Rewrite bare specifier imports to their resolved URLs so they can be
+    // resolved by Deno's --vendor flag at runtime without needing the customer's import map.
+    // At runtime, Deno discovers config from /platform/deno.json (the bootstrap entry
+    // point), not /function/deno.json, so the customer's import map is unreachable.
+    await rewriteBareSpecifiers(bundleDir.path, sourceFiles, commonPath, importMap, prefixes);
     // Get import map contents with file:// URLs transformed to relative paths
     const importMapContents = importMap.getContents(prefixes);
     // Create deno.json with import map contents for runtime resolution
@@ -107,6 +113,92 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
         hash,
     };
 };
+// Specifiers provided by the platform deno.json at runtime - no need to rewrite these.
+const PLATFORM_SPECIFIERS = new Set(['@netlify/edge-functions', 'netlify:edge']);
+// Source file extensions that may contain import statements.
+const REWRITABLE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mjs', '.mts']);
+/**
+ * Rewrites bare specifier imports in copied source files to their resolved URLs
+ * from the import map. This allows Deno's --vendor flag to resolve these imports
+ * at runtime without needing the customer's import map (which is unreachable
+ * because Deno discovers config from the platform bootstrap directory, not the
+ * function directory).
+ *
+ * Only rewrites specifiers that:
+ * - Are bare package specifiers (not relative, absolute, or URL imports)
+ * - Resolve to http/https or npm: URLs in the import map
+ * - Are NOT node builtins or platform-provided imports
+ */
+async function rewriteBareSpecifiers(bundleDirPath, sourceFiles, commonPath, importMap, prefixes) {
+    const contents = importMap.getContents(prefixes);
+    const builtinSet = new Set(builtinModules);
+    // Collect bare specifiers that should be rewritten to URLs or relative paths
+    const specifierEntries = Object.entries(contents.imports)
+        .filter(([specifier, url]) => {
+        // Skip node builtins
+        if (specifier.startsWith('node:') || builtinSet.has(specifier))
+            return false;
+        // Skip platform-provided specifiers (handled by platform deno.json)
+        if (PLATFORM_SPECIFIERS.has(specifier))
+            return false;
+        // Skip relative/absolute path specifiers in the specifier itself
+        if (specifier.startsWith('.') || specifier.startsWith('/'))
+            return false;
+        // Rewrite http/https, npm:, or vendored npm modules (relative paths with .netlify-npm-vendor)
+        if (url.startsWith('http://') ||
+            url.startsWith('https://') ||
+            url.startsWith('npm:') ||
+            url.includes('.netlify-npm-vendor')) {
+            return true;
+        }
+        return false;
+    })
+        // Sort longest first so prefix mappings like "lodash/" match before "lodash"
+        .sort((a, b) => b[0].length - a[0].length);
+    for (const sourceFile of sourceFiles) {
+        if (!REWRITABLE_EXTENSIONS.has(path.extname(sourceFile)))
+            continue;
+        const relativePath = path.relative(commonPath, sourceFile);
+        const destPath = path.join(bundleDirPath, relativePath);
+        let source;
+        try {
+            source = await fs.readFile(destPath, 'utf-8');
+        }
+        catch {
+            continue;
+        }
+        let modified = source;
+        for (const [specifier, url] of specifierEntries) {
+            const escaped = specifier.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            // Convert bundle-root-relative paths to source-file-relative paths
+            let targetUrl = url;
+            if (url.startsWith('./') || url.startsWith('../')) {
+                // URL is relative to bundle root (e.g., "./.netlify-npm-vendor/bundled-parent-1.js")
+                // Convert to absolute path in bundle, then to relative from source file
+                const targetAbsolutePath = path.resolve(bundleDirPath, url);
+                const relativeImport = path.relative(path.dirname(destPath), targetAbsolutePath);
+                // Ensure forward slashes and ./ prefix for clarity
+                targetUrl = relativeImport.startsWith('.') ? relativeImport : `./${relativeImport}`;
+                targetUrl = targetUrl.replace(/\\/g, '/');
+            }
+            // Escape $ in URL for use in replacement string
+            const safeUrl = targetUrl.replace(/\$/g, '$$$$');
+            for (const quote of ['"', "'"]) {
+                if (specifier.endsWith('/')) {
+                    // Prefix mapping: "specifier/subpath" -> "url/subpath"
+                    modified = modified.replace(new RegExp(`(\\bfrom\\s+|\\bimport\\s+|\\bimport\\s*\\(\\s*)${quote}${escaped}([^${quote}]*)${quote}`, 'g'), `$1${quote}${safeUrl}$2${quote}`);
+                }
+                else {
+                    // Exact mapping: "specifier" -> "url"
+                    modified = modified.replace(new RegExp(`(\\bfrom\\s+|\\bimport\\s+|\\bimport\\s*\\(\\s*)${quote}${escaped}${quote}`, 'g'), `$1${quote}${safeUrl}${quote}`);
+                }
+            }
+        }
+        if (modified !== source) {
+            await fs.writeFile(destPath, modified);
+        }
+    }
+}
 /**
  * Uses deno info to get the module graph and extract only the local source files
  * that are actually needed by the entry points. This avoids copying unnecessary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.9.6",
+  "version": "14.9.8",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -79,5 +79,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "3b7249e4fd7ea006bf473b4953c17312369d1973"
+  "gitHead": "4395795665bc891337d375d51b0a63f6551d7d83"
 }