diff --git a/.gitignore b/.gitignore index e865fa6a8f..0fa968aa47 100644 --- a/.gitignore +++ b/.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 diff --git a/apps/browser/jest.config.js b/apps/browser/jest.config.js index 0d1034f0ea..14cd959810 100644 --- a/apps/browser/jest.config.js +++ b/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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper( - { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) }, + { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) }, { - prefix: "/", + prefix: "/../../", }, ), }; diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json index ff4ac34021..a554120bd1 100644 --- a/apps/browser/tsconfig.json +++ b/apps/browser/tsconfig.json @@ -1,55 +1,5 @@ { - "compilerOptions": { - "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 - }, + "extends": "../../tsconfig.base", "include": [ "src", "../../libs/common/src/autofill/constants", diff --git a/apps/cli/jest.config.js b/apps/cli/jest.config.js index e0a5b9ec9c..c96395944b 100644 --- a/apps/cli/jest.config.js +++ b/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": "/../../libs/common/spec/jest-sdk-client-factory", - ...pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", - }), + ...pathsToModuleNameMapper( + { + "@bitwarden/common/spec": ["libs/common/spec"], + ...(compilerOptions?.paths || {}), + }, + { + prefix: "/../../", + }, + ), }, }; diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json index 9d6e3066b2..3bcd098ca1 100644 --- a/apps/cli/tsconfig.json +++ b/apps/cli/tsconfig.json @@ -1,38 +1,4 @@ { - "compilerOptions": { - "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" - } - ] - }, + "extends": "../../tsconfig.base", "include": ["src", "src/**/*.spec.ts"] } diff --git a/apps/desktop/jest.config.js b/apps/desktop/jest.config.js index 0d1034f0ea..14cd959810 100644 --- a/apps/desktop/jest.config.js +++ b/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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper( - { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) }, + { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) }, { - prefix: "/", + prefix: "/../../", }, ), }; diff --git a/apps/desktop/native-messaging-test-runner/tsconfig.json b/apps/desktop/native-messaging-test-runner/tsconfig.json index 59c7040e50..608e5a3bf4 100644 --- a/apps/desktop/native-messaging-test-runner/tsconfig.json +++ b/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/*"], - "@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/*"] + "@src/*": ["src/*"] }, "plugins": [ { diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts index d6dddf3b23..7e60c6b8d7 100644 --- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts +++ b/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 { diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 27e38757e9..7db3e84e45 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -1,50 +1,5 @@ { - "compilerOptions": { - "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 - }, + "extends": "../../tsconfig.base", "angularCompilerOptions": { "strictTemplates": true }, diff --git a/apps/web/jest.config.js b/apps/web/jest.config.js index 724e44be00..e1d64fa64c 100644 --- a/apps/web/jest.config.js +++ b/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: "/", + prefix: "/../../", }, ), }, diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 0cc988ea72..92cec0d6a2 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -1,40 +1,5 @@ { - "extends": "../../libs/shared/tsconfig", - "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/*"] - } - }, + "extends": "../../tsconfig.base", "angularCompilerOptions": { "strictTemplates": true }, diff --git a/bitwarden_license/bit-cli/jest.config.js b/bitwarden_license/bit-cli/jest.config.js index 30c9784c32..6a91ba706e 100644 --- a/bitwarden_license/bit-cli/jest.config.js +++ b/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": "/../../libs/common/spec/jest-sdk-client-factory", ...pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }, }; diff --git a/bitwarden_license/bit-cli/tsconfig.json b/bitwarden_license/bit-cli/tsconfig.json index 4a972b540a..6630021232 100644 --- a/bitwarden_license/bit-cli/tsconfig.json +++ b/bitwarden_license/bit-cli/tsconfig.json @@ -1,40 +1,3 @@ { - "compilerOptions": { - "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"] + "extends": "../../apps/cli/tsconfig" } diff --git a/bitwarden_license/bit-common/jest.config.js b/bitwarden_license/bit-common/jest.config.js index ab31a4c26c..31f15253eb 100644 --- a/bitwarden_license/bit-common/jest.config.js +++ b/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": ["../../libs/common/src/*"], - "@bitwarden/admin-console/common": ["/libs/admin-console/src/common"], + "@bitwarden/common/spec": ["libs/common/spec"], + "@bitwarden/common": ["libs/common/src/*"], + "@bitwarden/admin-console/common": ["libs/admin-console/src/common"], ...(compilerOptions?.paths ?? {}), }, { - prefix: "/", + prefix: "/../../", }, ), setupFilesAfterEnv: ["/test.setup.ts"], diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json index c92167bb91..9c607a26b0 100644 --- a/bitwarden_license/bit-common/tsconfig.json +++ b/bitwarden_license/bit-common/tsconfig.json @@ -1,34 +1,5 @@ { - "extends": "../../libs/shared/tsconfig", + "extends": "../../tsconfig.base", "include": ["src", "spec"], - "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/*"] - } - } + "exclude": ["node_modules", "dist"] } diff --git a/bitwarden_license/bit-web/jest.config.js b/bitwarden_license/bit-web/jest.config.js index 9eefd99528..5934882e73 100644 --- a/bitwarden_license/bit-web/jest.config.js +++ b/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": ["../../libs/common/src/*"], - "@bitwarden/admin-console/common": ["/libs/admin-console/src/common"], + "@bitwarden/common/spec": ["libs/common/spec"], + "@bitwarden/common": ["libs/common/src/*"], + "@bitwarden/admin-console/common": ["libs/admin-console/src/common"], ...(compilerOptions?.paths ?? {}), }, { - prefix: "/", + prefix: "/../../", }, ), }; diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json index 66b83755aa..7ec0441f4c 100644 --- a/bitwarden_license/bit-web/tsconfig.json +++ b/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", diff --git a/jest.config.js b/jest.config.js index e8815f92ff..b0ffd2382c 100644 --- a/jest.config.js +++ b/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 = { diff --git a/libs/admin-console/jest.config.js b/libs/admin-console/jest.config.js index d59da5d68f..48f498a2d7 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/admin-console/tsconfig.json b/libs/admin-console/tsconfig.json index 4f057fd6af..72e2a43434 100644 --- 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"] } diff --git a/libs/angular/jest.config.js b/libs/angular/jest.config.js index 66a7e9a687..e94ae5e9af 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json index d77e56d778..9c607a26b0 100644 --- 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"] } diff --git a/libs/auth/jest.config.js b/libs/auth/jest.config.js index 79b054f074..815ac5c30c 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/auth/tsconfig.json b/libs/auth/tsconfig.json index 8d08522ffc..9c607a26b0 100644 --- 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"] } diff --git a/libs/billing/jest.config.js b/libs/billing/jest.config.js index 5c24975e83..0aa1338166 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }; diff --git a/libs/billing/tsconfig.json b/libs/billing/tsconfig.json index bb08eb89d1..9c607a26b0 100644 --- 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"] } diff --git a/libs/common/jest.config.js b/libs/common/jest.config.js index 7e6c0997b9..a1e14ee62f 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }; diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json index 03f66196a3..1d81cc8c22 100644 --- 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"] } diff --git a/libs/components/jest.config.js b/libs/components/jest.config.js index 082d378dce..4310480dd2 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }; diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json index 8f2b5edcc9..3706663ecf 100644 --- 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" } diff --git a/libs/dirt/card/jest.config.js b/libs/dirt/card/jest.config.js index 68455588d6..03ffc631f7 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/../../", + prefix: "/../../../", }), }; diff --git a/libs/dirt/card/tsconfig.json b/libs/dirt/card/tsconfig.json index 050a1748b7..941c32b5b2 100644 --- 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"] } diff --git a/libs/eslint/tsconfig.json b/libs/eslint/tsconfig.json index bbf065886c..69be0fa9ca 100644 --- 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"] } diff --git a/libs/importer/jest.config.js b/libs/importer/jest.config.js index 8d782d913a..0d7db28409 100644 --- 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: "/", + prefix: "/../../", }), }; diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json index e16a16a033..919c7bf77b 100644 --- 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"] } diff --git a/libs/key-management-ui/jest.config.js b/libs/key-management-ui/jest.config.js index ceeee3b244..6a1fbdd63e 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/key-management-ui/tsconfig.json b/libs/key-management-ui/tsconfig.json index bb263f3a2b..9c607a26b0 100644 --- 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"] } diff --git a/libs/key-management/jest.config.js b/libs/key-management/jest.config.js index 4da81b0bd1..a074621a09 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json index 3d22cb2ec5..9c607a26b0 100644 --- 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"] } diff --git a/libs/node/jest.config.js b/libs/node/jest.config.js index 1a33ad3940..d765efcfa2 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }; diff --git a/libs/node/tsconfig.json b/libs/node/tsconfig.json index 3d22cb2ec5..9c607a26b0 100644 --- 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"] } diff --git a/libs/platform/jest.config.js b/libs/platform/jest.config.js index 7d19094090..174c430a90 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/", + prefix: "/../../", }), }; diff --git a/libs/platform/tsconfig.json b/libs/platform/tsconfig.json index 898f9e41c6..9c607a26b0 100644 --- 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"] } diff --git a/libs/shared/tsconfig.json b/libs/shared/tsconfig.json deleted file mode 100644 index 2161d2fb7d..0000000000 --- a/libs/shared/tsconfig.json +++ /dev/null @@ -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" - } - ] - } -} diff --git a/libs/shared/tsconfig.spec.json b/libs/shared/tsconfig.spec.json index 5402594e5a..3706663ecf 100644 --- 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" } diff --git a/libs/tools/export/vault-export/vault-export-core/jest.config.js b/libs/tools/export/vault-export/vault-export-core/jest.config.js index 0a78a9855d..066309a8bf 100644 --- 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: "/../../../", + prefix: "/../../../../../", }), }; diff --git a/libs/tools/export/vault-export/vault-export-core/tsconfig.json b/libs/tools/export/vault-export/vault-export-core/tsconfig.json index 7652a27104..06123643d6 100644 --- 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"] } diff --git a/libs/tools/export/vault-export/vault-export-ui/jest.config.js b/libs/tools/export/vault-export/vault-export-ui/jest.config.js index 0a78a9855d..066309a8bf 100644 --- 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: "/../../../", + prefix: "/../../../../../", }), }; diff --git a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json index 6f2a0242da..06123643d6 100644 --- 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"] } diff --git a/libs/tools/generator/components/jest.config.js b/libs/tools/generator/components/jest.config.js index bf5e465f39..e8a7d433d1 100644 --- 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: "/../../", + prefix: "/../../../../", }), }; diff --git a/libs/tools/generator/components/tsconfig.json b/libs/tools/generator/components/tsconfig.json index 9a3a08b40f..5010a206c9 100644 --- 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"] } diff --git a/libs/tools/generator/core/jest.config.js b/libs/tools/generator/core/jest.config.js index b052672c4a..e8a7d433d1 100644 --- 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: "/../../", + prefix: "/../../../../", }), }; diff --git a/libs/tools/generator/core/tsconfig.json b/libs/tools/generator/core/tsconfig.json index 303f913ba2..5010a206c9 100644 --- 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"] } diff --git a/libs/tools/generator/extensions/history/jest.config.js b/libs/tools/generator/extensions/history/jest.config.js index f90801cd7c..598c83fe7d 100644 --- 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: "/../../../", + prefix: "/../../../../../", }), }; diff --git a/libs/tools/generator/extensions/history/tsconfig.json b/libs/tools/generator/extensions/history/tsconfig.json index 5fc1caf014..84e562664f 100644 --- 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"] } diff --git a/libs/tools/generator/extensions/legacy/jest.config.js b/libs/tools/generator/extensions/legacy/jest.config.js index f90801cd7c..598c83fe7d 100644 --- 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: "/../../../", + prefix: "/../../../../../", }), }; diff --git a/libs/tools/generator/extensions/legacy/tsconfig.json b/libs/tools/generator/extensions/legacy/tsconfig.json index 9a09e28ea3..06123643d6 100644 --- 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"] } diff --git a/libs/tools/generator/extensions/navigation/jest.config.js b/libs/tools/generator/extensions/navigation/jest.config.js index f90801cd7c..598c83fe7d 100644 --- 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: "/../../../", + prefix: "/../../../../../", }), }; diff --git a/libs/tools/generator/extensions/navigation/tsconfig.json b/libs/tools/generator/extensions/navigation/tsconfig.json index 5fc1caf014..06123643d6 100644 --- 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"] } diff --git a/libs/tools/send/send-ui/jest.config.js b/libs/tools/send/send-ui/jest.config.js index ed8dbe6116..2ab935f0bf 100644 --- 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: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/../../", + prefix: "/../../../../", }), }; diff --git a/libs/tools/send/send-ui/tsconfig.json b/libs/tools/send/send-ui/tsconfig.json index e6d6680ad4..5010a206c9 100644 --- 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"] } diff --git a/libs/ui/common/tsconfig.json b/libs/ui/common/tsconfig.json index 31062d41a1..941c32b5b2 100644 --- 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"] } diff --git a/libs/vault/jest.config.js b/libs/vault/jest.config.js index c0a0103da7..05c5b5c5d3 100644 --- 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: ["/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: "/", + prefix: "/../../", }, ), }; diff --git a/libs/vault/tsconfig.json b/libs/vault/tsconfig.json index 6039dccd81..9c607a26b0 100644 --- 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"] } diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 18ce94164c..c346fdde30 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -1,7 +1,6 @@ { - "extends": "../libs/shared/tsconfig", + "extends": "../tsconfig.base", "compilerOptions": { - "strict": true, "outDir": "dist", "module": "NodeNext", "moduleResolution": "NodeNext", diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 0000000000..7053ec66aa --- /dev/null +++ b/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 + } +} diff --git a/tsconfig.json b/tsconfig.json index 525af0ac3b..35200efa43 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,57 +1,5 @@ { - "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, - "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 - }, + "extends": "./tsconfig.base.json", "include": [ "apps/web/src/**/*", "apps/browser/src/**/*",