@netlify/edge-bundler 13.0.1 → 13.0.3

package/dist/node/bundler.test.js

@@ -424,6 +424,28 @@ test('Loads npm modules which use package.json.exports', async () => {
     await cleanup();
     await rm(vendorDirectory.path, { force: true, recursive: true });
 });
+test('Loads modules which contain cycles', async () => {
+    const { basePath, cleanup, distPath } = await useFixture('imports_cycle');
+    const sourceDirectory = join(basePath, 'functions');
+    const declarations = [
+        {
+            function: 'func1',
+            path: '/func1',
+        },
+    ];
+    const vendorDirectory = await tmp.dir();
+    await bundle([sourceDirectory], distPath, declarations, {
+        basePath,
+        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('magix');
+    await cleanup();
+    await rm(vendorDirectory.path, { force: true, recursive: true });
+});
 test('Loads npm modules in a monorepo setup', async () => {
     const systemLogger = vi.fn();
     const { basePath: rootPath, cleanup, distPath } = await useFixture('monorepo_npm_module');

package/dist/node/npm_dependencies.js

@@ -116,7 +116,7 @@ async function parseImportsForFile(file, rootPath) {
  * Parses a set of functions and returns a list of specifiers that correspond
  * to npm modules.
  */
-const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, rootPath }) => {
+const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, rootPath }, alreadySeenPaths = new Set()) => {
     var _a;
     const baseURL = pathToFileURL(basePath);
     const npmSpecifiers = [];
@@ -128,12 +128,20 @@ const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, r
             const specifier = i.moduleSpecifier.isConstant ? i.moduleSpecifier.value : i.moduleSpecifier.code;
             switch (i.moduleSpecifier.type) {
                 case 'absolute': {
-                    npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [specifier], importMap, environment, rootPath })));
+                    if (alreadySeenPaths.has(specifier)) {
+                        break;
+                    }
+                    alreadySeenPaths.add(specifier);
+                    npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [specifier], importMap, environment, rootPath }, alreadySeenPaths)));
                     break;
                 }
                 case 'relative': {
                     const filePath = path.join(path.dirname(func), specifier);
-                    npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [filePath], importMap, environment, rootPath })));
+                    if (alreadySeenPaths.has(filePath)) {
+                        break;
+                    }
+                    alreadySeenPaths.add(filePath);
+                    npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [filePath], importMap, environment, rootPath }, alreadySeenPaths)));
                     break;
                 }
                 case 'package': {
@@ -146,7 +154,11 @@ const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, r
                     if (matched) {
                         if (resolvedImport.protocol === 'file:') {
                             const newSpecifier = fileURLToPath(resolvedImport).replace(/\\/g, '/');
-                            npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [newSpecifier], importMap, environment, rootPath })));
+                            if (alreadySeenPaths.has(newSpecifier)) {
+                                break;
+                            }
+                            alreadySeenPaths.add(newSpecifier);
+                            npmSpecifiers.push(...(await getNPMSpecifiers({ basePath, functions: [newSpecifier], importMap, environment, rootPath }, alreadySeenPaths)));
                         }
                     }
                     else if (!((_a = resolvedImport === null || resolvedImport === void 0 ? void 0 : resolvedImport.protocol) === null || _a === void 0 ? void 0 : _a.startsWith('http'))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "13.0.1",
+  "version": "13.0.3",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -63,7 +63,7 @@
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.25.2",
+    "esbuild": "0.25.4",
     "execa": "^7.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",
@@ -80,5 +80,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^9.0.0"
   },
-  "gitHead": "088efc4b1328d8b6c1727daa305e4ebab9c0bad2"
+  "gitHead": "7ad3e18629779815c5f6ec35db99337c31094b93"
 }