@netlify/edge-bundler 1.4.0 → 1.4.3

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,4 +1,4 @@
-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';
@@ -9,8 +9,8 @@ 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: EdgeFunction[];

package/dist/formats/eszip.d.ts

@@ -9,5 +9,5 @@ interface BundleESZIPOptions {
     distDirectory: string;
     functions: EdgeFunction[];
 }
-declare const bundle: (options: BundleESZIPOptions) => Promise<Bundle>;
-export { bundle };
+declare const bundleESZIP: ({ basePath, buildID, debug, deno, distDirectory, functions, }: BundleESZIPOptions) => Promise<Bundle>;
+export { bundleESZIP as bundle };

package/dist/formats/eszip.js

@@ -2,14 +2,6 @@ import { join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { wrapBundleError } from '../bundle_error.js';
 import { getFileHash } from '../utils/sha256.js';
-const bundle = async (options) => {
-    try {
-        return await bundleESZIP(options);
-    }
-    catch (error) {
-        throw wrapBundleError(error, { format: 'eszip' });
-    }
-};
 const bundleESZIP = async ({ basePath, buildID, debug, deno, distDirectory, functions, }) => {
     const extension = '.eszip';
     const destPath = join(distDirectory, `${buildID}${extension}`);
@@ -23,7 +15,12 @@ const bundleESZIP = async ({ basePath, buildID, debug, deno, distDirectory, func
     if (!debug) {
         flags.push('--quiet');
     }
-    await deno.run(['run', ...flags, bundler, JSON.stringify(payload)], { pipeOutput: true });
+    try {
+        await deno.run(['run', ...flags, bundler, JSON.stringify(payload)], { pipeOutput: true });
+    }
+    catch (error) {
+        throw wrapBundleError(error, { format: 'eszip' });
+    }
     const hash = await getFileHash(destPath);
     return { extension, format: 'eszip2', hash };
 };
@@ -33,4 +30,4 @@ const getESZIPBundler = () => {
     const bundlerPath = resolve(pathname, '../../../deno/bundle.ts');
     return bundlerPath;
 };
-export { bundle };
+export { bundleESZIP as bundle };

package/dist/formats/javascript.d.ts

@@ -11,7 +11,7 @@ interface BundleJSOptions {
     functions: EdgeFunction[];
     importMap: ImportMap;
 }
-declare const bundle: (options: BundleJSOptions) => Promise<Bundle>;
+declare const bundleJS: ({ buildID, debug, deno, distDirectory, functions, importMap, }: BundleJSOptions) => Promise<Bundle>;
 interface GenerateStage2Options {
     distDirectory: string;
     fileName: string;
@@ -22,4 +22,4 @@ interface GenerateStage2Options {
 }
 declare const generateStage2: ({ distDirectory, fileName, formatExportTypeError, formatImportError, functions, type, }: GenerateStage2Options) => Promise<string>;
 declare const getBootstrapURL: () => string;
-export { bundle, generateStage2, getBootstrapURL };
+export { bundleJS as bundle, generateStage2, getBootstrapURL };

package/dist/formats/javascript.js

@@ -5,15 +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 bundle = async (options) => {
-    try {
-        return await bundleJS(options);
-    }
-    catch (error) {
-        throw wrapBundleError(error, { format: 'javascript' });
-    }
-};
+const BOOTSTRAP_LATEST = 'https://62bae4994570970008142f1e--edge-bootstrap.netlify.app/bootstrap/index-combined.ts';
 const bundleJS = async ({ buildID, debug, deno, distDirectory, functions, importMap, }) => {
     const stage2Path = await generateStage2({ distDirectory, functions, fileName: `${buildID}-pre.js` });
     const extension = '.js';
@@ -22,7 +14,12 @@ const bundleJS = async ({ buildID, debug, deno, distDirectory, functions, import
     if (!debug) {
         flags.push('--quiet');
     }
-    await deno.run(['bundle', ...flags, stage2Path, jsBundlePath], { pipeOutput: true });
+    try {
+        await deno.run(['bundle', ...flags, stage2Path, jsBundlePath], { pipeOutput: true });
+    }
+    catch (error) {
+        throw wrapBundleError(error, { format: 'javascript' });
+    }
     await fs.unlink(stage2Path);
     const hash = await getFileHash(jsBundlePath);
     return { extension, format: 'js', hash };
@@ -80,4 +77,4 @@ const getProductionEntryPoint = (functions) => {
     const defaultExport = 'boot(functions);';
     return [bootImport, importLines, exportDeclaration, defaultExport].join('\n\n');
 };
-export { bundle, generateStage2, getBootstrapURL };
+export { bundleJS as bundle, generateStage2, getBootstrapURL };

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/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.4.0",
+  "version": "1.4.3",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/index.js",