Implement and extend tsconfig.base across projects (#14554)

* Implement and extend tsconfig.base across projects * fixup! Merge remote-tracking branch 'origin/main' into rename-tsconfig * fix: import tsconfig.base from components * fix: skip typechecking node modules * fixing tests * fix the tests for real * undo accidentally change
2025-12-15 15:53:27 +00:00 · 2025-06-02 16:38:17 -04:00
parent f3ff1e98ec
commit 26caeb3083
67 changed files with 179 additions and 747 deletions
--- a/libs/admin-console/jest.config.js
+++ b/libs/admin-console/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/admin-console/tsconfig.json
+++ b/libs/admin-console/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec", "../../libs/common/custom-matchers.d.ts"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/angular/jest.config.js
+++ b/libs/angular/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/angular/tsconfig.json
+++ b/libs/angular/tsconfig.json
@@ -1,27 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer/core": ["../importer/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/auth/jest.config.js
+++ b/libs/auth/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/auth/tsconfig.json
+++ b/libs/auth/tsconfig.json
@@ -1,23 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/billing/jest.config.js
+++ b/libs/billing/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -10,6 +10,6 @@ module.exports = {
  displayName: "libs/billing tests",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/billing/tsconfig.json
+++ b/libs/billing/tsconfig.json
@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {},
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/common/jest.config.js
+++ b/libs/common/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../shared/jest.config.ts");

@@ -12,6 +12,6 @@ module.exports = {
  testEnvironment: "jsdom",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -1,15 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      // TODO: Remove once circular dependencies in admin-console, auth and key-management are resolved
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/components/jest.config.js
+++ b/libs/components/jest.config.js
@@ -1,8 +1,8 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");

-const sharedConfig = require("../../libs/shared/jest.config.angular");
+const sharedConfig = require("../shared/jest.config.angular");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -10,6 +10,6 @@ module.exports = {
  displayName: "libs/components tests",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/components/tsconfig.json
+++ b/libs/components/tsconfig.json
@@ -1,14 +1,3 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"]
-    }
-  }
+  "extends": "../../tsconfig.base"
 }
--- a/libs/dirt/card/jest.config.js
+++ b/libs/dirt/card/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../tsconfig.base");

 const sharedConfig = require("../../shared/jest.config.angular");

@@ -10,6 +10,6 @@ module.exports = {
  displayName: "tools/card tests",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../",
  }),
 };
--- a/libs/dirt/card/tsconfig.json
+++ b/libs/dirt/card/tsconfig.json
@@ -1,17 +1,5 @@
 {
-  "extends": "../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../auth/src/common"],
-      "@bitwarden/common/*": ["../../common/src/*"],
-      "@bitwarden/components": ["../../components/src"],
-      "@bitwarden/key-management": ["../../key-management/src"],
-      "@bitwarden/platform": ["../../platform/src"],
-      "@bitwarden/ui-common": ["../../ui/common/src"]
-    }
-  },
+  "extends": "../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/eslint/tsconfig.json
+++ b/libs/eslint/tsconfig.json
@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {},
+  "extends": "../../tsconfig.base",
  "exclude": ["node_modules", "dist"],
  "files": ["empty.ts"]
 }
--- a/libs/importer/jest.config.js
+++ b/libs/importer/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../shared/jest.config.ts");

@@ -9,6 +9,6 @@ module.exports = {
  ...sharedConfig,
  testEnvironment: "jsdom",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/importer/tsconfig.json
+++ b/libs/importer/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/key-management-ui/jest.config.js
+++ b/libs/key-management-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/key-management-ui/tsconfig.json
+++ b/libs/key-management-ui/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src/index.ts"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src/index.ts"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/key-management/jest.config.js
+++ b/libs/key-management/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/key-management/tsconfig.json
+++ b/libs/key-management/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/node/jest.config.js
+++ b/libs/node/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../shared/jest.config.ts");

@@ -11,6 +11,6 @@ module.exports = {
  testEnvironment: "node",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/node/tsconfig.json
+++ b/libs/node/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/platform/jest.config.js
+++ b/libs/platform/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -10,6 +10,6 @@ module.exports = {
  displayName: "libs/platform tests",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
  }),
 };
