diff --git a/apps/auth/tsconfig.app.json b/apps/auth/tsconfig.app.json index a1badb0..a32e8fe 100644 --- a/apps/auth/tsconfig.app.json +++ b/apps/auth/tsconfig.app.json @@ -1,15 +1,7 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.backend.base.json", "compilerOptions": { - "outDir": "dist", - "module": "nodenext", - "types": ["node"], - "rootDir": "src", - "moduleResolution": "nodenext", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "target": "es2021" + "outDir": "../../dist/out-tsc" }, "include": ["src/**/*.ts"], "exclude": [ diff --git a/apps/auth/tsconfig.spec.json b/apps/auth/tsconfig.spec.json index 18d4e74..3275b5e 100644 --- a/apps/auth/tsconfig.spec.json +++ b/apps/auth/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "experimentalDecorators": true, "emitDecoratorMetadata": true }, diff --git a/apps/order/tsconfig.app.json b/apps/order/tsconfig.app.json index 8d879f8..90bf095 100644 --- a/apps/order/tsconfig.app.json +++ b/apps/order/tsconfig.app.json @@ -1,15 +1,7 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.backend.base.json", "compilerOptions": { - "outDir": "dist", - "module": "nodenext", - "types": ["node"], - "rootDir": "src", - "moduleResolution": "nodenext", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "target": "es2021" + "outDir": "../../dist/out-tsc" }, "include": ["src/**/*.ts"], "exclude": [ diff --git a/apps/order/tsconfig.json b/apps/order/tsconfig.json index ad9449d..5fbd0bc 100644 --- a/apps/order/tsconfig.json +++ b/apps/order/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/apps/order/tsconfig.spec.json b/apps/order/tsconfig.spec.json index 9b2a121..d41aea4 100644 --- a/apps/order/tsconfig.spec.json +++ b/apps/order/tsconfig.spec.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "module": "commonjs", "types": ["jest", "node"] }, "include": [ diff --git a/apps/product/tsconfig.app.json b/apps/product/tsconfig.app.json index 1493ea6..a82ca8e 100644 --- a/apps/product/tsconfig.app.json +++ b/apps/product/tsconfig.app.json @@ -1,15 +1,7 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.backend.base.json", "compilerOptions": { - "outDir": "dist", - "module": "nodenext", - "types": ["node"], - "rootDir": "src", - "moduleResolution": "nodenext", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "target": "es2021" + "outDir": "../../dist/out-tsc" }, "include": ["src/**/*.ts"], "exclude": [ diff --git a/apps/product/tsconfig.json b/apps/product/tsconfig.json index a6cef5c..f58ab4c 100644 --- a/apps/product/tsconfig.json +++ b/apps/product/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/apps/product/tsconfig.spec.json b/apps/product/tsconfig.spec.json index 18d4e74..3275b5e 100644 --- a/apps/product/tsconfig.spec.json +++ b/apps/product/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "experimentalDecorators": true, "emitDecoratorMetadata": true }, diff --git a/apps/web/app/services/logger.server.ts b/apps/web/app/services/logger.server.ts index 791c3eb..f2ee998 100644 --- a/apps/web/app/services/logger.server.ts +++ b/apps/web/app/services/logger.server.ts @@ -1,4 +1,4 @@ -import { createLoggerOptions } from '@projectx/core/lib/logger/logger'; +import { createLoggerOptions } from '@projectx/core/lib/logger'; import pino from 'pino'; import { environment } from '~/config/app.config.server'; diff --git a/apps/web/tsconfig.app.json b/apps/web/tsconfig.app.json index 7666cbc..3f0877c 100644 --- a/apps/web/tsconfig.app.json +++ b/apps/web/tsconfig.app.json @@ -13,17 +13,7 @@ "rootDirs": [".", "./.react-router/types"], "tsBuildInfoFile": "./dist/tsconfig.app.tsbuildinfo", "paths": { - "~/*": ["./app/*"], - "@projectx/models": ["../../libs/models/src/index.ts"], - "@projectx/models/*": ["../../libs/models/src/*"], - "@projectx/email": ["../../libs/backend/email/src/index.ts"], - "@projectx/email/*": ["../../libs/backend/email/src/*"], - "@projectx/ui": ["../../libs/frontend/ui/src/index.ts"], - "@projectx/ui/*": ["../../libs/frontend/ui/src/*"], - "@projectx/core": ["../../libs/backend/core/src/index.ts"], - "@projectx/core/*": ["../../libs/backend/core/src/*"], - "@projectx/db": ["../../libs/backend/db/src/index.ts"], - "@projectx/db/*": ["../../libs/backend/db/src/*"] + "~/*": ["./app/*"] }, "allowSyntheticDefaultImports": true, "module": "ESNext", diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 7318b95..cfa660d 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -21,7 +21,7 @@ "path": "./tsconfig.spec.json" } ], - "extends": "../../tsconfig.base.json", + "extends": "../../tsconfig.frontend.base.json", "compilerOptions": { "jsx": "react-jsx", "moduleResolution": "bundler", diff --git a/apps/web/tsconfig.spec.json b/apps/web/tsconfig.spec.json index 3b13c38..eeb0dae 100644 --- a/apps/web/tsconfig.spec.json +++ b/apps/web/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/vitest", "moduleResolution": "NodeNext", diff --git a/libs/backend/core/tsconfig.json b/libs/backend/core/tsconfig.json index 931f870..8d26910 100644 --- a/libs/backend/core/tsconfig.json +++ b/libs/backend/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/libs/backend/core/tsconfig.lib.json b/libs/backend/core/tsconfig.lib.json index f7904b0..e35f5db 100644 --- a/libs/backend/core/tsconfig.lib.json +++ b/libs/backend/core/tsconfig.lib.json @@ -1,13 +1,9 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "compilerOptions": { "baseUrl": ".", - "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo", + "outDir": "../../../dist/out-tsc", "emitDeclarationOnly": false, - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true, "types": ["node"], "target": "es2021", @@ -17,11 +13,7 @@ "noFallthroughCasesInSwitch": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "skipLibCheck": true, - "paths": { - "@projectx/models": ["../../../libs/models/src/index.ts"], - "@projectx/db": ["../../../libs/backend/db/src/index.ts"] - } + "skipLibCheck": true }, "include": ["src/**/*.ts"], "references": [ diff --git a/libs/backend/core/tsconfig.spec.json b/libs/backend/core/tsconfig.spec.json index 68836b8..c086c8f 100644 --- a/libs/backend/core/tsconfig.spec.json +++ b/libs/backend/core/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true }, "include": [ diff --git a/libs/backend/db/tsconfig.json b/libs/backend/db/tsconfig.json index 4d243f1..a05343e 100644 --- a/libs/backend/db/tsconfig.json +++ b/libs/backend/db/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/libs/backend/db/tsconfig.lib.json b/libs/backend/db/tsconfig.lib.json index 309cfd4..5c4ff83 100644 --- a/libs/backend/db/tsconfig.lib.json +++ b/libs/backend/db/tsconfig.lib.json @@ -1,13 +1,9 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "compilerOptions": { "baseUrl": ".", - "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo", + "outDir": "../../../dist/out-tsc", "emitDeclarationOnly": false, - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true, "types": ["node"], "target": "es2021", @@ -17,10 +13,7 @@ "noFallthroughCasesInSwitch": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "skipLibCheck": true, - "paths": { - "@projectx/models": ["../../../libs/models/src/index.ts"] - } + "skipLibCheck": true }, "include": ["src/**/*.ts"], "references": [ diff --git a/libs/backend/db/tsconfig.spec.json b/libs/backend/db/tsconfig.spec.json index 68836b8..c086c8f 100644 --- a/libs/backend/db/tsconfig.spec.json +++ b/libs/backend/db/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true }, "include": [ diff --git a/libs/backend/email/tsconfig.json b/libs/backend/email/tsconfig.json index 667a346..7299c32 100644 --- a/libs/backend/email/tsconfig.json +++ b/libs/backend/email/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/libs/backend/email/tsconfig.lib.json b/libs/backend/email/tsconfig.lib.json index 1b49d46..fc4c8d1 100644 --- a/libs/backend/email/tsconfig.lib.json +++ b/libs/backend/email/tsconfig.lib.json @@ -1,13 +1,9 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "compilerOptions": { "baseUrl": ".", - "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo", + "outDir": "../../../dist/out-tsc", "emitDeclarationOnly": false, - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true, "types": ["node"], "target": "es2021", diff --git a/libs/backend/email/tsconfig.spec.json b/libs/backend/email/tsconfig.spec.json index 68836b8..c086c8f 100644 --- a/libs/backend/email/tsconfig.spec.json +++ b/libs/backend/email/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true }, "include": [ diff --git a/libs/backend/payment/tsconfig.json b/libs/backend/payment/tsconfig.json index 667a346..7299c32 100644 --- a/libs/backend/payment/tsconfig.json +++ b/libs/backend/payment/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/libs/backend/payment/tsconfig.lib.json b/libs/backend/payment/tsconfig.lib.json index 1b49d46..fc4c8d1 100644 --- a/libs/backend/payment/tsconfig.lib.json +++ b/libs/backend/payment/tsconfig.lib.json @@ -1,13 +1,9 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "compilerOptions": { "baseUrl": ".", - "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo", + "outDir": "../../../dist/out-tsc", "emitDeclarationOnly": false, - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true, "types": ["node"], "target": "es2021", diff --git a/libs/backend/payment/tsconfig.spec.json b/libs/backend/payment/tsconfig.spec.json index 68836b8..c086c8f 100644 --- a/libs/backend/payment/tsconfig.spec.json +++ b/libs/backend/payment/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true }, "include": [ diff --git a/libs/backend/workflows/tsconfig.json b/libs/backend/workflows/tsconfig.json index 9aafce6..8c47d88 100644 --- a/libs/backend/workflows/tsconfig.json +++ b/libs/backend/workflows/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "files": [], "include": [], "references": [ diff --git a/libs/backend/workflows/tsconfig.lib.json b/libs/backend/workflows/tsconfig.lib.json index 0ec1316..2c214e7 100644 --- a/libs/backend/workflows/tsconfig.lib.json +++ b/libs/backend/workflows/tsconfig.lib.json @@ -1,13 +1,9 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../tsconfig.backend.base.json", "compilerOptions": { "baseUrl": ".", - "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo", + "outDir": "../../../dist/out-tsc", "emitDeclarationOnly": false, - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true, "types": ["node"], "target": "es2021", @@ -17,10 +13,7 @@ "noFallthroughCasesInSwitch": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "skipLibCheck": true, - "paths": { - "@projectx/core": ["../../../libs/backend/core/src/index.ts"] - } + "skipLibCheck": true }, "include": ["src/**/*.ts"], "references": [ diff --git a/libs/backend/workflows/tsconfig.spec.json b/libs/backend/workflows/tsconfig.spec.json index 68836b8..c086c8f 100644 --- a/libs/backend/workflows/tsconfig.spec.json +++ b/libs/backend/workflows/tsconfig.spec.json @@ -1,10 +1,8 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/jest", "types": ["jest", "node"], - "module": "nodenext", - "moduleResolution": "nodenext", "forceConsistentCasingInFileNames": true }, "include": [ diff --git a/tsconfig.base.json b/tsconfig.base.json index e94d5fa..cd174f4 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,12 +18,19 @@ "baseUrl": ".", "paths": { "@projectx/core": ["libs/backend/core/src/index.ts"], + "@projectx/core/*": ["libs/backend/core/src/*"], "@projectx/db": ["libs/backend/db/src/index.ts"], + "@projectx/db/*": ["libs/backend/db/src/*"], "@projectx/email": ["libs/backend/email/src/index.ts"], + "@projectx/email/*": ["libs/backend/email/src/*"], "@projectx/models": ["libs/models/src/index.ts"], + "@projectx/models/*": ["libs/models/src/*"], "@projectx/payment": ["libs/backend/payment/src/index.ts"], + "@projectx/payment/*": ["libs/backend/payment/src/*"], "@projectx/ui": ["libs/frontend/ui/src/index.ts"], - "@projectx/workflows": ["libs/backend/workflows/src/index.ts"] + "@projectx/ui/*": ["libs/frontend/ui/src/*"], + "@projectx/workflows": ["libs/backend/workflows/src/index.ts"], + "@projectx/workflows/*": ["libs/backend/workflows/src/*"] }, "sourceMap": true, "skipDefaultLibCheck": true,