Skip to content

Commit 79b1ea5

Browse files
committed
build: ensure build uses typescript 3.9
We recently updated TS 3.9 in the `package.json` with angular#19286, but the build did not pick up the new version. This is because peer dependency ranges did not accept TS 3.9, so yarn hoisted sufficient TS versions.
1 parent 14a51ef commit 79b1ea5

File tree

7 files changed

+19
-4
lines changed

7 files changed

+19
-4
lines changed

angular-tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"angularCompilerOptions": {
66
// In snapshot builds the compiler-cli will now use ngtsc by default. In
77
// order to be able to build the summary files, we need to use ngc.
8-
"enableIvy": false
8+
"enableIvy": false,
9+
"disableTypeScriptVersionCheck": true
910
},
1011
"compilerOptions": {
1112
"module": "umd",

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@
170170
"yargs": "15.3.0"
171171
},
172172
"resolutions": {
173-
"dgeni-packages/typescript": "3.8.3",
173+
"dgeni-packages/typescript": "3.9.1-rc",
174+
"@angular/compiler-cli/typescript": "3.9.1-rc",
175+
"@angular/bazel/typescript": "3.9.1-rc",
174176
"**/graceful-fs": "4.2.2"
175177
}
176178
}

src/bazel-tsconfig-build.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343

4444
// See https://github.com/angular/angular/issues/29107
4545
"devmodeTargetOverride": "es5"
46+
},
47+
"angularCompilerOptions": {
48+
"disableTypeScriptVersionCheck": true
4649
}
4750
}

src/bazel-tsconfig-test.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616

1717
// See https://github.com/angular/angular/issues/29107
1818
"devmodeTargetOverride": "es5"
19+
},
20+
"angularCompilerOptions": {
21+
"disableTypeScriptVersionCheck": true
1922
}
2023
}

src/components-examples/material/datepicker/tsconfig-build.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"compilerOptions": {
44
// Needed for Moment.js since it doesn't have a default export.
55
"allowSyntheticDefaultImports": true
6+
},
7+
"angularCompilerOptions": {
8+
"disableTypeScriptVersionCheck": true
69
}
710
}

src/material-moment-adapter/tsconfig-build.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"compilerOptions": {
44
// Needed for Moment.js since it doesn't have a default export.
55
"allowSyntheticDefaultImports": true
6+
},
7+
"angularCompilerOptions": {
8+
"disableTypeScriptVersionCheck": true
69
}
710
}

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11791,12 +11791,12 @@ typedarray@^0.0.6:
1179111791
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
1179211792
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
1179311793

11794-
"typescript-3.8@npm:typescript@~3.8.0", typescript@3.8.3, typescript@^3.2.2:
11794+
"typescript-3.8@npm:typescript@~3.8.0":
1179511795
version "3.8.3"
1179611796
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
1179711797
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
1179811798

11799-
typescript@3.9.1-rc:
11799+
typescript@3.9.1-rc, typescript@^3.2.2:
1180011800
version "3.9.1-rc"
1180111801
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.1-rc.tgz#81d5a5a0a597e224b6e2af8dffb46524b2eaf5f3"
1180211802
integrity sha512-+cPv8L2Vd4KidCotqi2wjegBZ5n47CDRUu/QiLVu2YbeXAz78hIfcai9ziBiNI6JTGTVwUqXRug2UZxDcxhvFw==

0 commit comments

Comments
 (0)