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

.gitignore

@@ -34,6 +34,9 @@ build
 # Testing
 coverage
 junit.xml
+## The "base" root level folder is expected for some local tests that do
+## comparisons between the current branch and a base branch (usually main)
+base/
 
 # Misc
 *.crx

apps/browser/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -9,9 +9,9 @@ module.exports = {
   ...sharedConfig,
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
-    { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };

apps/browser/tsconfig.json

@@ -1,55 +1,5 @@
 {
-  "compilerOptions": {
+  "extends": "../../tsconfig.base",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "ES2020",
-    "target": "ES2016",
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "lib": ["ES2021.String"],
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/dirt-card": ["../../libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/platform/*": ["../../libs/platform/src/*"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
-  "angularCompilerOptions": {
-    "strictTemplates": true
-  },
   "include": [
     "src",
     "../../libs/common/src/autofill/constants",

apps/cli/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.ts");
 
@@ -13,8 +13,14 @@ module.exports = {
   moduleNameMapper: {
     "@bitwarden/common/platform/services/sdk/default-sdk-client-factory":
       "<rootDir>/../../libs/common/spec/jest-sdk-client-factory",
-    ...pathsToModuleNameMapper(compilerOptions?.paths || {}, {
+    ...pathsToModuleNameMapper(
-      prefix: "<rootDir>/",
+      {
-    }),
+        "@bitwarden/common/spec": ["libs/common/spec"],
+        ...(compilerOptions?.paths || {}),
+      },
+      {
+        prefix: "<rootDir>/../../",
+      },
+    ),
   },
 };

apps/cli/tsconfig.json

@@ -1,38 +1,4 @@
 {
-  "compilerOptions": {
+  "extends": "../../tsconfig.base",
-    "pretty": true,
-    "moduleResolution": "node",
-    "target": "ES2016",
-    "module": "ES2020",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/node/*": ["../../libs/node/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  },
   "include": ["src", "src/**/*.spec.ts"]
 }

apps/desktop/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -9,9 +9,9 @@ module.exports = {
   ...sharedConfig,
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
-    { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };

apps/desktop/native-messaging-test-runner/tsconfig.json

@@ -1,6 +1,6 @@
 {
+  "extends": "../tsconfig",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "dist",
     "target": "es6",
     "module": "CommonJS",
@@ -10,12 +10,7 @@
     "sourceMap": false,
     "declaration": false,
     "paths": {
-      "@src/*": ["src/*"],
+      "@src/*": ["src/*"]
-      "@bitwarden/admin-console/*": ["../../../libs/admin-console/src/*"],
-      "@bitwarden/auth/*": ["../../../libs/auth/src/*"],
-      "@bitwarden/common/*": ["../../../libs/common/src/*"],
-      "@bitwarden/key-management": ["../../../libs/key-management/src/"],
-      "@bitwarden/node/*": ["../../../libs/node/src/*"]
     },
     "plugins": [
       {

apps/desktop/src/autofill/services/desktop-autofill.service.ts

@@ -1,5 +1,4 @@
 import { Injectable, OnDestroy } from "@angular/core";
-import { autofill } from "desktop_native/napi";
 import {
   Subject,
   distinctUntilChanged,
@@ -33,6 +32,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { autofill } from "@bitwarden/desktop-napi";
 
 import { NativeAutofillStatusCommand } from "../../platform/main/autofill/status.command";
 import {

apps/desktop/tsconfig.json

@@ -1,50 +1,5 @@
 {
-  "compilerOptions": {
+  "extends": "../../tsconfig.base",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "ES2020",
-    "target": "ES2016",
-    "sourceMap": true,
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/dirt-card": ["../../libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/node/*": ["../../libs/node/src/*"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
   "angularCompilerOptions": {
     "strictTemplates": true
   },

apps/web/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -15,11 +15,11 @@ module.exports = {
     ...pathsToModuleNameMapper(
       {
         // lets us use @bitwarden/common/spec in web tests
-        "@bitwarden/common/spec": ["../../libs/common/spec"],
+        "@bitwarden/common/spec": ["libs/common/spec"],
         ...(compilerOptions?.paths ?? {}),
       },
       {
-        prefix: "<rootDir>/",
+        prefix: "<rootDir>/../../",
       },
     ),
   },

apps/web/tsconfig.json

@@ -1,40 +1,5 @@
 {
-  "extends": "../../libs/shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ES2020",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/dirt-card": ["../../libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["src/*"]
-    }
-  },
   "angularCompilerOptions": {
     "strictTemplates": true
   },

bitwarden_license/bit-cli/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.ts");
 
@@ -14,7 +14,7 @@ module.exports = {
     "@bitwarden/common/platform/services/sdk/default-sdk-client-factory":
       "<rootDir>/../../libs/common/spec/jest-sdk-client-factory",
     ...pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     }),
   },
 };

bitwarden_license/bit-cli/tsconfig.json

@@ -1,40 +1,3 @@
 {
-  "compilerOptions": {
+  "extends": "../../apps/cli/tsconfig"
-    "pretty": true,
-    "moduleResolution": "node",
-    "target": "ES2016",
-    "module": "ES2020",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/cli/*": ["../../apps/cli/src/*"],
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/node/*": ["../../libs/node/src/*"],
-      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  },
-  "include": ["src", "src/**/*.spec.ts"]
 }

bitwarden_license/bit-common/jest.config.js

@@ -1,5 +1,5 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
@@ -9,13 +9,13 @@ module.exports = {
   testEnvironment: "jsdom",
   moduleNameMapper: pathsToModuleNameMapper(
     {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
+      "@bitwarden/common/spec": ["libs/common/spec"],
-      "@bitwarden/common": ["../../libs/common/src/*"],
+      "@bitwarden/common": ["libs/common/src/*"],
-      "@bitwarden/admin-console/common": ["<rootDir>/libs/admin-console/src/common"],
+      "@bitwarden/admin-console/common": ["libs/admin-console/src/common"],
       ...(compilerOptions?.paths ?? {}),
     },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],

bitwarden_license/bit-common/tsconfig.json

@@ -1,34 +1,5 @@
 {
-  "extends": "../../libs/shared/tsconfig",
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
-  "exclude": ["node_modules", "dist"],
+  "exclude": ["node_modules", "dist"]
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth": ["../../libs/auth/src"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/dirt-card": ["../../libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"]
-    }
-  }
 }

bitwarden_license/bit-web/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -10,13 +10,13 @@ module.exports = {
   setupFilesAfterEnv: ["../../apps/web/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
+      "@bitwarden/common/spec": ["libs/common/spec"],
-      "@bitwarden/common": ["../../libs/common/src/*"],
+      "@bitwarden/common": ["libs/common/src/*"],
-      "@bitwarden/admin-console/common": ["<rootDir>/libs/admin-console/src/common"],
+      "@bitwarden/admin-console/common": ["libs/admin-console/src/common"],
       ...(compilerOptions?.paths ?? {}),
     },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };

bitwarden_license/bit-web/tsconfig.json

@@ -1,41 +1,5 @@
 {
   "extends": "../../apps/web/tsconfig",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ES2020",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/dirt-card": ["../../libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
-
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"]
-    }
-  },
   "files": [
     "../../apps/web/src/polyfills.ts",
     "../../apps/web/src/main.ts",

jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("./tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {

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>/../../",
     },
   ),
 };

libs/admin-console/tsconfig.json

@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec", "../../libs/common/custom-matchers.d.ts"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
     },
   ),
 };

libs/angular/tsconfig.json

@@ -1,27 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
     },
   ),
 };

libs/auth/tsconfig.json

@@ -1,23 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
   }),
 };

