@netlify/edge-bundler 14.6.0 → 14.7.0

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

@@ -107,8 +107,11 @@ export async function loadESZIP(filename: string): Promise<ESZIP> {
   return await V1.load(bytes);
 }
 
-function url2path(url: string) {
-  return join(...(new URL(url).pathname.split("/").filter(Boolean)));
+function url2path(urlString: string) {
+  const url = new URL(urlString);
+  const tail = url.pathname.split("/").filter(Boolean);
+  const relativePath = tail.length === 0 ? [".root"] : tail;
+  return join(url.hostname, ...relativePath);
 }
 
 async function write(path: string, content: string) {

package/dist/node/bridge.d.ts

@@ -2,7 +2,7 @@ import { type WriteStream } from 'fs';
 import { type ExecaChildProcess } from 'execa';
 import { FeatureFlags } from './feature_flags.js';
 import { Logger } from './logger.js';
-export declare const DENO_VERSION_RANGE = "^2.4.2";
+export declare const DENO_VERSION_RANGE = "1.39.0 - 2.2.4";
 export type OnBeforeDownloadHook = () => void | Promise<void>;
 export type OnAfterDownloadHook = (error?: Error) => void | Promise<void>;
 export interface DenoOptions {

package/dist/node/bridge.js

@@ -12,7 +12,8 @@ const DENO_VERSION_FILE = 'version.txt';
 // When updating DENO_VERSION_RANGE, ensure that the deno version
 // on the netlify/buildbot build image satisfies this range!
 // https://github.com/netlify/buildbot/blob/f9c03c9dcb091d6570e9d0778381560d469e78ad/build-image/noble/Dockerfile#L410
-export const DENO_VERSION_RANGE = '^2.4.2';
+export const DENO_VERSION_RANGE = '1.39.0 - 2.2.4';
+const NEXT_DENO_VERSION_RANGE = '^2.4.2';
 export class DenoBridge {
     cacheDirectory;
     currentDownload;
@@ -31,7 +32,8 @@ export class DenoBridge {
         this.onAfterDownload = options.onAfterDownload;
         this.onBeforeDownload = options.onBeforeDownload;
         this.useGlobal = options.useGlobal ?? true;
-        this.versionRange = options.versionRange ?? DENO_VERSION_RANGE;
+        const useNextDeno = 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() {
         await this.onBeforeDownload?.();

package/dist/node/bundler.js

@@ -98,6 +98,7 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
         basePath,
         deno,
         eszipPath,
+        featureFlags,
         importMap,
         internalFunctions,
         log: logger,
@@ -127,7 +128,7 @@ export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations
     }
     return { functions, manifest };
 };
-const getFunctionConfigs = async ({ basePath, deno, eszipPath, importMap, log, internalFunctions, userFunctions, }) => {
+const getFunctionConfigs = async ({ basePath, deno, eszipPath, featureFlags, importMap, log, internalFunctions, userFunctions, }) => {
     try {
         const internalConfigPromises = internalFunctions.map(async (func) => [func.name, await getFunctionConfig({ functionPath: func.path, importMap, deno, log })]);
         const userConfigPromises = userFunctions.map(async (func) => [func.name, await getFunctionConfig({ functionPath: func.path, importMap, deno, log })]);
@@ -140,7 +141,7 @@ const getFunctionConfigs = async ({ basePath, deno, eszipPath, importMap, log, i
         };
     }
     catch (err) {
-        if (!(err instanceof Error && err.cause === 'IMPORT_ASSERT') || !eszipPath) {
+        if (!(err instanceof Error && err.cause === 'IMPORT_ASSERT') || !eszipPath || !featureFlags?.edge_bundler_deno_v2) {
             throw err;
         }
         // We failed to extract the configuration because there is an import assert

package/dist/node/bundler.test.js

@@ -505,6 +505,9 @@ test('Emits a system log when import assertions are used', async () => {
     const systemLogger = vi.fn();
     await bundle([sourceDirectory], distPath, [], {
         basePath,
+        featureFlags: {
+            edge_bundler_deno_v2: true,
+        },
         systemLogger,
         vendorDirectory: vendorDirectory.path,
     });

package/dist/node/feature_flags.d.ts

@@ -1,10 +1,12 @@
 declare const defaultFlags: {
     edge_bundler_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_deno_v2: boolean;
 }) => FeatureFlags;
 export { defaultFlags, getFlags };
 export type { FeatureFlag, FeatureFlags };

package/dist/node/feature_flags.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.6.0",
+  "version": "14.7.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -80,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "3dfa7bd62ac0c8fe4b9b61128b8c2315d1272b4f"
+  "gitHead": "ff114da3f2bcb5bea83bb4a3747201192aecfec0"
 }