@netlify/edge-bundler 14.9.17 → 14.9.19

package/dist/node/bundler.js

@@ -66,6 +66,7 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
     }
     const bundles = [];
     let tarballBundleDurationMs;
+    let tarballLogMsg;
     if (featureFlags.edge_bundler_generate_tarball || featureFlags.edge_bundler_dry_run_generate_tarball) {
         const tarballPromise = (async () => {
             const start = Date.now();
@@ -90,15 +91,15 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
         if (featureFlags.edge_bundler_dry_run_generate_tarball) {
             try {
                 await tarballPromise;
-                logger.system('Dry run: Tarball bundle generated successfully.');
+                tarballLogMsg = 'Dry run: Eszip and tarball bundle generated successfully.';
                 tarballPromiseResolved = true;
             }
             catch (error) {
                 if (error instanceof Error) {
-                    logger.system(`Dry run: Tarball bundle generation failed: ${error.message}`);
+                    tarballLogMsg = `Dry run: Eszip successful, tarball bundle generation failed: ${error.message}`;
                 }
                 else {
-                    logger.system(`Dry run: Tarball bundle generation failed: ${String(error)}`);
+                    tarballLogMsg = `Dry run: Eszip successful, tarball bundle generation failed: ${String(error)}`;
                 }
             }
         }
@@ -118,6 +119,12 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
         importMap,
         vendorDirectory: vendor?.directory,
     }));
+    // Log tarball generation status after eszip bundling succeeds (only set during dry runs).
+    if (tarballLogMsg) {
+        // Reported errors might be multiple lines, so we replace newlines with the literal string '\n' to get a single log line,
+        // while still ensuring it could be expanded into the original multi-line message if needed.
+        logger.system(tarballLogMsg.replaceAll('\n', '\\n'));
+    }
     // The final file name of the bundles contains a SHA256 hash of the contents,
     // which we can only compute now that the files have been generated. So let's
     // rename the bundles to their permanent names.

package/dist/node/formats/tarball.js

@@ -24,6 +24,7 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
     // Build prefix mappings to transform file:// URLs to relative paths
     const npmVendorDir = '.netlify-npm-vendor';
     const prefixes = {};
+    const additionalImportMapEntries = {};
     // Copy pre-bundled npm modules from vendorDirectory if present.
     // This supports the legacy approach where npm packages are pre-bundled and mapped
     // via import map. Modern code could use npm: specifiers instead, which Deno handles
@@ -54,7 +55,15 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
         manifest.functions[func.name] = getUnixPath(relativePath);
     }
     for (const sourceFile of sourceFilesSet) {
-        const relativePath = path.relative(commonPath, sourceFile);
+        let relativePath = path.relative(commonPath, sourceFile);
+        if (relativePath.startsWith('vendor' + path.sep)) {
+            // root vendor directory is reserved directory and can't be imported directly from with `vendor: true` or `--vendor` flag
+            // move from vendor/ to .root-vendor/
+            relativePath = relativePath.replace(/vendor[\\/]/, `.root-vendor/`);
+            // and import map rewrite so imports remain resolvable
+            additionalImportMapEntries['./vendor/'] = `./.root-vendor/`;
+            prefixes[pathToFileURL(path.join(commonPath, 'vendor') + path.sep).href] = './.root-vendor/';
+        }
         const destPath = path.join(bundleDir.path, relativePath);
         await fs.mkdir(path.dirname(destPath), { recursive: true });
         // Rewrite import assertions in user files
@@ -63,7 +72,7 @@ export const bundle = async ({ buildID, deno, distDirectory, functions, importMa
     // Map common path to relative paths
     prefixes[pathToFileURL(commonPath + path.sep).href] = './';
     // Get import map contents with file:// URLs transformed to relative paths
-    const importMapContents = importMap.getContents(prefixes);
+    const importMapContents = importMap.getContents(prefixes, additionalImportMapEntries);
     // Create deno.json with import map contents for runtime resolution
     const denoConfigPath = path.join(bundleDir.path, 'deno.json');
     const denoConfigContents = JSON.stringify(importMapContents, null, 2);
@@ -147,6 +156,11 @@ async function getRequiredSourceFiles(deno, entryPoints, importMap) {
         // Extract all local files from the module graph
         for (const module of graph.modules) {
             if (module.specifier.startsWith('file://')) {
+                if (module.error?.startsWith('Module not found')) {
+                    // Module graph contains all found imported/required modules, even if they don't actually exist
+                    // This can happen for optional dependencies (dynamic import or require in try/catch).
+                    continue;
+                }
                 const filePath = fileURLToPath(module.specifier);
                 localFiles.add(filePath);
             }

package/dist/node/import_map.d.ts

@@ -20,7 +20,7 @@ export declare class ImportMap {
     static applyPrefixesToPath(path: string, prefixes: Record<string, string>): string;
     filterImports(imports?: Record<string, URL | null>): Record<string, string>;
     filterScopes(scopes?: ParsedImportMap['scopes']): Record<string, Imports>;
-    getContents(prefixes?: Record<string, string>): {
+    getContents(prefixes?: Record<string, string>, imports?: Imports): {
         imports: Imports;
         scopes: {};
     };

package/dist/node/import_map.js

@@ -116,8 +116,7 @@ export class ImportMap {
     // to full URLs. It takes an optional `prefixes` object that specifies a list
     // of prefixes to replace path prefixes (see `applyPrefixesToPath`). Prefixes
     // will be applied on both `imports` and `scopes`.
-    getContents(prefixes = {}) {
-        let imports = {};
+    getContents(prefixes = {}, imports = {}) {
         let scopes = {};
         this.sources.forEach((file) => {
             const importMap = this.resolve(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.9.17",
+  "version": "14.9.19",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -76,10 +76,10 @@
     "parse-imports": "^2.2.1",
     "path-key": "^4.0.0",
     "semver": "^7.3.8",
-    "tar": "^7.5.3",
+    "tar": "^7.5.12",
     "tmp-promise": "^3.0.3",
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "4c1f6b11490fca02a044a8f0e3bed51ef6b7c85a"
+  "gitHead": "3694352be4959c56e96a6c15dd04ed4d7aa31344"
 }