libs/billing/tsconfig.json

@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "compilerOptions": {},
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
   }),
 };

libs/common/tsconfig.json

@@ -1,15 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
   }),
 };

libs/components/tsconfig.json

@@ -1,14 +1,3 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base"
-  "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"]
-    }
-  }
 }

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>/../../../",
   }),
 };

libs/dirt/card/tsconfig.json

@@ -1,17 +1,5 @@
 {
-  "extends": "../../shared/tsconfig",
+  "extends": "../../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

libs/eslint/tsconfig.json

@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "compilerOptions": {},
   "exclude": ["node_modules", "dist"],
   "files": ["empty.ts"]
 }

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>/../../",
   }),
 };

libs/importer/tsconfig.json

@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
     },
   ),
 };

libs/key-management-ui/tsconfig.json

@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
     },
   ),
 };

libs/key-management/tsconfig.json

@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
   }),
 };

libs/node/tsconfig.json

@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
   }),
 };

libs/platform/tsconfig.json

@@ -1,10 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../common/src/*"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

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"
-      }
-    ]
-  }
-}

libs/shared/tsconfig.spec.json

@@ -1,33 +1,3 @@
 {
-  "extends": "./tsconfig",
+  "extends": "../../tsconfig.base"
-  "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"]
-    }
-  }
 }

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>/../../../../../",
   }),
 };

libs/tools/export/vault-export/vault-export-core/tsconfig.json

@@ -1,13 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
+  "extends": "../../../../../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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../../",
   }),
 };

libs/tools/export/vault-export/vault-export-ui/tsconfig.json

@@ -1,26 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
+  "extends": "../../../../../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"
-      ]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../",
   }),
 };

libs/tools/generator/components/tsconfig.json

@@ -1,20 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
+  "extends": "../../../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../",
   }),
 };

libs/tools/generator/core/tsconfig.json

@@ -1,13 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
+  "extends": "../../../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../../",
   }),
 };

libs/tools/generator/extensions/history/tsconfig.json

@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
+  "extends": "../../../../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../../",
   }),
 };

libs/tools/generator/extensions/legacy/tsconfig.json

@@ -1,16 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
+  "extends": "../../../../../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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../../",
   }),
 };

libs/tools/generator/extensions/navigation/tsconfig.json

@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
+  "extends": "../../../../../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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../../../",
   }),
 };

libs/tools/send/send-ui/tsconfig.json

@@ -1,22 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
+  "extends": "../../../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

libs/ui/common/tsconfig.json

@@ -1,10 +1,5 @@
 {
-  "extends": "../../shared/tsconfig",
+  "extends": "../../../tsconfig.base",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../../common/src/*"]
-    }
-  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }

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>/../../",
     },
   ),
 };

libs/vault/tsconfig.json

@@ -1,26 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
+  "extends": "../../tsconfig.base",
-  "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"]
-    }
-  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }

scripts/tsconfig.json

@@ -1,7 +1,6 @@
 {
-  "extends": "../libs/shared/tsconfig",
+  "extends": "../tsconfig.base",
   "compilerOptions": {
-    "strict": true,
     "outDir": "dist",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",

tsconfig.base.json

@@ -0,0 +1,59 @@
+{
+  "compilerOptions": {
+    "strict": false,
+    "pretty": true,
+    "moduleResolution": "node",
+    "noImplicitAny": true,
+    "target": "ES2016",
+    "module": "ES2020",
+    "lib": ["es5", "es6", "es7", "dom", "ES2021", "ESNext.Disposable"],
+    "sourceMap": true,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "declaration": false,
+    "outDir": "dist",
+    "baseUrl": ".",
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "sourceMap": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
+      "@bitwarden/angular/*": ["./libs/angular/src/*"],
+      "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
+      "@bitwarden/auth/common": ["./libs/auth/src/common"],
+      "@bitwarden/billing": ["./libs/billing/src"],
+      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
+      "@bitwarden/cli/*": ["./apps/cli/src/*"],
+      "@bitwarden/common/*": ["./libs/common/src/*"],
+      "@bitwarden/components": ["./libs/components/src"],
+      "@bitwarden/dirt-card": ["./libs/dirt/card/src"],
+      "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
+      "@bitwarden/generator-core": ["./libs/tools/generator/core/src"],
+      "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
+      "@bitwarden/importer-core": ["./libs/importer/src"],
+      "@bitwarden/importer-ui": ["./libs/importer/src/components"],
+      "@bitwarden/key-management": ["./libs/key-management/src"],
+      "@bitwarden/key-management-ui": ["./libs/key-management-ui/src"],
+      "@bitwarden/node/*": ["./libs/node/src/*"],
+      "@bitwarden/platform": ["./libs/platform/src"],
+      "@bitwarden/platform/*": ["./libs/platform/src/*"],
+      "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
+      "@bitwarden/ui-common": ["./libs/ui/common/src"],
+      "@bitwarden/ui-common/setup-jest": ["./libs/ui/common/src/setup-jest"],
+      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
+      "@bitwarden/vault": ["./libs/vault/src"],
+      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
+    },
+    "plugins": [
+      {
+        "name": "typescript-strict-plugin"
+      }
+    ],
+    "useDefineForClassFields": false
+  }
+}

tsconfig.json

@@ -1,57 +1,5 @@
 {
-  "compilerOptions": {
+  "extends": "./tsconfig.base.json",
-    "strict": false,
-    "pretty": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "target": "ES2016",
-    "module": "ES2020",
-    "lib": ["es5", "es6", "es7", "dom", "ES2021", "ESNext.Disposable"],
-    "sourceMap": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "declaration": false,
-    "outDir": "dist",
-    "baseUrl": ".",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
-      "@bitwarden/auth/common": ["./libs/auth/src/common"],
-      "@bitwarden/billing": ["./libs/billing/src"],
-      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
-      "@bitwarden/common/*": ["./libs/common/src/*"],
-      "@bitwarden/components": ["./libs/components/src"],
-      "@bitwarden/dirt-card": ["./libs/dirt/card/src"],
-      "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["./libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["./libs/importer/src"],
-      "@bitwarden/importer-ui": ["./libs/importer/src/components"],
-      "@bitwarden/key-management": ["./libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["./libs/key-management-ui/src"],
-      "@bitwarden/node/*": ["./libs/node/src/*"],
-      "@bitwarden/platform": ["./libs/platform/src"],
-      "@bitwarden/platform/*": ["./libs/platform/src/*"],
-      "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
-      "@bitwarden/ui-common": ["./libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["./libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["./libs/vault/src"],
-      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
   "include": [
     "apps/web/src/**/*",
     "apps/browser/src/**/*",