@netlify/edge-bundler 14.9.7 → 14.9.9

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

@@ -15,4 +15,9 @@ interface BundleTarballOptions {
     vendorDirectory?: string;
 }
 export declare const bundle: ({ buildID, deno, distDirectory, functions, importMap, vendorDirectory, }: BundleTarballOptions) => Promise<Bundle>;
+/**
+ * Rewrites import assert into import with in the bundle directory
+ * Defaults to copying the file in its current form
+ */
+export declare function rewriteImportAssertions(sourceFile: string, destPath: string): Promise<void>;
 export {};

package/dist/node/formats/tarball.js

@@ -8,6 +8,7 @@ import tmp from 'tmp-promise';
 import { BundleFormat } from '../bundle.js';
 import { listRecursively } from '../utils/fs.js';
 import { getFileHash } from '../utils/sha256.js';
+import { rewriteSourceImportAssertions } from '../utils/import_attributes.js';
 const TARBALL_EXTENSION = '.tar.gz';
 const getUnixPath = (input) => input.split(path.sep).join('/');
 export const bundle = async ({ buildID, deno, distDirectory, functions, importMap, vendorDirectory, }) => {
@@ -36,14 +37,9 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
         const relativePath = path.relative(commonPath, sourceFile);
         const destPath = path.join(bundleDir.path, relativePath);
         await fs.mkdir(path.dirname(destPath), { recursive: true });
-        await fs.copyFile(sourceFile, destPath);
+        // Deno 2.x dropped support for import for import assertions
+        await rewriteImportAssertions(sourceFile, destPath);
     }
-    // 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.
-    // This is because we boot Deno before we've mounted the customer's edge-functions directory, so it can't be used to resolve imports during the initial bundle phase.
-    await rewriteBareSpecifiers(bundleDir.path, sourceFiles, commonPath, importMap);
     // Vendor all dependencies in the bundle directory
     await deno.run([
         'install',
@@ -73,11 +69,17 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
             const relativePath = path.relative(vendorDirectory, vendorFile);
             const destPath = path.join(bundleDir.path, npmVendorDir, relativePath);
             await fs.mkdir(path.dirname(destPath), { recursive: true });
-            await fs.copyFile(vendorFile, destPath);
+            // Rewrite import assertions in vendored files as well
+            await rewriteImportAssertions(vendorFile, destPath);
         }
     }
     // 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
@@ -130,10 +132,10 @@ const REWRITABLE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mjs', '.m
  * - 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) {
-    const contents = importMap.getContents();
+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
+    // Collect bare specifiers that should be rewritten to URLs or relative paths
     const specifierEntries = Object.entries(contents.imports)
         .filter(([specifier, url]) => {
         // Skip node builtins
@@ -142,13 +144,17 @@ async function rewriteBareSpecifiers(bundleDirPath, sourceFiles, commonPath, imp
         // Skip platform-provided specifiers (handled by platform deno.json)
         if (PLATFORM_SPECIFIERS.has(specifier))
             return false;
-        // Skip relative/absolute path specifiers
+        // Skip relative/absolute path specifiers in the specifier itself
         if (specifier.startsWith('.') || specifier.startsWith('/'))
             return false;
-        // Only rewrite to http/https or npm: URLs
-        if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('npm:'))
-            return false;
-        return true;
+        // 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);
@@ -167,8 +173,19 @@ async function rewriteBareSpecifiers(bundleDirPath, sourceFiles, commonPath, imp
         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 = url.replace(/\$/g, '$$$$');
+            const safeUrl = targetUrl.replace(/\$/g, '$$$$');
             for (const quote of ['"', "'"]) {
                 if (specifier.endsWith('/')) {
                     // Prefix mapping: "specifier/subpath" -> "url/subpath"
@@ -227,3 +244,21 @@ async function getRequiredSourceFiles(deno, entryPoints, importMap) {
     }
     return Array.from(localFiles).sort();
 }
+/**
+ * Rewrites import assert into import with in the bundle directory
+ * Defaults to copying the file in its current form
+ */
+export async function rewriteImportAssertions(sourceFile, destPath) {
+    if (!REWRITABLE_EXTENSIONS.has(path.extname(sourceFile))) {
+        await fs.copyFile(sourceFile, destPath);
+        return;
+    }
+    try {
+        const source = await fs.readFile(sourceFile, 'utf-8');
+        const modified = rewriteSourceImportAssertions(source);
+        await fs.writeFile(destPath, modified);
+    }
+    catch {
+        await fs.copyFile(sourceFile, destPath);
+    }
+}

package/dist/node/utils/import_attributes.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Given source code rewrites import assert into import with
+ */
+export declare function rewriteSourceImportAssertions(source: string): string;

package/dist/node/utils/import_attributes.js

@@ -0,0 +1,48 @@
+import { Parser } from 'acorn';
+import * as walk from 'acorn-walk';
+import { tsPlugin } from '@sveltejs/acorn-typescript';
+const acorn = Parser.extend(tsPlugin());
+/**
+ * Given source code rewrites import assert into import with
+ */
+export function rewriteSourceImportAssertions(source) {
+    if (!source.includes('assert')) {
+        return source;
+    }
+    let modified = source;
+    try {
+        const parsedAST = acorn.parse(source, {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+        });
+        walk.simple(parsedAST, {
+            ImportDeclaration(node) {
+                const statement = source.slice(node.source.end, node.end);
+                if (statement.includes('assert')) {
+                    const newStatement = statement.replace('assert', 'with');
+                    modified = modified.replace(statement, newStatement);
+                }
+            },
+            ImportExpression(node) {
+                const statement = source.slice(node.source.end, node.end);
+                if (statement.includes('assert')) {
+                    const newStatement = statement.replace('assert', 'with');
+                    modified = modified.replace(statement, newStatement);
+                }
+            },
+            ExportNamedDeclaration(node) {
+                if (!node.source)
+                    return;
+                const statement = source.slice(node.source.end, node.end);
+                if (statement.includes('assert')) {
+                    const newStatement = statement.replace('assert', 'with');
+                    modified = modified.replace(statement, newStatement);
+                }
+            },
+        });
+        return modified;
+    }
+    catch {
+        return source;
+    }
+}

package/dist/node/utils/import_attributes.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.9.7",
+  "version": "14.9.9",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -59,6 +59,9 @@
   },
   "dependencies": {
     "@import-maps/resolve": "^2.0.0",
+    "@sveltejs/acorn-typescript": "^1.0.9",
+    "acorn": "^8.15.0",
+    "acorn-walk": "^8.3.4",
     "ajv": "^8.11.2",
     "ajv-errors": "^3.0.0",
     "better-ajv-errors": "^1.2.0",
@@ -79,5 +82,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "55f6d3568bcea071e679b4152c3273eb48223159"
+  "gitHead": "63274005adc06616e05a0b6ba0c1b0d1e2f49dab"
 }