Skip to content

Commit 0cca61f

Browse files
committed
reverting to use tsconfig from build-tools
1 parent 9917543 commit 0cca61f

8 files changed

Lines changed: 432 additions & 60 deletions

File tree

common/config/rush/pnpm-lock.yaml

Lines changed: 403 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/tsconfig/tsconfig.base.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

packages/apps/desktop-viewer-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"npm-run-all": "^4.1.5",
9999
"rimraf": "^3.0.2",
100100
"sass": "^1.64.2",
101-
"typescript": "~5.0.4",
101+
"typescript": "~5.6.2",
102102
"webpack": "^5.94.0"
103103
}
104104
}

packages/apps/desktop-viewer-test/tsconfig.backend.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
{
2-
"extends": "../../../common/config/tsconfig/tsconfig.base.json",
2+
"extends": "./node_modules/@itwin/build-tools/tsconfig-base.json",
33
"compilerOptions": {
4-
"target": "ES2022",
5-
"lib": [
6-
"ES2022",
7-
"DOM",
8-
"DOM.Iterable",
9-
"ESNext"
10-
],
11-
"outDir": "./lib",
4+
"outDir": "./lib"
125
},
136
"include": [
147
"./src/backend/*.ts",

packages/apps/desktop-viewer-test/tsconfig.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
{
2-
"extends": "../../../common/config/tsconfig/tsconfig.base.json",
32
"compilerOptions": {
4-
"target": "ES2022",
3+
"target": "ES2021",
54
"lib": [
6-
"ES2022",
7-
"DOM",
8-
"DOM.Iterable",
9-
"ESNext"
5+
"dom",
6+
"dom.iterable",
7+
"esnext"
108
],
119
"allowJs": true,
12-
"module": "ESNext",
10+
"skipLibCheck": true,
11+
"esModuleInterop": true,
12+
"allowSyntheticDefaultImports": true,
13+
"strict": true,
14+
"forceConsistentCasingInFileNames": true,
15+
"module": "esnext",
16+
"moduleResolution": "node",
1317
"resolveJsonModule": true,
1418
"isolatedModules": true,
1519
"noEmit": true,
20+
"jsx": "react",
1621
"noFallthroughCasesInSwitch": true
1722
},
1823
"include": [
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"extends": "../../../common/config/tsconfig/tsconfig.base.json",
2+
"extends": "./node_modules/@itwin/build-tools/tsconfig-base.json",
33
"compilerOptions": {
4-
"target": "ES2022",
5-
"lib": ["ES2022", "DOM", "DOM.Iterable", "ESNext"]
4+
"allowSyntheticDefaultImports": true,
5+
"esModuleInterop": true
66
},
7-
"include": ["./src/**/*.ts*"],
7+
"include": [
8+
"./src/**/*.ts"
9+
]
810
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"extends": "../../../common/config/tsconfig/tsconfig.base.json",
2+
"extends": "./node_modules/@itwin/build-tools/tsconfig-base.json",
33
"compilerOptions": {
4-
"target": "ES2022",
5-
"lib": ["ES2022", "DOM", "DOM.Iterable", "ESNext"]
4+
"allowSyntheticDefaultImports": true,
5+
"esModuleInterop": true,
66
},
77
"include": ["./src/**/*.ts*"],
8-
"exclude": ["./src/**/*.test.ts*"],
8+
"exclude": ["./src/**/*.test.ts*"],
99
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"extends": "../../../common/config/tsconfig/tsconfig.base.json",
2+
"extends": "./node_modules/@itwin/build-tools/tsconfig-base.json",
33
"compilerOptions": {
4-
"target": "ES2022",
5-
"lib": ["ES2022", "DOM", "DOM.Iterable", "ESNext"]
4+
"allowSyntheticDefaultImports": true,
5+
"esModuleInterop": true
66
},
77
"include": ["./src/**/*.ts*"],
8-
}
8+
}

0 commit comments

Comments
 (0)