@netlify/edge-bundler 12.3.2 → 12.4.0

package/deno/lib/common.ts

@@ -42,7 +42,7 @@ const loadWithRetry = (specifier: string, delay = 1000, maxTry = 3) => {
       maxTry,
     });
   } catch (error) {
-    if (isTooManyTries(error)) {
+    if (isTooManyTries(error as Error)) {
       console.error(`Loading ${specifier} failed after ${maxTry} tries.`);
     }
     throw error;

package/dist/node/bridge.d.ts

@@ -1,7 +1,7 @@
 import { type WriteStream } from 'fs';
 import { ExecaChildProcess } from 'execa';
 import { Logger } from './logger.js';
-declare const DENO_VERSION_RANGE = "1.39.0 - 1.46.3";
+declare const DENO_VERSION_RANGE = "1.39.0 - 2.2.4";
 type OnBeforeDownloadHook = () => void | Promise<void>;
 type OnAfterDownloadHook = (error?: Error) => void | Promise<void>;
 interface DenoOptions {
@@ -37,14 +37,16 @@ declare class DenoBridge {
     versionRange: string;
     constructor(options: DenoOptions);
     private downloadBinary;
-    private getBinaryVersion;
+    getBinaryVersion(binaryPath: string): Promise<string | undefined>;
     private getCachedBinary;
     private getGlobalBinary;
     private getRemoteBinary;
     private static runWithBinary;
     private writeVersionFile;
     ensureCacheDirectory(): Promise<void>;
-    getBinaryPath(): Promise<{
+    getBinaryPath(options?: {
+        silent?: boolean;
+    }): Promise<{
         global: boolean;
         path: string;
     }>;

package/dist/node/bridge.js

@@ -12,7 +12,7 @@ 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
-const DENO_VERSION_RANGE = '1.39.0 - 1.46.3';
+const DENO_VERSION_RANGE = '1.39.0 - 2.2.4';
 class DenoBridge {
     constructor(options) {
         var _a, _b, _c, _d, _e;
@@ -119,15 +119,19 @@ class DenoBridge {
     async ensureCacheDirectory() {
         await fs.mkdir(this.cacheDirectory, { recursive: true });
     }
-    async getBinaryPath() {
+    async getBinaryPath(options) {
         const globalPath = await this.getGlobalBinary();
         if (globalPath !== undefined) {
-            this.logger.system('Using global installation of Deno CLI');
+            if (!(options === null || options === void 0 ? void 0 : options.silent)) {
+                this.logger.system('Using global installation of Deno CLI');
+            }
             return { global: true, path: globalPath };
         }
         const cachedPath = await this.getCachedBinary();
         if (cachedPath !== undefined) {
-            this.logger.system('Using cached Deno CLI from', cachedPath);
+            if (!(options === null || options === void 0 ? void 0 : options.silent)) {
+                this.logger.system('Using cached Deno CLI from', cachedPath);
+            }
             return { global: false, path: cachedPath };
         }
         const downloadedPath = await this.getRemoteBinary();

package/dist/node/bundler.test.js

@@ -84,16 +84,11 @@ test('Adds a custom error property to user errors during bundling', async () =>
     }
     catch (error) {
         expect(error).toBeInstanceOf(BundleError);
-        const [messageBeforeStack] = error.message.split('at <anonymous> (file://');
-        expect(messageBeforeStack).toMatchInlineSnapshot(`
-      "error: Uncaught (in promise) Error: The module's source code could not be parsed: Unexpected eof at file:///root/functions/func1.ts:1:27
-
-        export default async () => 
-                                  ~
-            const ret = new Error(getStringFromWasm0(arg0, arg1));
-                        ^
-          "
-    `);
+        const messageBeforeStack = error.message;
+        expect(messageBeforeStack
+            .replace(/file:\/\/\/(.*?\/)(build\/packages\/edge-bundler\/deno\/vendor\/deno\.land\/x\/eszip.*)/, 'file://$2')
+            // eslint-disable-next-line no-control-regex
+            .replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '')).toMatchSnapshot();
         expect(error.customErrorInfo).toEqual({
             location: {
                 format: 'eszip',

package/dist/node/config.js

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs';
 import { join } from 'path';
 import { pathToFileURL } from 'url';
+import { SemVer } from 'semver';
 import tmp from 'tmp-promise';
 import { BundleError } from './bundle_error.js';
 import { getPackagePath } from './package_json.js';
@@ -39,21 +40,23 @@ export const getFunctionConfig = async ({ func, importMap, deno, log, }) => {
     // The extractor will use its exit code to signal different error scenarios,
     // based on the list of exit codes we send as an argument. We then capture
     // the exit code to know exactly what happened and guide people accordingly.
+    const version = new SemVer((await deno.getBinaryVersion((await deno.getBinaryPath({ silent: true })).path)) || '');
     const { exitCode, stderr, stdout } = await deno.run([
         'run',
         '--allow-env',
+        version.major >= 2 ? '--allow-import' : '',
         '--allow-net',
         '--allow-read',
         `--allow-write=${collector.path}`,
-        '--quiet',
         `--import-map=${importMap.toDataURL()}`,
         '--no-config',
         '--node-modules-dir=false',
+        '--quiet',
         extractorPath,
         pathToFileURL(func.path).href,
         pathToFileURL(collector.path).href,
         JSON.stringify(ConfigExitCode),
-    ], { rejectOnExitCode: false });
+    ].filter(Boolean), { rejectOnExitCode: false });
     if (exitCode !== ConfigExitCode.Success) {
         handleConfigError(func, exitCode, stderr, log);
         return {};

package/dist/node/server/server.js

@@ -1,5 +1,6 @@
 import { readdir, unlink } from 'fs/promises';
 import { join } from 'path';
+import { pathToFileURL } from 'url';
 import { DenoBridge } from '../bridge.js';
 import { getFunctionConfig } from '../config.js';
 import { generateStage2 } from '../formats/javascript.js';
@@ -65,7 +66,7 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
             // the `stage2Path` file as well as all of their dependencies.
             // Consumers such as the CLI can use this information to watch all the
             // relevant files and issue an isolate restart when one of them changes.
-            const { stdout } = await deno.run(['info', '--json', stage2Path]);
+            const { stdout } = await deno.run(['info', '--json', pathToFileURL(stage2Path).href]);
             graph = JSON.parse(stdout);
         }
         catch {

package/dist/node/server/server.test.js

@@ -49,8 +49,9 @@ test('Starts a server and serves requests for edge functions', async () => {
     expect(success).toBe(true);
     expect(functionsConfig).toEqual([{ path: '/my-function' }, {}, { path: '/global-netlify' }]);
     expect(npmSpecifiersWithExtraneousFiles).toEqual(['dictionary']);
+    const modules = graph === null || graph === void 0 ? void 0 : graph.modules.filter(({ kind, mediaType }) => kind === 'esm' && mediaType === 'TypeScript');
     for (const key in functions) {
-        const graphEntry = graph === null || graph === void 0 ? void 0 : graph.modules.some(({ kind, mediaType, local }) => kind === 'esm' && mediaType === 'TypeScript' && local === functions[key].path);
+        const graphEntry = modules === null || modules === void 0 ? void 0 : modules.some(({ local }) => local === functions[key].path);
         expect(graphEntry).toBe(true);
     }
     const response1 = await fetch(`http://0.0.0.0:${port}/foo`, {

package/dist/test/util.js

@@ -76,7 +76,7 @@ const runESZIP = async (eszipPath, vendorDirectory) => {
     }
     await fs.rename(stage2Path, `${stage2Path}.js`);
     // Run function that imports the extracted stage 2 and invokes each function.
-    const evalCommand = execa('deno', ['eval', '--no-check', '--import-map', importMapPath, inspectFunction(stage2Path)]);
+    const evalCommand = execa('deno', ['eval', '--import-map', importMapPath, inspectFunction(stage2Path)]);
     (_c = evalCommand.stderr) === null || _c === void 0 ? void 0 : _c.pipe(stderr);
     const result = await evalCommand;
     await tmpDir.cleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "12.3.2",
+  "version": "12.4.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -42,15 +42,12 @@
     "test": "test/node"
   },
   "devDependencies": {
-    "@types/glob-to-regexp": "^0.4.1",
     "@types/node": "^14.18.32",
     "@types/semver": "^7.3.9",
     "@types/uuid": "^10.0.0",
     "@vitest/coverage-v8": "^0.34.0",
     "archiver": "^5.3.1",
     "chalk": "^5.4.0",
-    "cpy": "^9.0.1",
-    "cross-env": "^7.0.3",
     "nock": "^13.2.4",
     "tar": "^6.1.11",
     "typescript": "^5.0.0",
@@ -73,7 +70,6 @@
     "get-package-name": "^2.2.0",
     "get-port": "^6.1.2",
     "is-path-inside": "^4.0.0",
-    "jsonc-parser": "^3.2.0",
     "node-fetch": "^3.1.1",
     "node-stream-zip": "^1.15.0",
     "p-retry": "^5.1.1",
@@ -84,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^9.0.0"
   },
-  "gitHead": "a6d31ce1991f5fcdbdb275ce2d68fe8a60329120"
+  "gitHead": "0e4628f57a0a7d02594b5070074445a4ff69b809"
 }