@netlify/edge-bundler 7.0.0 → 7.0.1

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, vi } from 'vitest';
@@ -286,23 +287,35 @@ test('Loads declarations and import maps from the deploy configuration', async (
 test("Ignores entries in `importMapPaths` that don't point to an existing import map file", async () => {
     const systemLogger = vi.fn();
     const { basePath, cleanup, distPath } = await useFixture('with_import_maps');
-    const sourceDirectory = join(basePath, 'functions');
-    const importMapPath = join(distPath, 'some-file-that-does-not-exist.json');
-    const declarations = [
+    const sourceDirectory = join(basePath, 'user-functions');
+    // Creating import map file
+    const importMap = await tmp.file();
+    const importMapContents = {
+        imports: {
+            helper: pathToFileURL(join(basePath, 'helper.ts')).toString(),
+        },
+        scopes: {
+            [pathToFileURL(join(sourceDirectory, 'func3')).toString()]: {
+                helper: pathToFileURL(join(basePath, 'helper2.ts')).toString(),
+            },
+        },
+    };
+    await fs.writeFile(importMap.path, JSON.stringify(importMapContents));
+    const nonExistingImportMapPath = join(distPath, 'some-file-that-does-not-exist.json');
+    const result = await bundle([sourceDirectory], distPath, [
         {
             function: 'func1',
             path: '/func1',
         },
-    ];
-    const result = await bundle([sourceDirectory], distPath, declarations, {
+    ], {
         basePath,
-        configPath: join(sourceDirectory, 'config.json'),
-        importMapPaths: [importMapPath],
+        importMapPaths: [nonExistingImportMapPath, importMap.path],
         systemLogger,
     });
     const generatedFiles = await fs.readdir(distPath);
-    expect(result.functions.length).toBe(1);
+    expect(result.functions.length).toBe(2);
     expect(generatedFiles.length).toBe(2);
-    expect(systemLogger).toHaveBeenCalledWith(`Did not find an import map file at '${importMapPath}'.`);
+    expect(systemLogger).toHaveBeenCalledWith(`Did not find an import map file at '${nonExistingImportMapPath}'.`);
     await cleanup();
+    await importMap.cleanup();
 });

package/dist/node/import_map.js

@@ -85,7 +85,7 @@ class ImportMap {
     async addFiles(paths, logger) {
         for (const path of paths) {
             if (path === undefined) {
-                return;
+                continue;
             }
             await this.addFile(path, logger);
         }

package/dist/test/util.js

@@ -12,13 +12,12 @@ const url = new URL(import.meta.url);
 const dirname = fileURLToPath(url);
 const fixturesDir = resolve(dirname, '..', 'fixtures');
 const useFixture = async (fixtureName) => {
-    const tmpDir = await tmp.dir();
-    const cleanup = () => fs.rmdir(tmpDir.path, { recursive: true });
+    const tmpDir = await tmp.dir({ unsafeCleanup: true });
     const fixtureDir = resolve(fixturesDir, fixtureName);
     const distPath = join(tmpDir.path, '.netlify', 'edge-functions-dist');
     return {
         basePath: fixtureDir,
-        cleanup,
+        cleanup: tmpDir.cleanup,
         distPath,
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",