Skip to content

Commit 95a75b0

Browse files
authored
refactor: remove composite tsconfig (#2098)
1 parent 95213d4 commit 95a75b0

19 files changed

+56
-96
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ build
1616
.project
1717
.classpath
1818
.c9/
19+
.angular/
1920
*.launch
2021
.settings/
2122
*.sublime-workspace

projects/assets-library/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/lib",
55
"target": "es2015",

projects/assets-library/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["jest", "webpack-env"]

projects/common/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"rootDir": "../../",
55
"declaration": true,

projects/common/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["webpack-env", "jest"],

projects/components/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"rootDir": "../../",
55
"declaration": true,

projects/components/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["jest", "webpack-env"]

projects/dashboards/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"rootDir": "../../",
55
"declaration": true,

projects/dashboards/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["webpack-env", "jest"],

projects/graphql-client/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"rootDir": "../../",
55
"outDir": "../../out-tsc/lib",

projects/graphql-client/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["jest", "webpack-env"]

projects/observability/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"rootDir": "../../",
55
"outDir": "../../out-tsc/lib",

projects/observability/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["jest", "webpack-env"]

projects/test-utils/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/lib",
55
"target": "es2015",

projects/test-utils/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": ["jest", "webpack-env"]

tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.base.json",
2+
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/app",
55
"types": [],

tsconfig.base.json

-41
This file was deleted.

tsconfig.json

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
/*
2-
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3-
It is not intended to be used to perform a compilation.
4-
5-
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6-
*/
71
{
8-
"files": [],
9-
"references": [
10-
{
11-
"path": "./tsconfig.app.json"
12-
},
13-
{
14-
"path": "./tsconfig.spec.json"
15-
},
16-
{
17-
"path": "./projects/common/tsconfig.lib.json"
18-
},
19-
{
20-
"path": "./projects/graphql-client/tsconfig.lib.json"
21-
},
22-
{
23-
"path": "./projects/components/tsconfig.lib.json"
24-
},
25-
{
26-
"path": "./projects/dashboards/tsconfig.lib.json"
27-
},
28-
{
29-
"path": "./projects/test-utils/tsconfig.lib.json"
30-
},
31-
{
32-
"path": "./projects/assets-library/tsconfig.lib.json"
33-
},
34-
{
35-
"path": "./projects/observability/tsconfig.lib.json"
36-
},
37-
{
38-
"path": "./projects/observability/tsconfig.spec.json"
39-
}
40-
]
2+
"compilerOptions": {
3+
"baseUrl": "./",
4+
"importHelpers": true,
5+
"outDir": "./dist/out-tsc",
6+
"strict": true,
7+
"sourceMap": true,
8+
"declaration": false,
9+
"module": "es2020",
10+
"target": "es2015",
11+
"moduleResolution": "node",
12+
"emitDecoratorMetadata": true,
13+
"experimentalDecorators": true,
14+
"esModuleInterop": true,
15+
"noEmitOnError": false,
16+
"noUnusedLocals": true,
17+
"noUnusedParameters": true,
18+
"downlevelIteration": true,
19+
"allowJs": true,
20+
"lib": ["es2015", "es2016", "es2017", "esnext.string", "esnext.array", "esnext.asynciterable", "dom"],
21+
"paths": {
22+
"@hypertrace/assets-library": ["projects/assets-library/src/public-api.ts"],
23+
"@hypertrace/common": ["projects/common/src/public-api.ts"],
24+
"@hypertrace/components": ["projects/components/src/public-api.ts"],
25+
"@hypertrace/dashboards": ["projects/dashboards/src/public-api.ts"],
26+
"@hypertrace/graphql-client": ["projects/graphql-client/src/public-api.ts"],
27+
"@hypertrace/test-utils": ["projects/test-utils/src/public-api.ts"],
28+
"@hypertrace/dashboards/testing": ["projects/dashboards/src/test/public-api.ts"],
29+
"@hypertrace/observability": ["projects/observability/src/public-api.ts"]
30+
},
31+
"plugins": [
32+
{
33+
"name": "typescript-tslint-plugin"
34+
}
35+
]
36+
},
37+
"angularCompilerOptions": {
38+
"fullTemplateTypeCheck": true,
39+
"strictInjectionParameters": true
40+
}
4141
}

tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.base.json",
2+
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/spec",
55
"types": ["jest", "webpack-env"],

0 commit comments

Comments
 (0)