--- a/libs/platform/tsconfig.json
+++ b/libs/platform/tsconfig.json
@@ -1,10 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../common/src/*"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/shared/tsconfig.json
+++ b/libs/shared/tsconfig.json
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "pretty": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "target": "ES6",
-    "module": "es2020",
-    "lib": ["es5", "es6", "es7", "dom"],
-    "sourceMap": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "outDir": "dist",
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  }
-}
--- a/libs/shared/tsconfig.spec.json
+++ b/libs/shared/tsconfig.spec.json
@@ -1,33 +1,3 @@
 {
-  "extends": "./tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/billing": ["../billing/src"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/dirt-card": ["../dirt/card/src"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../importer/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/key-management-ui": ["../key-management-ui/src/index.ts"],
-      "@bitwarden/node/*": ["../node/src/*"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/send-ui": ["../tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["../tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  }
+  "extends": "../../tsconfig.base"
 }
--- a/libs/tools/export/vault-export/vault-export-core/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "jsdom",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
  }),
 };
--- a/libs/tools/export/vault-export/vault-export-core/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/export/vault-export/vault-export-ui/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "jsdom",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
  }),
 };
--- a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
@@ -1,26 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../../angular/src/*"],
-      "@bitwarden/auth/angular": ["../../../../auth/src/angular"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/components": ["../../../../components/src"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/generator-components": ["../../../../tools/generator/components/src"],
-      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../../../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"],
-      "@bitwarden/platform": ["../../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../../ui/common/src"],
-      "@bitwarden/vault-export-core": [
-        "../../../../tools/export/vault-export/vault-export-core/src"
-      ]
-    }
-  },
+  "extends": "../../../../../tsconfig",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/generator/components/jest.config.js
+++ b/libs/tools/generator/components/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../shared/tsconfig.spec.json");
+const { compilerOptions } = require("../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "../../../shared/test.environment.ts",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
  }),
 };
--- a/libs/tools/generator/components/tsconfig.json
+++ b/libs/tools/generator/components/tsconfig.json
@@ -1,20 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/components": ["../../../components/src"],
-      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
-      "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../ui/common/src"],
-      "@bitwarden/vault": ["../../../vault/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/generator/core/jest.config.js
+++ b/libs/tools/generator/core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "../../../shared/test.environment.ts",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
  }),
 };
--- a/libs/tools/generator/core/tsconfig.json
+++ b/libs/tools/generator/core/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/generator/extensions/history/jest.config.js
+++ b/libs/tools/generator/extensions/history/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "../../../../shared/test.environment.ts",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
  }),
 };
--- a/libs/tools/generator/extensions/history/tsconfig.json
+++ b/libs/tools/generator/extensions/history/tsconfig.json
@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/generator/extensions/legacy/jest.config.js
+++ b/libs/tools/generator/extensions/legacy/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "../../../../shared/test.environment.ts",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
  }),
 };
--- a/libs/tools/generator/extensions/legacy/tsconfig.json
+++ b/libs/tools/generator/extensions/legacy/tsconfig.json
@@ -1,16 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/generator/extensions/navigation/jest.config.js
+++ b/libs/tools/generator/extensions/navigation/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");

 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
  preset: "ts-jest",
  testEnvironment: "../../../../shared/test.environment.ts",
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
  }),
 };
--- a/libs/tools/generator/extensions/navigation/tsconfig.json
+++ b/libs/tools/generator/extensions/navigation/tsconfig.json
@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/tools/send/send-ui/jest.config.js
+++ b/libs/tools/send/send-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../tsconfig.base");

 const { createCjsPreset } = require("jest-preset-angular/presets");

@@ -21,6 +21,6 @@ module.exports = {
  displayName: "tools/send-ui tests",
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
  }),
 };
--- a/libs/tools/send/send-ui/tsconfig.json
+++ b/libs/tools/send/send-ui/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/components": ["../../../components/src"],
-      "@bitwarden/generator-components": ["../../../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../ui/common/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/ui/common/tsconfig.json
+++ b/libs/ui/common/tsconfig.json
@@ -1,10 +1,5 @@
 {
-  "extends": "../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../../common/src/*"]
-    }
-  },
+  "extends": "../../../tsconfig.base",
  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/libs/vault/jest.config.js
+++ b/libs/vault/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");

-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");

 const sharedConfig = require("../../libs/shared/jest.config.angular");

@@ -11,9 +11,9 @@ module.exports = {
  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
  moduleNameMapper: pathsToModuleNameMapper(
    // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
    {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
    },
  ),
 };
--- a/libs/vault/tsconfig.json
+++ b/libs/vault/tsconfig.json
@@ -1,26 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
  "include": ["src", "spec"],
  "exclude": ["node_modules", "dist"]
 }