@netlify/edge-bundler 14.0.4 → 14.0.6

package/dist/node/downloader.js

@@ -1,7 +1,7 @@
 import { createWriteStream, promises as fs } from 'fs';
+import { Readable } from 'node:stream';
 import path from 'path';
 import { promisify } from 'util';
-import fetch from 'node-fetch';
 import StreamZip from 'node-stream-zip';
 import pRetry from 'p-retry';
 import semver from 'semver';
@@ -45,7 +45,7 @@ const downloadVersion = async (versionRange) => {
     if (res.body === null || res.status < 200 || res.status > 299) {
         throw new Error(`Download failed with status code ${res.status}`);
     }
-    return res.body;
+    return Readable.from(res.body);
 };
 const extractBinaryFromZip = async (zipPath, binaryPath, binaryName) => {
     const { async: StreamZipAsync } = StreamZip;

package/dist/node/downloader.test.js

@@ -88,7 +88,7 @@ test('fails downloading binary after 4th time', async (ctx) => {
         await download(ctx.tmpDir, `^${version}`, testLogger);
     }
     catch (error) {
-        expect(error).toMatch(/Download failed with status code 500/);
+        expect(error.message).toMatch(/Download failed with status code 500/);
     }
     expect(latestVersionMock.isDone()).toBe(true);
 });
@@ -118,7 +118,7 @@ test('fails downloading if response stream throws error', async (ctx) => {
         await download(ctx.tmpDir, `^${version}`, testLogger);
     }
     catch (error) {
-        expect(error).toMatch(/stream error/);
+        expect(error.message).toMatch(/stream error/);
     }
     expect(latestVersionMock.isDone()).toBe(true);
 });

package/dist/node/npm_dependencies.js

@@ -152,7 +152,7 @@ const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, r
                     }
                     const { matched, resolvedImport } = resolve(specifier, importMap, baseURL);
                     if (matched) {
-                        if (resolvedImport.protocol === 'file:') {
+                        if ((resolvedImport === null || resolvedImport === void 0 ? void 0 : resolvedImport.protocol) === 'file:') {
                             const newSpecifier = fileURLToPath(resolvedImport).replace(/\\/g, '/');
                             if (alreadySeenPaths.has(newSpecifier)) {
                                 break;

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

@@ -3,7 +3,6 @@ import { readFile } from 'fs/promises';
 import { join } from 'path';
 import process from 'process';
 import getPort from 'get-port';
-import fetch from 'node-fetch';
 import tmp from 'tmp-promise';
 import { v4 as uuidv4 } from 'uuid';
 import { test, expect } from 'vitest';

package/dist/node/server/util.js

@@ -1,5 +1,4 @@
 import { platform } from 'os';
-import fetch from 'node-fetch';
 import waitFor from 'p-wait-for';
 import { satisfies } from 'semver';
 // 1 second

package/dist/node/types.js

@@ -1,6 +1,5 @@
 import { promises as fs } from 'fs';
 import { join } from 'path';
-import fetch from 'node-fetch';
 const TYPES_URL = 'https://edge.netlify.com';
 const ensureLatestTypes = async (deno, logger, customTypesURL) => {
     const typesURL = customTypesURL !== null && customTypesURL !== void 0 ? customTypesURL : TYPES_URL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.0.4",
+  "version": "14.0.6",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -42,34 +42,34 @@
     "test": "test/node"
   },
   "devDependencies": {
-    "@types/node": "^14.18.32",
+    "@types/node": "^18.0.0",
     "@types/semver": "^7.3.9",
     "@types/uuid": "^10.0.0",
-    "@vitest/coverage-v8": "^0.34.0",
+    "@vitest/coverage-v8": "^3.0.0",
     "archiver": "^7.0.0",
     "chalk": "^5.4.0",
-    "nock": "^13.2.4",
-    "tar": "^6.1.11",
+    "nock": "^14.0.0",
+    "npm-run-all2": "^6.0.0",
+    "tar": "^7.0.0",
     "typescript": "^5.0.0",
-    "vitest": "^0.34.0"
+    "vitest": "^3.0.0"
   },
   "engines": {
     "node": ">=18.14.0"
   },
   "dependencies": {
-    "@import-maps/resolve": "^1.0.1",
+    "@import-maps/resolve": "^2.0.0",
     "ajv": "^8.11.2",
     "ajv-errors": "^3.0.0",
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.25.4",
+    "esbuild": "0.25.5",
     "execa": "^8.0.0",
     "find-up": "^7.0.0",
     "get-package-name": "^2.2.0",
     "get-port": "^7.0.0",
     "is-path-inside": "^4.0.0",
-    "node-fetch": "^3.1.1",
     "node-stream-zip": "^1.15.0",
     "p-retry": "^6.0.0",
     "p-wait-for": "^5.0.0",
@@ -80,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "992493d32e1d68d165c4ceb78f93abb52bf24150"
+  "gitHead": "4a0f587ae4efe1c2e62c25c11374e3fbaa9aebce"
 }

package/deno/lib/stage2.test.ts

@@ -1,58 +0,0 @@
-import { assertEquals, assertStringIncludes } from 'https://deno.land/std@0.177.0/testing/asserts.ts'
-
-import { join } from 'https://deno.land/std@0.177.0/path/mod.ts'
-import { pathToFileURL } from 'https://deno.land/std@0.177.0/node/url.ts'
-
-import { getStage2Entry } from './stage2.ts'
-import { virtualRoot } from './consts.ts'
-
-Deno.test('`getStage2Entry` returns a valid stage 2 file', async () => {
-  const directory = await Deno.makeTempDir()
-  const functions = [
-    {
-      name: 'func1',
-      path: join(directory, 'func1.ts'),
-      response: 'Hello from function 1',
-    },
-    {
-      name: 'func2',
-      path: join(directory, 'func2.ts'),
-      response: 'Hello from function 2',
-    },
-  ]
-
-  for (const func of functions) {
-    const contents = `export default async () => new Response(${JSON.stringify(func.response)})`
-
-    await Deno.writeTextFile(func.path, contents)
-  }
-
-  const baseURL = pathToFileURL(directory)
-  const stage2 = getStage2Entry(
-    directory,
-    functions.map(({ name, path }) => ({ name, path })),
-  )
-
-  // Ensuring that the stage 2 paths have the virtual root before we strip it.
-  assertStringIncludes(stage2, virtualRoot)
-
-  // Replacing the virtual root with the URL of the temporary directory so that
-  // we can actually import the module.
-  const normalizedStage2 = stage2.replaceAll(virtualRoot, `${baseURL.href}/`)
-
-  const stage2Path = join(directory, 'stage2.ts')
-  const stage2URL = pathToFileURL(stage2Path)
-
-  await Deno.writeTextFile(stage2Path, normalizedStage2)
-
-  const mod = await import(stage2URL.href)
-
-  await Deno.remove(directory, { recursive: true })
-
-  for (const func of functions) {
-    const result = await mod.functions[func.name]()
-
-    assertEquals(await result.text(), func.response)
-    assertEquals(mod.metadata.functions[func.name].url, pathToFileURL(func.path).toString())
-  }
-})