Skip to content

Commit

Permalink
chore: upgrades ts to the latest and unifies configs
Browse files Browse the repository at this point in the history
closes #153
  • Loading branch information
ygrishajev committed Jun 4, 2024
1 parent 9c46f70 commit 3d8831d
Show file tree
Hide file tree
Showing 25 changed files with 3,276 additions and 20,694 deletions.
2 changes: 2 additions & 0 deletions Dockerfile.api
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ WORKDIR /app

COPY /apps/api /app/apps/api
COPY /packages/shared /app/packages/shared
COPY tsconfig.base-node.json /app
COPY tsconfig.base.json /app
COPY package.json /app
COPY package-lock.json /app

Expand Down
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"supertest": "^6.1.5",
"ts-jest": "^29.1.2",
"ts-loader": "^9.2.5",
"typescript": "^5.3.3",
"typescript": "^5.4.5",
"webpack": "^5.33.2",
"webpack-cli": "4.7.2",
"webpack-node-externals": "^3.0.0"
Expand Down
9 changes: 1 addition & 8 deletions apps/api/test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": "./",
"paths": {
"@src/*": ["../src/*"],
"@test/*": ["*"]
}
},
"extends": "../tsconfig.build.json",
"include": ["../src/**/*", "**/*"],
"exclude": ["../node_modules", "../dist"]
}
27 changes: 9 additions & 18 deletions apps/api/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
{
"compilerOptions": {
"module": "Node16",
"baseUrl": ".",
"noImplicitAny": true,
"noEmitOnError": false,
"removeComments": false,
"sourceMap": true,
"downlevelIteration": true,
"allowJs": true,
"allowSyntheticDefaultImports": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"esModuleInterop": true,
"moduleResolution": "Node16",
"resolveJsonModule": true,
"skipLibCheck": true,
"target": "ES6",
"baseUrl": "./src",
"paths": {
"@src/*": ["*"],
"@test/*": ["../test/*"]
"@src/*": [
"./src/*"
],
"@test/*": [
"./test/*"
]
}
}
},
"extends": "../../tsconfig.base-node.json"
}
11 changes: 8 additions & 3 deletions apps/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"exclude": [
"node_modules",
"dist",
"**/*spec.ts"
],
"extends": "./tsconfig.build.json",
"include": ["src/**/*"],
"exclude": ["node_modules", "dist", "**/*spec.ts"],
"compileOnSave": false
"include": [
"src/**/*"
]
}
2 changes: 1 addition & 1 deletion apps/deploy-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"postcss": "^8.4.31",
"postcss-nesting": "^12.0.2",
"tailwindcss": "^3.4.3",
"typescript": "^5.3.2"
"typescript": "^5.4.5"
},
"overrides": {
"@radix-ui/react-dismissable-layer": "^1.0.5",
Expand Down
19 changes: 19 additions & 0 deletions apps/deploy-web/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": ".",
"moduleResolution": "Bundler",
"paths": {
"@src/*": [
"./src/*"
]
},
"plugins": [
{
"name": "next"
}
],
"strictNullChecks": true
},
"extends": "../../tsconfig.base-next.json"
}
45 changes: 5 additions & 40 deletions apps/deploy-web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,12 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"es6",
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "Bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"incremental": true,
"baseUrl": "./src",
"paths": {
"@src/*": [
"*"
]
},
"plugins": [
{
"name": "next"
}
],
"strictNullChecks": true
},
"exclude": [
"node_modules"
],
"extends": "./tsconfig.build.json",
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts"
],
"exclude": [
"node_modules"
],
"compileOnSave": false
]
}
19 changes: 19 additions & 0 deletions apps/indexer/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"compilerOptions": {
"baseUrl": ".",
"noImplicitAny": false,
"paths": {
"@src/*": [
"./src/*"
]
}
},
"exclude": [
"node_modules",
"dist"
],
"extends": "../../tsconfig.base-node.json",
"include": [
"src/**/*"
]
}
33 changes: 9 additions & 24 deletions apps/indexer/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
{
"compilerOptions": {
"module": "Node16",
"noImplicitAny": false,
"noEmitOnError": false,
"removeComments": false,
"sourceMap": true,
"downlevelIteration": true,
"allowJs": true,
"allowSyntheticDefaultImports": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"esModuleInterop": true,
"moduleResolution": "Node16",
"resolveJsonModule": true,
"skipLibCheck": true,
"target": "ES6",
"baseUrl": "./src",
"paths": {
"@src/*": ["*"]
}
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"],
"compileOnSave": false
"compileOnSave": false,
"exclude": [
"node_modules",
"dist"
],
"extends": "./tsconfig.build.json",
"include": [
"src/**/*"
]
}
Loading

0 comments on commit 3d8831d

Please sign in to comment.