refactor: wip

Author: BioPhoton

README_AXE_ISSUE.md

@@ -11,7 +11,6 @@ import coveragePlugin, {
 } from './packages/plugin-coverage/src/index.js';
 import eslintPlugin, {
   eslintConfigFromAllNxProjects,
-  eslintConfigFromNxProject,
 } from './packages/plugin-eslint/src/index.js';
 import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
 import jsDocsPlugin from './packages/plugin-jsdocs/src/index.js';
@@ -44,15 +43,18 @@ export async function configureEslintPlugin(
   return {
     plugins: [
       projectName
-        ? await eslintPlugin(await eslintConfigFromNxProject(projectName), {
-            artifacts: {
-              // We leverage Nx dependsOn to only run all lint targets before we run code-pushup
-              // generateArtifactsCommand: 'npx nx run-many -t lint',
-              artifactsPaths: [
-                `packages/${projectName}/.eslint/eslint-report.json`,
-              ],
+        ? await eslintPlugin(
+            { eslintrc: `packages/${projectName}/eslint.config.js` },
+            {
+              artifacts: {
+                // We leverage Nx dependsOn to only run all lint targets before we run code-pushup
+                // generateArtifactsCommand: 'npx nx run-many -t lint',
+                artifactsPaths: [
+                  `packages/${projectName}/.eslint/eslint-report.json`,
+                ],
+              },
             },
-          })
+          )
         : await eslintPlugin(await eslintConfigFromAllNxProjects()),
     ],
     categories: [

code-pushup.preset.ts

@@ -64,6 +64,6 @@ describe('coreConfigMiddleware', () => {
         ),
         ...CLI_DEFAULTS,
       }),
-    ).rejects.toThrow(/Cannot find (module|package) '@example\/custom-plugin'/);
+    ).rejects.toThrow("Cannot find package '@example/custom-plugin'");
   });
 });

packages/cli/src/lib/implementation/core-config.middleware.int.test.ts

@@ -27,6 +27,7 @@ export async function readRcByPath(
       const result = await importModule({
         filepath: filePath,
         tsconfig,
+        format: 'esm',
       });
       return { result, message: `Imported config from ${formattedTarget}` };
     },

packages/core/src/lib/implementation/read-rc-file.ts

@@ -3,30 +3,32 @@ import { CONFIG_FILE_NAME, type CoreConfig } from '@code-pushup/models';
 import { MEMFS_VOLUME } from '@code-pushup/test-utils';
 import { autoloadRc } from './read-rc-file.js';
 
-// mock importModule from @code-pushup/utils to bypass jiti which doesn't work with memfs
-vi.mock('@code-pushup/utils', async () => {
-  const utils: object = await vi.importActual('@code-pushup/utils');
+// mock bundleRequire inside importEsmModule used for fetching config
+vi.mock('bundle-require', async () => {
   const { CORE_CONFIG_MOCK }: Record<string, CoreConfig> =
     await vi.importActual('@code-pushup/test-fixtures');
 
-  const mockImportModule = async (options: { filepath: string }) => {
-    const extension = options.filepath.split('.').at(-1);
-    return {
-      ...CORE_CONFIG_MOCK,
-      upload: {
-        ...CORE_CONFIG_MOCK?.upload,
-        project: extension, // returns loaded file extension to check format precedence
-      },
-    };
-  };
-
   return {
-    ...utils,
-    importModule: mockImportModule,
+    bundleRequire: vi
+      .fn()
+      .mockImplementation((options: { filepath: string }) => {
+        const extension = options.filepath.split('.').at(-1);
+        return {
+          mod: {
+            default: {
+              ...CORE_CONFIG_MOCK,
+              upload: {
+                ...CORE_CONFIG_MOCK?.upload,
+                project: extension, // returns loaded file extension to check format precedence
+              },
+            },
+          },
+        };
+      }),
   };
 });
 
-// Note: memfs files are only listed to satisfy a system check, value is used from the mocked importModule
+// Note: memfs files are only listed to satisfy a system check, value is used from bundle-require mock
 describe('autoloadRc', () => {
   it('prioritise a .ts configuration file', async () => {
     vol.fromJSON(

packages/core/src/lib/implementation/read-rc-file.unit.test.ts

@@ -1,21 +1,14 @@
-import tseslint from 'typescript-eslint';
-import baseConfig from '../../eslint.config.js';
+const tseslint = require('typescript-eslint');
+const baseConfig = require('../../eslint.config.js').default;
 
-if (process.env['CP_DEBUG_ESLINT_IMPORTS'] === 'true') {
-  // eslint-disable-next-line no-console
-  console.log('[CP_DEBUG] Loaded packages/nx-plugin/eslint.config.js', {
-    baseConfigLength: baseConfig.length,
-  });
-}
-
-export default tseslint.config(
+module.exports = tseslint.config(
   ...baseConfig,
   {
     files: ['**/*.ts'],
     languageOptions: {
       parserOptions: {
         projectService: true,
-        tsconfigRootDir: import.meta.dirname,
+        tsconfigRootDir: __dirname,
       },
     },
   },

packages/nx-plugin/eslint.config.js

@@ -38,15 +38,6 @@
           "packages/nx-plugin/**/*.ts",
           "packages/nx-plugin/package.json",
           "packages/nx-plugin/generators.json"
-        ],
-        "args": [
-          "'{projectRoot}/**/*.{ts,cjs,mjs,js}'",
-          "{projectRoot}/package.json",
-          "--config={projectRoot}/eslint.config.mjs",
-          "--max-warnings=0",
-          "--no-warn-ignored",
-          "--error-on-unmatched-pattern=false",
-          "--format=./tools/eslint-formatter-multi/dist/src/index.js"
         ]
       }
     },

packages/nx-plugin/eslint.config.mjs

@@ -353,7 +353,7 @@ describe('normalizedCreateNodesV2Context', () => {
         createNodesV2Context({ workspaceRoot: MEMFS_VOLUME }),
         projectJsonPath(projectRoot),
       ),
-    ).rejects.toThrowError(
+    ).rejects.toThrow(
       `Error parsing project.json file ${projectJsonPath(projectRoot)}.`,
     );
   });
@@ -372,7 +372,7 @@ describe('normalizedCreateNodesV2Context', () => {
         createNodesV2Context({ workspaceRoot: MEMFS_VOLUME }),
         projectJsonPath(projectRoot),
       ),
-    ).rejects.toThrowError(
+    ).rejects.toThrow(
       `Error parsing project.json file ${projectJsonPath(projectRoot)}.`,
     );
   });

packages/nx-plugin/project.json

@@ -107,9 +107,7 @@ describe('normalizedCreateNodesV2Context', () => {
         createNodesV2Context({ workspaceRoot: MEMFS_VOLUME }),
         projectJsonPath(),
       ),
-    ).rejects.toThrowError(
-      `Error parsing project.json file ${projectJsonPath()}.`,
-    );
+    ).rejects.toThrow(`Error parsing project.json file ${projectJsonPath()}.`);
   });
 
   it('should provide default targetName in createOptions', async () => {