@netlify/edge-bundler 5.3.1 → 5.3.3

package/dist/node/bundler.test.js

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs';
 import { join, resolve } from 'path';
 import process from 'process';
+import { pathToFileURL } from 'url';
 import { deleteAsync } from 'del';
 import tmp from 'tmp-promise';
 import { test, expect } from 'vitest';
@@ -8,6 +9,7 @@ import { useFixture } from '../test/util.js';
 import { BundleError } from './bundle_error.js';
 import { bundle } from './bundler.js';
 import { isNodeError } from './utils/error.js';
+import { validateManifest } from './validation/manifest/index.js';
 test('Produces an ESZIP bundle', async () => {
     const { basePath, cleanup, distPath } = await useFixture('with_import_maps');
     const declarations = [
@@ -27,6 +29,7 @@ test('Produces an ESZIP bundle', async () => {
     expect(generatedFiles.length).toBe(3);
     const manifestFile = await fs.readFile(resolve(distPath, 'manifest.json'), 'utf8');
     const manifest = JSON.parse(manifestFile);
+    expect(() => validateManifest(manifest)).not.toThrowError();
     const { bundles, import_map: importMapURL } = manifest;
     expect(bundles.length).toBe(1);
     expect(bundles[0].format).toBe('eszip2');
@@ -280,3 +283,33 @@ test('Loads declarations and import maps from the deploy configuration', async (
     expect(generatedFiles.includes(bundles[0].asset)).toBe(true);
     await cleanup();
 });
+test('Uses an absolute URL for the import map when the dist directory is not a child of the base path', async () => {
+    const { basePath, cleanup } = await useFixture('with_import_maps');
+    const { path: distPath } = await tmp.dir();
+    const declarations = [
+        {
+            function: 'func1',
+            path: '/func1',
+        },
+    ];
+    const sourceDirectory = join(basePath, 'functions');
+    const result = await bundle([sourceDirectory], distPath, declarations, {
+        basePath,
+        configPath: join(sourceDirectory, 'config.json'),
+    });
+    const generatedFiles = await fs.readdir(distPath);
+    expect(result.functions.length).toBe(1);
+    // ESZIP, manifest and import map.
+    expect(generatedFiles.length).toBe(3);
+    const manifestFile = await fs.readFile(resolve(distPath, 'manifest.json'), 'utf8');
+    const manifest = JSON.parse(manifestFile);
+    expect(() => validateManifest(manifest)).not.toThrowError();
+    const { bundles, import_map: importMapURL } = manifest;
+    expect(bundles.length).toBe(1);
+    expect(bundles[0].format).toBe('eszip2');
+    expect(generatedFiles.includes(bundles[0].asset)).toBe(true);
+    const importMapPath = join(distPath, 'import_map.json');
+    expect(importMapURL).toBe(pathToFileURL(importMapPath).toString());
+    await cleanup();
+    await fs.rm(distPath, { recursive: true });
+});

package/dist/node/formats/eszip.js

@@ -1,4 +1,5 @@
 import { join, relative } from 'path';
+import { pathToFileURL } from 'url';
 import { virtualRoot } from '../../shared/consts.js';
 import { BundleFormat } from '../bundle.js';
 import { wrapBundleError } from '../bundle_error.js';
@@ -35,8 +36,16 @@ const bundleESZIP = async ({ basePath, buildID, debug, deno, distDirectory, exte
 const createUserImportMap = async (importMap, basePath, distDirectory) => {
     const destPath = join(distDirectory, 'import_map.json');
     await importMap.writeToFile(destPath);
-    const relativePath = relative(basePath, destPath);
-    const importMapURL = new URL(relativePath, virtualRoot);
+    const virtualPath = relative(basePath, destPath);
+    // If the dist directory is not a child of the base path, we can't represent
+    // the relative path as a file URL (because something like 'file://../foo' is
+    // not valid). This should never happen, but it's best to leave the absolute
+    // path untransformed to avoid getting a build error due to a missing import
+    // map.
+    if (virtualPath.startsWith('..')) {
+        return pathToFileURL(destPath).toString();
+    }
+    const importMapURL = new URL(virtualPath, virtualRoot);
     return importMapURL.toString();
 };
 const getESZIPPaths = () => {

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

@@ -115,12 +115,12 @@ describe('layers', () => {
 describe('import map URL', () => {
     test('should accept string value', () => {
         const manifest = getBaseManifest();
-        manifest.importMapURL = 'file:///root/.netlify/edge-functions-dist/import_map.json';
+        manifest.import_map = 'file:///root/.netlify/edge-functions-dist/import_map.json';
         expect(() => validateManifest(manifest)).not.toThrowError();
     });
     test('should throw on wrong type', () => {
         const manifest = getBaseManifest();
-        manifest.importMapURL = ['file:///root/.netlify/edge-functions-dist/import_map.json'];
+        manifest.import_map = ['file:///root/.netlify/edge-functions-dist/import_map.json'];
         expect(() => validateManifest(manifest)).toThrowErrorMatchingSnapshot();
     });
 });

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

@@ -80,7 +80,7 @@ declare const edgeManifestSchema: {
                 additionalProperties: boolean;
             };
         };
-        importMapURL: {
+        import_map: {
             type: string;
         };
         bundler_version: {

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

@@ -51,7 +51,7 @@ const edgeManifestSchema = {
             type: 'array',
             items: layersSchema,
         },
-        importMapURL: { type: 'string' },
+        import_map: { type: 'string' },
         bundler_version: { type: 'string' },
     },
     additionalProperties: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "5.3.1",
+  "version": "5.3.3",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -57,7 +57,7 @@
     "@types/node": "^14.18.32",
     "@types/semver": "^7.3.9",
     "@types/sinon": "^10.0.8",
-    "@types/uuid": "^8.3.4",
+    "@types/uuid": "^9.0.0",
     "@vitest/coverage-c8": "^0.25.0",
     "archiver": "^5.3.1",
     "cpy": "^9.0.1",