fix(bundling): handle circular dependencies in @nx/esbuild getExtraDe…

…pendencies (#22644)
nrwl · Apr 18, 2024 · e549ea2 · e549ea2
1 parent edc7931
commit e549ea2
Show file tree

Hide file tree

Showing 2 changed files with 119 additions and 0 deletions.
diff --git a/packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.spec.ts b/packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.spec.ts
@@ -80,4 +80,118 @@ describe('getExtraDependencies', () => {
       },
     ]);
   });
+
+  it('should include npm dependencies of circular dependency child libs', () => {
+    const result = getExtraDependencies('parent', {
+      nodes: {
+        parent: {
+          type: 'app',
+          name: 'parent',
+          data: {},
+        },
+        child1: {
+          type: 'lib',
+          name: 'child1',
+          data: {},
+        },
+        child2: {
+          type: 'lib',
+          name: 'child2',
+          data: {},
+        },
+        child3: {
+          type: 'lib',
+          name: 'child3',
+          data: {},
+        },
+        child4: {
+          type: 'lib',
+          name: 'child4',
+          data: {},
+        },
+      } as any,
+      externalNodes: {
+        'npm:react': {
+          type: 'npm',
+          name: 'npm:react',
+          data: { packageName: 'react', version: '18.0.0' },
+        },
+        'npm:axios': {
+          type: 'npm',
+          name: 'npm:axios',
+          data: { packageName: 'axios', version: '1.0.0' },
+        },
+        'npm:dayjs': {
+          type: 'npm',
+          name: 'npm:dayjs',
+          data: { packageName: 'dayjs', version: '1.11.0' },
+        },
+        'npm:date-fns': {
+          type: 'npm',
+          name: 'npm:date-fns',
+          data: { packageName: 'date-fns', version: '2.0.0' },
+        },
+      },
+      dependencies: {
+        parent: [
+          { source: 'parent', target: 'child1', type: 'static' },
+          { source: 'parent', target: 'npm:react', type: 'static' },
+        ],
+        child1: [
+          { source: 'child1', target: 'child2', type: 'static' },
+          { source: 'child1', target: 'child3', type: 'static' },
+          { source: 'child1', target: 'npm:axios', type: 'static' },
+          { source: 'child1', target: 'child4', type: 'static' },
+        ],
+        child2: [
+          { source: 'child2', target: 'npm:dayjs', type: 'static' },
+          { source: 'child2', target: 'child3', type: 'static' },
+        ],
+        child3: [{ source: 'child3', target: 'child4', type: 'static' }],
+        child4: [
+          { source: 'child4', target: 'child3', type: 'static' },
+          { source: 'child4', target: 'npm:date-fns', type: 'static' },
+        ],
+      },
+    });
+
+    expect(result).toEqual([
+      {
+        name: 'npm:react',
+        outputs: [],
+        node: {
+          type: 'npm',
+          name: 'npm:react',
+          data: { packageName: 'react', version: '18.0.0' },
+        },
+      },
+      {
+        name: 'npm:axios',
+        outputs: [],
+        node: {
+          type: 'npm',
+          name: 'npm:axios',
+          data: { packageName: 'axios', version: '1.0.0' },
+        },
+      },
+      {
+        name: 'npm:dayjs',
+        outputs: [],
+        node: {
+          type: 'npm',
+          name: 'npm:dayjs',
+          data: { packageName: 'dayjs', version: '1.11.0' },
+        },
+      },
+      {
+        name: 'npm:date-fns',
+        outputs: [],
+        node: {
+          type: 'npm',
+          name: 'npm:date-fns',
+          data: { packageName: 'date-fns', version: '2.0.0' },
+        },
+      },
+    ]);
+  });
 });
diff --git a/packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.ts b/packages/esbuild/src/executors/esbuild/lib/get-extra-dependencies.ts
@@ -6,9 +6,14 @@ export function getExtraDependencies(
   graph: ProjectGraph
 ): DependentBuildableProjectNode[] {
   const deps = new Map<string, DependentBuildableProjectNode>();
+  const visited = new Set<string>(); // Track visited projects
+
   recur(projectName);
 
   function recur(currProjectName) {
+    if (visited.has(currProjectName)) return; // Check if project already visited
+    visited.add(currProjectName); // Mark project as visited
+
     const allDeps = graph.dependencies[currProjectName];
     const externalDeps = allDeps.reduce((acc, node) => {
       const found = graph.externalNodes[node.target];