@netlify/edge-bundler 14.7.1 → 14.8.0

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,12 @@ 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);
       // Track import
@@ -107,11 +113,8 @@ export async function loadESZIP(filename: string): Promise<ESZIP> {
   return await V1.load(bytes);
 }
 
-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);
+function url2path(url: string) {
+  return join(...(new URL(url).pathname.split("/").filter(Boolean)));
 }
 
 async function write(path: string, content: string) {

package/dist/node/bundler.js

@@ -17,6 +17,7 @@ import { writeManifest } from './manifest.js';
 import { vendorNPMSpecifiers } from './npm_dependencies.js';
 import { ensureLatestTypes } from './types.js';
 import { nonNullable } from './utils/non_nullable.js';
+import { BundleError } from './bundle_error.js';
 export const bundle = async (sourceDirectories, distDirectory, tomlDeclarations = [], { basePath: inputBasePath, cacheDirectory, configPath, debug, distImportMapPath, featureFlags: inputFeatureFlags, importMapPaths = [], internalSrcFolder, onAfterDownload, onBeforeDownload, rootPath, userLogger, systemLogger, vendorDirectory, } = {}) => {
     const logger = getLogger(systemLogger, userLogger, debug);
     const featureFlags = getFlags(inputFeatureFlags);
@@ -144,22 +145,28 @@ const getFunctionConfigs = async ({ basePath, deno, eszipPath, featureFlags, imp
         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
-        // in the function code, a deprecated feature that we used to support with
-        // Deno 1.x. To avoid a breaking change, we treat this error as a special
-        // case, using the generated ESZIP to extract the configuration. This works
-        // because import asserts are transpiled to import attributes.
-        const extractedESZIP = await extractESZIP(deno, eszipPath);
-        const configs = await Promise.all([...internalFunctions, ...userFunctions].map(async (func) => {
-            const relativePath = relative(basePath, func.path);
-            const functionPath = join(extractedESZIP.path, relativePath);
-            return [func.name, await getFunctionConfig({ functionPath, importMap, deno, log })];
-        }));
-        await extractedESZIP.cleanup();
-        return {
-            internalFunctions: Object.fromEntries(configs.slice(0, internalFunctions.length)),
-            userFunctions: Object.fromEntries(configs.slice(internalFunctions.length)),
-        };
+        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
+            // Deno 1.x. To avoid a breaking change, we treat this error as a special
+            // case, using the generated ESZIP to extract the configuration. This works
+            // because import asserts are transpiled to import attributes.
+            const extractedESZIP = await extractESZIP(deno, eszipPath);
+            const configs = await Promise.all([...internalFunctions, ...userFunctions].map(async (func) => {
+                const relativePath = relative(basePath, func.path);
+                const functionPath = join(extractedESZIP.path, relativePath);
+                return [func.name, await getFunctionConfig({ functionPath, importMap, deno, log })];
+            }));
+            await extractedESZIP.cleanup();
+            return {
+                internalFunctions: Object.fromEntries(configs.slice(0, internalFunctions.length)),
+                userFunctions: Object.fromEntries(configs.slice(internalFunctions.length)),
+            };
+        }
+        catch (err) {
+            throw new BundleError(new Error('An error occurred while building an edge function that uses an import assertion. Refer to https://ntl.fyi/import-assert for more information.'), { cause: err });
+        }
     }
 };
 const createFinalBundles = async (bundles, distDirectory, buildID) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.7.1",
+  "version": "14.8.0",
   "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": "b08cf327fc8a631e3520c5f3326ace1d40e22c85"
+  "gitHead": "01a7441fcbc82d415247bf990414ad937e9533c4"
 }