refactor(): fix circular dependency by creating new internal library

Szymon.Poltorak · Szymon.Poltorak · commit 52e0e6bc4195 · 2025-09-09T15:02:41.000+02:00
diff --git a/e2e/ci-e2e/vitest.e2e.config.ts b/e2e/ci-e2e/vitest.e2e.config.ts
@@ -1,5 +1,5 @@
 /// <reference types="vitest" />
-import { createE2eConfig } from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+import { createE2eConfig } from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createE2eConfig(
   'ci-e2e',
diff --git a/e2e/plugin-typescript-e2e/vitest.e2e.config.ts b/e2e/plugin-typescript-e2e/vitest.e2e.config.ts
@@ -1,5 +1,5 @@
 /// <reference types="vitest" />
-import { createE2eConfig } from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+import { createE2eConfig } from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createE2eConfig(
   'plugin-typescript-e2e',
diff --git a/packages/core/vitest.int.config.ts b/packages/core/vitest.int.config.ts
@@ -2,7 +2,7 @@
 import {
   createIntConfig,
   setupPresets,
-} from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+} from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createIntConfig(
   'core',
diff --git a/packages/core/vitest.unit.config.ts b/packages/core/vitest.unit.config.ts
@@ -2,7 +2,7 @@
 import {
   createUnitConfig,
   setupPresets,
-} from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+} from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createUnitConfig(
   'core',
diff --git a/packages/utils/vitest.int.config.ts b/packages/utils/vitest.int.config.ts
@@ -2,7 +2,7 @@
 import {
   createIntConfig,
   setupPresets,
-} from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+} from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createIntConfig(
   'utils',
diff --git a/packages/utils/vitest.unit.config.ts b/packages/utils/vitest.unit.config.ts
@@ -2,7 +2,7 @@
 import {
   createUnitConfig,
   setupPresets,
-} from '../../testing/test-setup/src/lib/config/vitest-setup-presets.js';
+} from '../../testing/test-setup-config/src/lib/vitest-setup-presets.js';
 
 export default createUnitConfig(
   'utils',
diff --git a/testing/test-setup-config/README.md b/testing/test-setup-config/README.md
diff --git a/testing/test-setup-config/eslint.config.js b/testing/test-setup-config/eslint.config.js
@@ -0,0 +1,12 @@
+import tseslint from 'typescript-eslint';
+import baseConfig from '../../eslint.config.js';
+
+export default tseslint.config(...baseConfig, {
+  files: ['**/*.ts'],
+  languageOptions: {
+    parserOptions: {
+      projectService: true,
+      tsconfigRootDir: import.meta.dirname,
+    },
+  },
+});
diff --git a/testing/test-setup-config/project.json b/testing/test-setup-config/project.json
@@ -0,0 +1,12 @@
+{
+  "name": "test-setup-config",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "testing/test-setup/src",
+  "projectType": "library",
+  "targets": {
+    "build": {},
+    "lint": {},
+    "unit-test": {}
+  },
+  "tags": ["scope:shared", "type:testing"]
+}
diff --git a/testing/test-setup-config/src/index.ts b/testing/test-setup-config/src/index.ts
@@ -0,0 +1,14 @@
+export {
+  createVitestConfig,
+  type TestKind,
+  type VitestConfigFactoryOptions,
+  type VitestOverrides,
+  type ConfigRestParams,
+} from './lib/vitest-config-factory.js';
+
+export {
+  setupPresets,
+  createUnitConfig,
+  createIntConfig,
+  createE2eConfig,
+} from './lib/vitest-setup-presets.js';
diff --git a/testing/test-setup-config/src/lib/vitest-config-factory.ts b/testing/test-setup-config/src/lib/vitest-config-factory.ts
@@ -5,7 +5,7 @@ import {
   mergeConfig,
 } from 'vite';
 import type { CoverageOptions, InlineConfig } from 'vitest';
-import { tsconfigPathAliases } from '../../../../../tools/vitest-tsconfig-path-aliases.js';
+import { tsconfigPathAliases } from './vitest-tsconfig-path-aliases.js';
 
 export type TestKind = 'unit' | 'int' | 'e2e';
 
diff --git a/testing/test-setup-config/src/lib/vitest-config-factory.unit.test.ts b/testing/test-setup-config/src/lib/vitest-config-factory.unit.test.ts
@@ -19,7 +19,7 @@ vi.mock('vite', async importOriginal => {
 });
 
 // Mock tsconfigPathAliases since it reads from filesystem and our fake paths don't exist
-vi.mock('../../../../../tools/vitest-tsconfig-path-aliases.js', () => ({
+vi.mock('./vitest-tsconfig-path-aliases.js', () => ({
   tsconfigPathAliases: vi.fn().mockReturnValue({ '@mock/alias': '/mock/path' }),
 }));
 
diff --git a/testing/test-setup-config/src/lib/vitest-setup-presets.ts b/testing/test-setup-config/src/lib/vitest-setup-presets.ts
diff --git a/testing/test-setup-config/src/lib/vitest-setup-presets.unit.test.ts b/testing/test-setup-config/src/lib/vitest-setup-presets.unit.test.ts
diff --git a/testing/test-setup-config/src/lib/vitest-tsconfig-path-aliases.ts b/testing/test-setup-config/src/lib/vitest-tsconfig-path-aliases.ts
@@ -0,0 +1,25 @@
+import { loadConfig } from 'tsconfig-paths';
+import type { Alias, AliasOptions } from 'vite';
+
+export function tsconfigPathAliases(projectRootUrl?: URL): AliasOptions {
+  const tsconfigPath = projectRootUrl
+    ? new URL('tsconfig.base.json', projectRootUrl).pathname
+    : 'tsconfig.base.json';
+  const result = loadConfig(tsconfigPath);
+  if (result.resultType === 'failed') {
+    throw new Error(
+      `Failed to load path aliases from tsconfig for Vitest: ${result.message}`,
+    );
+  }
+  return Object.entries(result.paths)
+    .map(([key, value]) => [key, value[0]])
+    .filter((pair): pair is [string, string] => pair[1] != null)
+    .map(
+      ([importPath, relativePath]): Alias => ({
+        find: importPath,
+        replacement: projectRootUrl
+          ? new URL(relativePath, projectRootUrl).pathname
+          : new URL(`../${relativePath}`, import.meta.url).pathname,
+      }),
+    );
+}
diff --git a/testing/test-setup-config/tsconfig.json b/testing/test-setup-config/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.test.json"
+    }
+  ]
+}
diff --git a/testing/test-setup-config/tsconfig.lib.json b/testing/test-setup-config/tsconfig.lib.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": [
+    "vitest.unit.config.ts",
+    "src/vitest.d.ts",
+    "src/**/*.unit.test.ts",
+    "src/**/*.int.test.ts"
+  ]
+}
diff --git a/testing/test-setup-config/tsconfig.test.json b/testing/test-setup-config/tsconfig.test.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
+  },
+  "include": [
+    "vitest.unit.config.ts",
+    "src/vitest.d.ts",
+    "src/**/*.unit.test.ts",
+    "src/**/*.d.ts",
+    "src/**/*.int.test.ts"
+  ]
+}
diff --git a/testing/test-setup-config/vitest.unit.config.ts b/testing/test-setup-config/vitest.unit.config.ts
@@ -0,0 +1,23 @@
+/// <reference types="vitest" />
+import {
+  createUnitConfig,
+  setupPresets,
+} from './src/lib/vitest-setup-presets.js';
+
+export default createUnitConfig(
+  'test-setup-config',
+  {
+    projectRoot: new URL('../../', import.meta.url),
+  },
+  {
+    test: {
+      include: ['src/**/*.{unit,type}.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+      setupFiles: [...setupPresets.unit.base, ...setupPresets.unit.matcherPath],
+      coverage: {
+        enabled: true,
+        reporter: ['text', 'lcov'],
+        exclude: ['**/*.mock.{mjs,ts}', '**/*.config.{js,mjs,ts}'],
+      },
+    },
+  },
+);
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -39,6 +39,9 @@
       "@code-pushup/nx-plugin": ["packages/nx-plugin/src/index.ts"],
       "@code-pushup/test-nx-utils": ["testing/test-nx-utils/src/index.ts"],
       "@code-pushup/test-setup": ["testing/test-setup/src/index.ts"],
+      "@code-pushup/test-setup-config": [
+        "testing/test-setup-config/src/index.ts"
+      ],
       "@code-pushup/test-utils": ["testing/test-utils/src/index.ts"],
       "@code-pushup/typescript-plugin": [
         "packages/plugin-typescript/src/index.ts"
