@netlify/edge-bundler 14.7.2 → 14.8.1

package/README.md

@@ -38,12 +38,11 @@ Intelligently prepare Netlify Edge Functions for deployment.
 To avoid pulling in additional dependencies at runtime, this package vendors some Deno modules in the `deno/vendor`
 directory.
 
-You can recreate this directory by running `npm run vendor`.
+This will go away soon as we move away from the ESZIP format.
 
 > [!WARNING]  
-> At the time of writing, the underlying Deno CLI command doesn't correctly pull the WASM binary required by the ESZIP
-> module. If you run the command to update the list of vendores modules, please ensure you're not deleting
-> `eszip_wasm_bg.wasm`.
+> The `eszip` module contains a set of custom changes that diverge from the upstream. If you need to update this module,
+> make sure to backport them.
 
 ## Contributors
 

package/deno/vendor/deno.land/x/eszip@v0.55.2/eszip.ts

@@ -81,6 +81,11 @@ class V2 {
     const imports: Record<string, string> = {};
 
     for (const specifier of this.specifiers) {
+      // NOTE: This is specific to Netlify, to address the fact that we can't
+      // unpack remote URL specifiers to paths on disk.
+      // https://github.com/netlify/build/pull/6716
+      // https://github.com/netlify/build/pull/6720
+      // https://github.com/netlify/build/pull/6722
       if (new URL(specifier).protocol !== "file:") continue
       const module = await this.parser.getModuleSource(specifier);
       await write(join(dest, "source", url2path(specifier)), module);

package/dist/node/bridge.js

@@ -32,7 +32,9 @@ export class DenoBridge {
         this.onAfterDownload = options.onAfterDownload;
         this.onBeforeDownload = options.onBeforeDownload;
         this.useGlobal = options.useGlobal ?? true;
-        const useNextDeno = options.featureFlags?.edge_bundler_generate_tarball || options.featureFlags?.edge_bundler_deno_v2;
+        const useNextDeno = options.featureFlags?.edge_bundler_dry_run_generate_tarball ||
+            options.featureFlags?.edge_bundler_generate_tarball ||
+            options.featureFlags?.edge_bundler_deno_v2;
         this.versionRange = options.versionRange ?? (useNextDeno ? NEXT_DENO_VERSION_RANGE : DENO_VERSION_RANGE);
     }
     async downloadBinary() {

package/dist/node/bundler.js

@@ -62,8 +62,8 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
         vendorDirectory,
     });
     const bundles = [];
-    if (featureFlags.edge_bundler_generate_tarball) {
-        bundles.push(await bundleTarball({
+    if (featureFlags.edge_bundler_generate_tarball || featureFlags.edge_bundler_dry_run_generate_tarball) {
+        const tarballPromise = bundleTarball({
             basePath,
             buildID,
             debug,
@@ -73,7 +73,24 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
             featureFlags,
             importMap: importMap.clone(),
             vendorDirectory: vendor?.directory,
-        }));
+        });
+        if (featureFlags.edge_bundler_dry_run_generate_tarball) {
+            try {
+                await tarballPromise;
+                logger.system('Dry run: Tarball bundle generated successfully.');
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    logger.system(`Dry run: Tarball bundle generation failed: ${error.message}`);
+                }
+                else {
+                    logger.system(`Dry run: Tarball bundle generation failed: ${String(error)}`);
+                }
+            }
+        }
+        if (featureFlags.edge_bundler_generate_tarball) {
+            bundles.push(await tarballPromise);
+        }
     }
     if (vendor) {
         importMap.add(vendor.importMap);
@@ -145,6 +162,7 @@ const getFunctionConfigs = async ({ basePath, deno, eszipPath, featureFlags, imp
         if (!(err instanceof Error && err.cause === 'IMPORT_ASSERT') || !eszipPath || !featureFlags?.edge_bundler_deno_v2) {
             throw err;
         }
+        log.user('WARNING: Import assertions are deprecated and will be removed soon. Refer to https://ntl.fyi/import-assert for more information.');
         try {
             // We failed to extract the configuration because there is an import assert
             // in the function code, a deprecated feature that we used to support with

package/dist/node/bundler.test.js

@@ -655,4 +655,63 @@ describe.skipIf(lt(denoVersion, '2.4.3'))('Produces a tarball bundle', () => {
         await cleanup();
         await rm(vendorDirectory.path, { force: true, recursive: true });
     });
+    describe('Dry-run tarball generation flag enabled', () => {
+        test('Logs success message when tarball generation succeeded', async () => {
+            const systemLogger = vi.fn();
+            const { basePath, cleanup, distPath } = await useFixture('imports_node_builtin', { copyDirectory: true });
+            const declarations = [
+                {
+                    function: 'func1',
+                    path: '/func1',
+                },
+            ];
+            await bundle([join(basePath, 'netlify/edge-functions')], distPath, declarations, {
+                basePath,
+                configPath: join(basePath, '.netlify/edge-functions/config.json'),
+                featureFlags: {
+                    edge_bundler_dry_run_generate_tarball: true,
+                    edge_bundler_generate_tarball: false,
+                },
+                systemLogger,
+            });
+            expect(systemLogger).toHaveBeenCalledWith('Dry run: Tarball bundle generated successfully.');
+            const manifestFile = await readFile(resolve(distPath, 'manifest.json'), 'utf8');
+            const manifest = JSON.parse(manifestFile);
+            expect(manifest.bundles.length).toBe(1);
+            expect(manifest.bundles[0].format).toBe('eszip2');
+            await cleanup();
+        });
+        test('Logs error message when tarball generation failed and does not fail the overall build', async () => {
+            const systemLogger = vi.fn();
+            vi.resetModules();
+            vi.doMock('./formats/tarball.js', () => ({
+                bundle: vi.fn().mockRejectedValue(new Error('Simulated tarball bundling failure')),
+            }));
+            const { bundle: bundleUnderTest } = await import('./bundler.js');
+            const { basePath, cleanup, distPath } = await useFixture('imports_node_builtin', { copyDirectory: true });
+            const sourceDirectory = join(basePath, 'functions');
+            const declarations = [
+                {
+                    function: 'func1',
+                    path: '/func1',
+                },
+            ];
+            await expect(bundleUnderTest([sourceDirectory], distPath, declarations, {
+                basePath,
+                configPath: join(sourceDirectory, 'config.json'),
+                featureFlags: {
+                    edge_bundler_dry_run_generate_tarball: true,
+                    edge_bundler_generate_tarball: false,
+                },
+                systemLogger,
+            })).resolves.toBeDefined();
+            expect(systemLogger).toHaveBeenCalledWith(`Dry run: Tarball bundle generation failed: Simulated tarball bundling failure`);
+            const manifestFile = await readFile(resolve(distPath, 'manifest.json'), 'utf8');
+            const manifest = JSON.parse(manifestFile);
+            expect(manifest.bundles.length).toBe(1);
+            expect(manifest.bundles[0].format).toBe('eszip2');
+            await cleanup();
+            vi.resetModules();
+        });
+    });
 }, 10_000);

package/dist/node/feature_flags.d.ts

@@ -1,11 +1,13 @@
 declare const defaultFlags: {
     edge_bundler_generate_tarball: boolean;
+    edge_bundler_dry_run_generate_tarball: boolean;
     edge_bundler_deno_v2: boolean;
 };
 type FeatureFlag = keyof typeof defaultFlags;
 type FeatureFlags = Partial<Record<FeatureFlag, boolean>>;
 declare const getFlags: (input?: Record<string, boolean>, flags?: {
     edge_bundler_generate_tarball: boolean;
+    edge_bundler_dry_run_generate_tarball: boolean;
     edge_bundler_deno_v2: boolean;
 }) => FeatureFlags;
 export { defaultFlags, getFlags };

package/dist/node/feature_flags.js

@@ -1,5 +1,6 @@
 const defaultFlags = {
     edge_bundler_generate_tarball: false,
+    edge_bundler_dry_run_generate_tarball: false,
     edge_bundler_deno_v2: false,
 };
 const getFlags = (input = {}, flags = defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.7.2",
+  "version": "14.8.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -24,8 +24,7 @@
     "test:dev:deno": "deno test --allow-all deno",
     "test:ci:vitest": "vitest run --coverage",
     "test:ci:deno": "deno test --allow-all deno",
-    "test:integration": "node --experimental-modules test/integration/test.js",
-    "vendor": "deno vendor --force --output deno/vendor https://deno.land/x/eszip@v0.55.2/mod.ts https://deno.land/x/retry@v2.0.0/mod.ts https://deno.land/x/std@0.177.0/path/mod.ts"
+    "test:integration": "node --experimental-modules test/integration/test.js"
   },
   "keywords": [],
   "license": "MIT",
@@ -80,5 +79,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "1cf876ef6b79ef8332044a3e32db846652be9f23"
+  "gitHead": "e945f46a5b5e5c2b33f6ef164be73688ae7d61ed"
 }