@netlify/edge-bundler 1.3.0 → 1.4.2

package/deno/bundle.ts

@@ -1,4 +1,4 @@
-import { writeStage2 } from 'https://62ac9c589c16c50008b6ef55--edge-bootstrap.netlify.app/bundler/mod.ts'
+import { writeStage2 } from 'https://62bae4994570970008142f1e--edge-bootstrap.netlify.app/bundler/mod.ts'
 
 const [payload] = Deno.args
 const { basePath, destPath, functions } = JSON.parse(payload)

package/dist/bridge.d.ts

@@ -1,10 +1,11 @@
 import { ExecaChildProcess } from 'execa';
-declare type LifecycleHook = () => void | Promise<void>;
+declare type OnBeforeDownloadHook = () => void | Promise<void>;
+declare type OnAfterDownloadHook = (error?: Error) => void | Promise<void>;
 interface DenoOptions {
     cacheDirectory?: string;
     debug?: boolean;
-    onAfterDownload?: LifecycleHook;
-    onBeforeDownload?: LifecycleHook;
+    onAfterDownload?: OnAfterDownloadHook;
+    onBeforeDownload?: OnBeforeDownloadHook;
     useGlobal?: boolean;
     versionRange?: string;
 }
@@ -18,8 +19,8 @@ declare class DenoBridge {
     cacheDirectory: string;
     currentDownload?: ReturnType<DenoBridge['downloadBinary']>;
     debug: boolean;
-    onAfterDownload?: LifecycleHook;
-    onBeforeDownload?: LifecycleHook;
+    onAfterDownload?: OnAfterDownloadHook;
+    onBeforeDownload?: OnBeforeDownloadHook;
     useGlobal: boolean;
     versionRange: string;
     constructor(options?: DenoOptions);
@@ -39,4 +40,4 @@ declare class DenoBridge {
     runInBackground(args: string[], pipeOutput?: boolean, ref?: ProcessRef): Promise<void>;
 }
 export { DenoBridge };
-export type { LifecycleHook, ProcessRef };
+export type { OnAfterDownloadHook, OnBeforeDownloadHook, ProcessRef };

package/dist/bridge.js

@@ -19,9 +19,8 @@ class DenoBridge {
         this.versionRange = (_d = options.versionRange) !== null && _d !== void 0 ? _d : DENO_VERSION_RANGE;
     }
     async downloadBinary() {
-        if (this.onBeforeDownload) {
-            this.onBeforeDownload();
-        }
+        var _a, _b, _c;
+        await ((_a = this.onBeforeDownload) === null || _a === void 0 ? void 0 : _a.call(this));
         await fs.mkdir(this.cacheDirectory, { recursive: true });
         this.log(`Downloading Deno CLI to ${this.cacheDirectory}...`);
         const binaryPath = await download(this.cacheDirectory, this.versionRange);
@@ -30,12 +29,12 @@ class DenoBridge {
         // a malformed semver range. If this does happen, let's throw an error so
         // that the tests catch it.
         if (downloadedVersion === undefined) {
-            throw new Error('Could not read downloaded binary');
+            const error = new Error('There was a problem setting up the Edge Functions environment. To try a manual installation, visit https://ntl.fyi/install-deno.');
+            await ((_b = this.onAfterDownload) === null || _b === void 0 ? void 0 : _b.call(this, error));
+            throw error;
         }
         await this.writeVersionFile(downloadedVersion);
-        if (this.onAfterDownload) {
-            this.onAfterDownload();
-        }
+        await ((_c = this.onAfterDownload) === null || _c === void 0 ? void 0 : _c.call(this));
         return binaryPath;
     }
     static async getBinaryVersion(binaryPath) {

package/dist/bundler.d.ts

@@ -1,5 +1,6 @@
-import { LifecycleHook } from './bridge.js';
+import { OnAfterDownloadHook, OnBeforeDownloadHook } from './bridge.js';
 import type { Declaration } from './declaration.js';
+import { EdgeFunction } from './edge_function.js';
 import { FeatureFlags } from './feature_flags.js';
 import { ImportMapFile } from './import_map.js';
 interface BundleOptions {
@@ -8,10 +9,11 @@ interface BundleOptions {
     distImportMapPath?: string;
     featureFlags?: FeatureFlags;
     importMaps?: ImportMapFile[];
-    onAfterDownload?: LifecycleHook;
-    onBeforeDownload?: LifecycleHook;
+    onAfterDownload?: OnAfterDownloadHook;
+    onBeforeDownload?: OnBeforeDownloadHook;
 }
 declare const bundle: (sourceDirectories: string[], distDirectory: string, declarations?: Declaration[], { cacheDirectory, debug, distImportMapPath, featureFlags: inputFeatureFlags, importMaps, onAfterDownload, onBeforeDownload, }?: BundleOptions) => Promise<{
-    functions: import("./edge_function.js").EdgeFunction[];
+    functions: EdgeFunction[];
+    manifest: import("./manifest.js").Manifest;
 }>;
 export { bundle };

package/dist/bundler.js

@@ -9,24 +9,7 @@ import { bundle as bundleESZIP } from './formats/eszip.js';
 import { bundle as bundleJS } from './formats/javascript.js';
 import { ImportMap } from './import_map.js';
 import { writeManifest } from './manifest.js';
-// eslint-disable-next-line max-statements
-const bundle = async (sourceDirectories, distDirectory, declarations = [], { cacheDirectory, debug, distImportMapPath, featureFlags: inputFeatureFlags, importMaps, onAfterDownload, onBeforeDownload, } = {}) => {
-    const featureFlags = getFlags(inputFeatureFlags);
-    const deno = new DenoBridge({
-        debug,
-        cacheDirectory,
-        onAfterDownload,
-        onBeforeDownload,
-    });
-    const basePath = getBasePath(sourceDirectories);
-    // The name of the bundle will be the hash of its contents, which we can't
-    // compute until we run the bundle process. For now, we'll use a random ID
-    // to create the bundle artifacts and rename them later.
-    const buildID = uuidv4();
-    // Creating an ImportMap instance with any import maps supplied by the user,
-    // if any.
-    const importMap = new ImportMap(importMaps);
-    const functions = await findFunctions(sourceDirectories);
+const createBundleOps = ({ basePath, buildID, debug, deno, distDirectory, functions, importMap, featureFlags, }) => {
     const bundleOps = [];
     if (featureFlags.edge_functions_produce_eszip) {
         bundleOps.push(bundleESZIP({
@@ -48,12 +31,41 @@ const bundle = async (sourceDirectories, distDirectory, declarations = [], { cac
             importMap,
         }));
     }
+    return bundleOps;
+};
+const bundle = async (sourceDirectories, distDirectory, declarations = [], { cacheDirectory, debug, distImportMapPath, featureFlags: inputFeatureFlags, importMaps, onAfterDownload, onBeforeDownload, } = {}) => {
+    const featureFlags = getFlags(inputFeatureFlags);
+    const deno = new DenoBridge({
+        debug,
+        cacheDirectory,
+        onAfterDownload,
+        onBeforeDownload,
+    });
+    const basePath = getBasePath(sourceDirectories);
+    // The name of the bundle will be the hash of its contents, which we can't
+    // compute until we run the bundle process. For now, we'll use a random ID
+    // to create the bundle artifacts and rename them later.
+    const buildID = uuidv4();
+    // Creating an ImportMap instance with any import maps supplied by the user,
+    // if any.
+    const importMap = new ImportMap(importMaps);
+    const functions = await findFunctions(sourceDirectories);
+    const bundleOps = createBundleOps({
+        basePath,
+        buildID,
+        debug,
+        deno,
+        distDirectory,
+        functions,
+        importMap,
+        featureFlags,
+    });
     const bundles = await Promise.all(bundleOps);
     // 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.
     await createFinalBundles(bundles, distDirectory, buildID);
-    await writeManifest({
+    const manifest = await writeManifest({
         bundles,
         declarations,
         distDirectory,
@@ -62,7 +74,7 @@ const bundle = async (sourceDirectories, distDirectory, declarations = [], { cac
     if (distImportMapPath) {
         await importMap.writeToFile(distImportMapPath);
     }
-    return { functions };
+    return { functions, manifest };
 };
 const createFinalBundles = async (bundles, distDirectory, buildID) => {
     const renamingOps = bundles.map(async ({ extension, hash }) => {

package/dist/formats/javascript.js

@@ -5,7 +5,7 @@ import { pathToFileURL } from 'url';
 import del from 'del';
 import { wrapBundleError } from '../bundle_error.js';
 import { getFileHash } from '../utils/sha256.js';
-const BOOTSTRAP_LATEST = 'https://62ac9c589c16c50008b6ef55--edge-bootstrap.netlify.app/bootstrap/index-combined.ts';
+const BOOTSTRAP_LATEST = 'https://62bae4994570970008142f1e--edge-bootstrap.netlify.app/bootstrap/index-combined.ts';
 const bundle = async (options) => {
     try {
         return await bundleJS(options);

package/dist/import_map.js

@@ -1,15 +1,15 @@
 import { Buffer } from 'buffer';
 import { promises as fs } from 'fs';
 import { dirname } from 'path';
-const DEFAULT_IMPORTS = {
+const INTERNAL_IMPORTS = {
     'netlify:edge': 'https://edge-bootstrap.netlify.app/v1/index.ts',
 };
 class ImportMap {
     constructor(input = []) {
         const inputImports = input.reduce((acc, { imports }) => ({ ...acc, ...imports }), {});
-        // `DEFAULT_IMPORTS` must come last because we want our internal imports to
-        // take precedence.
-        this.imports = { ...inputImports, ...DEFAULT_IMPORTS };
+        // `INTERNAL_IMPORTS` must come last,
+        // because we need to guarantee `netlify:edge` isn't user-defined.
+        this.imports = { ...inputImports, ...INTERNAL_IMPORTS };
     }
     getContents() {
         const contents = {

package/dist/manifest.d.ts

@@ -24,5 +24,5 @@ interface WriteManifestOptions {
     distDirectory: string;
     functions: EdgeFunction[];
 }
-declare const writeManifest: ({ bundles, declarations, distDirectory, functions }: WriteManifestOptions) => Promise<void>;
+declare const writeManifest: ({ bundles, declarations, distDirectory, functions }: WriteManifestOptions) => Promise<Manifest>;
 export { generateManifest, Manifest, writeManifest };

package/dist/manifest.js

@@ -40,9 +40,10 @@ const getRegularExpression = (declaration) => {
     const normalizedSource = `^${regularExpression.source}\\/?$`;
     return new RegExp(normalizedSource);
 };
-const writeManifest = ({ bundles, declarations = [], distDirectory, functions }) => {
+const writeManifest = async ({ bundles, declarations = [], distDirectory, functions }) => {
     const manifest = generateManifest({ bundles, declarations, functions });
     const manifestPath = join(distDirectory, 'manifest.json');
-    return fs.writeFile(manifestPath, JSON.stringify(manifest));
+    await fs.writeFile(manifestPath, JSON.stringify(manifest));
+    return manifest;
 };
 export { generateManifest, writeManifest };

package/dist/server/server.d.ts

@@ -1,4 +1,4 @@
-import { LifecycleHook } from '../bridge.js';
+import { OnAfterDownloadHook, OnBeforeDownloadHook } from '../bridge.js';
 import type { EdgeFunction } from '../edge_function.js';
 import { ImportMapFile } from '../import_map.js';
 declare type FormatFunction = (name: string) => string;
@@ -13,8 +13,8 @@ interface ServeOptions {
     distImportMapPath?: string;
     inspectSettings?: InspectSettings;
     importMaps?: ImportMapFile[];
-    onAfterDownload?: LifecycleHook;
-    onBeforeDownload?: LifecycleHook;
+    onAfterDownload?: OnAfterDownloadHook;
+    onBeforeDownload?: OnBeforeDownloadHook;
     formatExportTypeError?: FormatFunction;
     formatImportError?: FormatFunction;
     port: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "1.3.0",
+  "version": "1.4.2",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/index.js",