fix(core): support new name for enforce-module-boundaries eslint rule (…

…#742)
nx-dotnet · Jul 11, 2023 · 24eb831 · 24eb831
1 parent 7dd60b2
commit 24eb831
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/packages/core/src/tasks/check-module-boundaries.spec.ts b/packages/core/src/tasks/check-module-boundaries.spec.ts
@@ -53,26 +53,29 @@ describe('load-module-boundaries', () => {
     expect(boundaries).toEqual(MOCK_BOUNDARIES);
   });
 
-  it('should load from eslint if boundaries not in config', async () => {
-    const eslintConfigSpy = jest
-      .spyOn(ESLintNamespace, 'ESLint')
-      .mockReturnValue({
-        calculateConfigForFile: jest.fn().mockResolvedValue({
-          rules: {
-            '@nrwl/nx/enforce-module-boundaries': [
-              1,
-              { depConstraints: MOCK_BOUNDARIES },
-            ],
-          },
-        }),
-      } as unknown as ESLintNamespace.ESLint);
-    writeJson<NxDotnetConfig>(appTree, CONFIG_FILE_PATH, {
-      nugetPackages: {},
-    });
-    const boundaries = await loadModuleBoundaries('', appTree);
-    expect(eslintConfigSpy).toHaveBeenCalledTimes(1);
-    expect(boundaries).toEqual(MOCK_BOUNDARIES);
-  });
+  it.each([
+    '@nrwl/nx/enforce-module-boundaries',
+    '@nx/enforce-module-boundaries',
+  ])(
+    'should load from eslint if boundaries not in config',
+    async (eslintRuleName) => {
+      const eslintConfigSpy = jest
+        .spyOn(ESLintNamespace, 'ESLint')
+        .mockReturnValue({
+          calculateConfigForFile: jest.fn().mockResolvedValue({
+            rules: {
+              [eslintRuleName]: [1, { depConstraints: MOCK_BOUNDARIES }],
+            },
+          }),
+        } as unknown as ESLintNamespace.ESLint);
+      writeJson<NxDotnetConfig>(appTree, CONFIG_FILE_PATH, {
+        nugetPackages: {},
+      });
+      const boundaries = await loadModuleBoundaries('', appTree);
+      expect(eslintConfigSpy).toHaveBeenCalledTimes(1);
+      expect(boundaries).toEqual(MOCK_BOUNDARIES);
+    },
+  );
 });
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -84,7 +87,7 @@ describe('enforce-module-boundaries', () => {
     jest.spyOn(ESLintNamespace, 'ESLint').mockReturnValue({
       calculateConfigForFile: jest.fn().mockResolvedValue({
         rules: {
-          '@nrwl/nx/enforce-module-boundaries': [
+          '@nx/enforce-module-boundaries': [
             1,
             { depConstraints: MOCK_BOUNDARIES },
           ],

diff --git a/packages/core/src/tasks/check-module-boundaries.ts b/packages/core/src/tasks/check-module-boundaries.ts
@@ -80,11 +80,13 @@ export async function loadModuleBoundaries(
         .calculateConfigForFile(`${root}/non-existant.ts`)
         .catch(() =>
           Promise.resolve({
-            rules: { '@nrwl/nx/enforce-module-boundaries': [] },
+            rules: { '@nx/enforce-module-boundaries': [] },
           }),
         );
       const [, moduleBoundaryConfig] =
-        result.rules['@nrwl/nx/enforce-module-boundaries'] || [];
+        result.rules['@nx/enforce-module-boundaries'] ||
+        result.rules['@nrwl/nx/enforce-module-boundaries'] ||
+        [];
       return moduleBoundaryConfig?.depConstraints ?? [];
     } catch {
       return [];