@netlify/edge-bundler 14.3.0 → 14.4.1

package/dist/node/bundler.test.js

@@ -1,14 +1,13 @@
 import { Buffer } from 'buffer';
-import { execSync } from 'node:child_process';
 import { access, readdir, readFile, rm, writeFile } from 'fs/promises';
 import { join, resolve } from 'path';
 import process from 'process';
 import { pathToFileURL } from 'url';
-import { lt } from 'semver';
+import { gte, lt } from 'semver';
 import tmp from 'tmp-promise';
 import { test, expect, vi, describe } from 'vitest';
 import { importMapSpecifier } from '../shared/consts.js';
-import { runESZIP, runTarball, useFixture } from '../test/util.js';
+import { denoVersion, runESZIP, runTarball, useFixture } from '../test/util.js';
 import { BundleError } from './bundle_error.js';
 import { bundle } from './bundler.js';
 import { isFileNotFoundError } from './utils/error.js';
@@ -476,7 +475,7 @@ test('Loads npm modules in a monorepo setup', async () => {
     await cleanup();
     await rm(vendorDirectory.path, { force: true, recursive: true });
 });
-test('Loads JSON modules', async () => {
+test('Loads JSON modules with `with` attribute', async () => {
     const { basePath, cleanup, distPath } = await useFixture('imports_json');
     const sourceDirectory = join(basePath, 'functions');
     const declarations = [
@@ -498,6 +497,35 @@ test('Loads JSON modules', async () => {
     await cleanup();
     await rm(vendorDirectory.path, { force: true, recursive: true });
 });
+// We can't run this on versions above 2.0.0 because the bundling will fail
+// entirely, and what we're asserting here is that we emit a system log when
+// import assertions are detected on successful builds. Also, running it on
+// earlier versions won't work either, since those won't even show a warning.
+test.skipIf(lt(denoVersion, '1.46.3') || gte(denoVersion, '2.0.0'))('Emits a system log when import assertions are used', async () => {
+    const { basePath, cleanup, distPath } = await useFixture('with_import_assert');
+    const sourceDirectory = join(basePath, 'functions');
+    const declarations = [
+        {
+            function: 'func1',
+            path: '/func1',
+        },
+    ];
+    const vendorDirectory = await tmp.dir();
+    const systemLogger = vi.fn();
+    await bundle([sourceDirectory], distPath, declarations, {
+        basePath,
+        systemLogger,
+        vendorDirectory: vendorDirectory.path,
+    });
+    const manifestFile = await readFile(resolve(distPath, 'manifest.json'), 'utf8');
+    const manifest = JSON.parse(manifestFile);
+    const bundlePath = join(distPath, manifest.bundles[0].asset);
+    const { func1 } = await runESZIP(bundlePath, vendorDirectory.path);
+    expect(func1).toBe(`{"foo":"bar"}`);
+    expect(systemLogger).toHaveBeenCalledWith(`Edge function uses import assertions: ${join(sourceDirectory, 'func1.ts')}`);
+    await cleanup();
+    await rm(vendorDirectory.path, { force: true, recursive: true });
+});
 test('Supports TSX and process.env', async () => {
     const { basePath, cleanup, distPath } = await useFixture('tsx');
     const sourceDirectory = join(basePath, 'functions');
@@ -552,7 +580,6 @@ test('Loads edge functions from the Frameworks API', async () => {
     });
     await cleanup();
 });
-const denoVersion = execSync('deno eval --no-lock "console.log(Deno.version.deno)"').toString();
 describe.skipIf(lt(denoVersion, '2.4.2'))('Produces a tarball bundle', () => {
     test('With only local imports', async () => {
         const systemLogger = vi.fn();

package/dist/node/config.js

@@ -37,10 +37,11 @@ export const getFunctionConfig = async ({ func, importMap, deno, log, }) => {
     // the config function to write to stdout and stderr without that interfering
     // with the extractor.
     const collector = await tmp.file();
+    // Retrieving the version of Deno.
+    const version = new SemVer((await deno.getBinaryVersion((await deno.getBinaryPath({ silent: true })).path)) || '');
     // 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',
@@ -57,6 +58,9 @@ export const getFunctionConfig = async ({ func, importMap, deno, log, }) => {
         pathToFileURL(collector.path).href,
         JSON.stringify(ConfigExitCode),
     ].filter(Boolean), { rejectOnExitCode: false });
+    if (stderr.includes('Import assertions are deprecated')) {
+        log.system(`Edge function uses import assertions: ${func.path}`);
+    }
     if (exitCode !== ConfigExitCode.Success) {
         handleConfigError(func, exitCode, stderr, log);
         return {};

package/dist/node/validation/manifest/index.test.js

@@ -166,7 +166,7 @@ describe('route headers', () => {
         manifest.routes[0].headers = {
             'x-custom-header': {
                 matcher: 'regex',
-                pattern: '^Bearer .+$',
+                pattern: 'Bearer .+',
             },
         };
         expect(() => validateManifest(manifest)).not.toThrowError();
@@ -203,7 +203,7 @@ describe('route headers', () => {
         manifest.routes[0].headers = {
             'x-custom-header': {
                 matcher: 'regex',
-                pattern: '/^Bearer .+/',
+                pattern: /^Bearer .+/,
             },
         };
         expect(() => validateManifest(manifest)).toThrowErrorMatchingSnapshot();

package/dist/node/validation/manifest/schema.d.ts

@@ -66,7 +66,6 @@ declare const edgeManifestSchema: {
                                 properties: {
                                     pattern: {
                                         type: string;
-                                        format: string;
                                     };
                                     matcher: {
                                         type: string;
@@ -139,7 +138,6 @@ declare const edgeManifestSchema: {
                                 properties: {
                                     pattern: {
                                         type: string;
-                                        format: string;
                                     };
                                     matcher: {
                                         type: string;

package/dist/node/validation/manifest/schema.js

@@ -24,7 +24,6 @@ const headersSchema = {
             properties: {
                 pattern: {
                     type: 'string',
-                    format: 'regexPattern',
                 },
                 matcher: {
                     type: 'string',

package/dist/test/util.d.ts

@@ -16,4 +16,5 @@ export declare const useFixture: (fixtureName: string, { copyDirectory }?: UseFi
 export declare const getRouteMatcher: (manifest: Manifest) => (candidate: string) => import("../node/manifest.js").Route | undefined;
 export declare const runESZIP: (eszipPath: string, vendorDirectory?: string) => Promise<any>;
 export declare const runTarball: (tarballPath: string) => Promise<any>;
+export declare const denoVersion: string;
 export {};

package/dist/test/util.js

@@ -1,7 +1,8 @@
-import { promises as fs } from 'fs';
-import { join, resolve } from 'path';
-import { stderr, stdout } from 'process';
-import { fileURLToPath, pathToFileURL } from 'url';
+import { execSync } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { stderr, stdout } from 'node:process';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import cpy from 'cpy';
 import { execa } from 'execa';
 import * as tar from 'tar';
@@ -128,3 +129,4 @@ export const runTarball = async (tarballPath) => {
     await tmpDir.cleanup();
     return JSON.parse(result.stdout);
 };
+export const denoVersion = execSync('deno eval --no-lock "console.log(Deno.version.deno)"').toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.3.0",
+  "version": "14.4.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -68,9 +68,7 @@
     "esbuild": "0.25.6",
     "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-stream-zip": "^1.15.0",
     "p-retry": "^6.0.0",
     "p-wait-for": "^5.0.0",
@@ -82,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "f65a08178a04db0ad274aa62f7d46319f2ef661a"
+  "gitHead": "2b427686f1d4cfc2d28b79d4ce18ad691f270d2e"
 }