Skip to content

Commit 5e375a1

Browse files
alan-agius4clydin
alan-agius4
authored and
clydin
committed
fix(@ngtools/webpack): use getDiagnosticsForFile instead of getDiagnostics
With this change we replace `getDiagnostics` with `getDiagnosticsForFile`. `getDiagnostics` no longer accept a parameter and is intended to be used instead of `getDiagnostics`. I used `OptimizeFor.WholeProgram` based on the comments in angular/angular#40331 (comment) which suggests that if you iterate through files one at a time the `WholeProgram` flag should be used. For more context see: angular/angular#40331 (cherry picked from commit 5fdc0a6)
1 parent d7d90e1 commit 5e375a1

File tree

4 files changed

+76
-66
lines changed

4 files changed

+76
-66
lines changed

‎package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@
6464
]
6565
},
6666
"devDependencies": {
67-
"@angular/animations": "11.1.0-next.4",
67+
"@angular/animations": "11.1.0-rc.0",
6868
"@angular/cdk": "11.0.3",
69-
"@angular/common": "11.1.0-next.4",
70-
"@angular/compiler": "11.1.0-next.4",
71-
"@angular/compiler-cli": "11.1.0-next.4",
72-
"@angular/core": "11.1.0-next.4",
73-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#579e491f4308ab4733a5c28ef7c5c734e3bf405e",
74-
"@angular/forms": "11.1.0-next.4",
75-
"@angular/localize": "11.1.0-next.4",
69+
"@angular/common": "11.1.0-rc.0",
70+
"@angular/compiler": "11.1.0-rc.0",
71+
"@angular/compiler-cli": "11.1.0-rc.0",
72+
"@angular/core": "11.1.0-rc.0",
73+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#d46e59817dc0ecebc10e2c716baa461afcd710cf",
74+
"@angular/forms": "11.1.0-rc.0",
75+
"@angular/localize": "11.1.0-rc.0",
7676
"@angular/material": "11.0.3",
77-
"@angular/platform-browser": "11.1.0-next.4",
78-
"@angular/platform-browser-dynamic": "11.1.0-next.4",
79-
"@angular/platform-server": "11.1.0-next.4",
80-
"@angular/router": "11.1.0-next.4",
81-
"@angular/service-worker": "11.1.0-next.4",
77+
"@angular/platform-browser": "11.1.0-rc.0",
78+
"@angular/platform-browser-dynamic": "11.1.0-rc.0",
79+
"@angular/platform-server": "11.1.0-rc.0",
80+
"@angular/router": "11.1.0-rc.0",
81+
"@angular/service-worker": "11.1.0-rc.0",
8282
"@babel/core": "7.12.10",
8383
"@babel/generator": "7.12.11",
8484
"@babel/plugin-transform-runtime": "7.12.10",

‎packages/ngtools/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"webpack": "^4.0.0"
3232
},
3333
"devDependencies": {
34-
"@angular/compiler": "11.1.0-next.4",
35-
"@angular/compiler-cli": "11.1.0-next.4",
34+
"@angular/compiler": "11.1.0-rc.0",
35+
"@angular/compiler-cli": "11.1.0-rc.0",
3636
"typescript": "4.1.3",
3737
"webpack": "4.44.2"
3838
}

‎packages/ngtools/webpack/src/ivy/plugin.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,17 @@ export class AngularWebpackPlugin {
425425
for (const sourceFile of builder.getSourceFiles()) {
426426
// Collect Angular template diagnostics
427427
if (!ignoreForDiagnostics.has(sourceFile)) {
428-
diagnosticsReporter(angularCompiler.getDiagnostics(sourceFile));
428+
// The below check should be removed once support for compiler 11.0 is dropped.
429+
// Also, the below require should be changed to an ES6 import.
430+
if (angularCompiler.getDiagnosticsForFile) {
431+
// @angular/compiler-cli 11.1+
432+
const { OptimizeFor } = require('@angular/compiler-cli/src/ngtsc/typecheck/api');
433+
diagnosticsReporter(angularCompiler.getDiagnosticsForFile(sourceFile, OptimizeFor.WholeProgram));
434+
} else {
435+
// @angular/compiler-cli 11.0+
436+
const getDiagnostics = angularCompiler.getDiagnostics as (sourceFile: ts.SourceFile) => ts.Diagnostic[];
437+
diagnosticsReporter(getDiagnostics.call(angularCompiler, sourceFile));
438+
}
429439
}
430440

431441
// Collect sources that are required to be emitted

‎yarn.lock

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@angular/[email protected]next.4":
6-
version "11.1.0-next.4"
7-
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.0-next.4.tgz#dea9d08a3d62c302f9c12c5064ab8adc6f2db228"
8-
integrity sha512-ZwNyimfkhT029JvRSNnmflBGIGU8kR38yQsD1h4u4ypPwdoxYWonvI6mAbnRHAa85WG3qA8Fb8HA3kKuAXYDag==
5+
"@angular/[email protected]rc.0":
6+
version "11.1.0-rc.0"
7+
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.0-rc.0.tgz#963697f805a2b06c3e4de7e95ba5216d9f21123a"
8+
integrity sha512-2Rw/4Mch5GccVb2uNNumeKLXS2g/g7FTXOS/PBhN38rxFuAzL2WE3Obx72y3xr3sfta2avfJdWQjIf+5B8qytw==
99
dependencies:
1010
tslib "^2.0.0"
1111

@@ -26,17 +26,17 @@
2626
optionalDependencies:
2727
parse5 "^5.0.0"
2828

29-
"@angular/[email protected]next.4":
30-
version "11.1.0-next.4"
31-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.0-next.4.tgz#e5602ac8f1df0eaa0f403383be4921c663765f14"
32-
integrity sha512-O5tFWJl6yr45mvy84onR/gUYfxTqP10Pv2/0MJbLF/L3R1sK5LwBHg69SB6y8mdma/kwOMvemUK3lt9k9SrQQQ==
29+
"@angular/[email protected]rc.0":
30+
version "11.1.0-rc.0"
31+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.0-rc.0.tgz#c19ffada76d3e01dfcca7e01b2244da1a724af1c"
32+
integrity sha512-ZivVwORX8FC+Eq2oJsVAEw5EST/nCBlW/JHF5hpyfuBynhDmH4vQunPQapHfhP841FGiSGjGKTXFTBw09/gBpA==
3333
dependencies:
3434
tslib "^2.0.0"
3535

36-
"@angular/[email protected]next.4":
37-
version "11.1.0-next.4"
38-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.1.0-next.4.tgz#feaada877589cdabbcc687e939ffde4393293605"
39-
integrity sha512-E1/6e0JS3Saj9nG12eo8q0zJJXlbwtPyuWOVK7EK57OJdF6PsYIAf9g93TKk2QA+iimbNklconj/2LQj9cCGMQ==
36+
"@angular/[email protected]rc.0":
37+
version "11.1.0-rc.0"
38+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.1.0-rc.0.tgz#8bb026939a421190ac55dacaf7aca63d568ace82"
39+
integrity sha512-YYyg/ixzqxoqaRnoInT60BwqA3enfcQvK2BcaUKvmhyyzqK+fnAiCiRgBl3uZGu+kQgAZuleUKdFmyHJZ275sQ==
4040
dependencies:
4141
"@babel/core" "^7.8.6"
4242
"@babel/types" "^7.8.6"
@@ -54,10 +54,10 @@
5454
tslib "^2.0.0"
5555
yargs "^16.1.1"
5656

57-
"@angular/[email protected]next.4":
58-
version "11.1.0-next.4"
59-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.0-next.4.tgz#abf575efdec0fcc76cc15205431e460ed4063953"
60-
integrity sha512-RP2kXZsPxtHPfAngYz0TPkGBQlJxD0CIC0+Gn3Ck2axSAWGCwRCuiozK9NVEIOzKT3VNtFZB9+esYzSYawcr2w==
57+
"@angular/[email protected]rc.0":
58+
version "11.1.0-rc.0"
59+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.0-rc.0.tgz#de784751a59d619ebccb7b0e6c58e77aaab9bce3"
60+
integrity sha512-ArVrXo/ozIb/MIGtjSrXF3+ZUjUUlQcOQ1+/zdWDeH+B8Gs78p1C6VQoBx8j27UsJ1XgX/Khsl3Zg3nzPq1kOA==
6161
dependencies:
6262
tslib "^2.0.0"
6363

@@ -66,10 +66,10 @@
6666
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5"
6767
integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==
6868

69-
"@angular/[email protected]next.4":
70-
version "11.1.0-next.4"
71-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.0-next.4.tgz#d7bfc8e77f7bddcad40b45d52679d2eec5cbc049"
72-
integrity sha512-2fsArpeyIDiZa2jjhj+FFCS+Rgj2+D3CoRUcAXNly+SVEL+yR8fZSCsBsFHFbReQnrAE/XvU0N63Q2jD3m56Yw==
69+
"@angular/[email protected]rc.0":
70+
version "11.1.0-rc.0"
71+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.0-rc.0.tgz#2185e63d085921641c1c11ca57a29d16f5d881ed"
72+
integrity sha512-OqYl5yGjLKeoMlWDpyEQWgWxf6qs7pJzHtw8220Alqio0lLTQTpldUBk8QgdRL75A+lZ/L8YqsLssozTyytPKw==
7373
dependencies:
7474
tslib "^2.0.0"
7575

@@ -85,9 +85,9 @@
8585
dependencies:
8686
tslib "^2.0.0"
8787

88-
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#579e491f4308ab4733a5c28ef7c5c734e3bf405e":
88+
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#d46e59817dc0ecebc10e2c716baa461afcd710cf":
8989
version "0.0.0"
90-
resolved "https://github.com/angular/dev-infra-private-builds.git#579e491f4308ab4733a5c28ef7c5c734e3bf405e"
90+
resolved "https://github.com/angular/dev-infra-private-builds.git#d46e59817dc0ecebc10e2c716baa461afcd710cf"
9191
dependencies:
9292
"@angular/benchpress" "0.2.1"
9393
"@bazel/buildifier" "^0.29.0"
@@ -117,17 +117,17 @@
117117
yaml "^1.10.0"
118118
yargs "^16.1.1"
119119

120-
"@angular/[email protected]next.4":
121-
version "11.1.0-next.4"
122-
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.0-next.4.tgz#c5a4b516aeadf6c3672c33595b66b04ae1050b4f"
123-
integrity sha512-ZkW8bsYPL8C10RjhwdU1G07TVWyxxfHzzlLORFZ3CQgXoZtXBNTh0P7VDw44ZDLHmfwuksxryYVHTTrCeGQPew==
120+
"@angular/[email protected]rc.0":
121+
version "11.1.0-rc.0"
122+
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.0-rc.0.tgz#7c03253e2b4a57ad6fe6fa0ecc0b436fb77c6097"
123+
integrity sha512-yAFoMaPGiA2JleIQ8wwEaILMIGiM3tBg6RFcMkOz/pw3ihlh6cyj6UN5yM2z4SFwn87p8eSyd6XQBTybg5Ht4A==
124124
dependencies:
125125
tslib "^2.0.0"
126126

127-
"@angular/[email protected]next.4":
128-
version "11.1.0-next.4"
129-
resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.1.0-next.4.tgz#124671437a4b43a1d70e824abedb04c9fe64d656"
130-
integrity sha512-PCV+gzszB3OMHyWhAgDy9QSZCXlTXmhUYWy/4FGvc37LzRTFj+6U74y7mFIt3AXX547a3WbBU5/VLQw+ykhHBQ==
127+
"@angular/[email protected]rc.0":
128+
version "11.1.0-rc.0"
129+
resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.1.0-rc.0.tgz#8fac82a2453ff68cdce0cdc15e6f09f95320a44e"
130+
integrity sha512-06F9Bzl6jAgu+4ZPSkG9XWgd/ZF+1/lQQ0RfcTEGcYNfcqXv4EaM9R2eCCFLFEClEz0pA0Bis9l2jtf8Z6c02A==
131131
dependencies:
132132
"@babel/core" "7.8.3"
133133
glob "7.1.2"
@@ -140,40 +140,40 @@
140140
dependencies:
141141
tslib "^2.0.0"
142142

143-
"@angular/[email protected]next.4":
144-
version "11.1.0-next.4"
145-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.0-next.4.tgz#b77709cd540affe41b23b38f941c75b9f3efda9d"
146-
integrity sha512-RyLrIKFbSBxtERnZkZ1nOn4912JmuFjOdU83b+j22DWBmMJVi4+aWYZcjJPSnjLTrKMwvpDIGwS95+GcNL8Gww==
143+
"@angular/[email protected]rc.0":
144+
version "11.1.0-rc.0"
145+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.0-rc.0.tgz#1e9df5f9a6a6284256db7f8b3a8c0e9a8fa21e30"
146+
integrity sha512-9Tiji8ahz23mozpZkuTjwH/GBSVLR+kdfeHpdArY7c1F7iyLgdHSnxgTfdUyz4fd+zg7a7y4YGP99iOJKnT3Ug==
147147
dependencies:
148148
tslib "^2.0.0"
149149

150-
"@angular/[email protected]next.4":
151-
version "11.1.0-next.4"
152-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.0-next.4.tgz#dbf902fb7034bd89b77369c28ac76dfd800d45af"
153-
integrity sha512-y8rvqieQHXTgXtrJcjsYLIVYE5wAxSpLZ66M5/pbnO/cxtl+UUQRfUVpNOFO8ZvCZyzF/6cgcUw2/bm7GxdW8A==
150+
"@angular/[email protected]rc.0":
151+
version "11.1.0-rc.0"
152+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.0-rc.0.tgz#4bfeea5a45eb883e2f4236a959d8529ac634509e"
153+
integrity sha512-5Qx6iBeoBuvFGA/CMiMaj6tIz6V9uM2tWuMbT9UVM5HW0ZgBRJzHTlHjVZE1LpV3lwBVORD5G2Txgji4ti8Mjg==
154154
dependencies:
155155
tslib "^2.0.0"
156156

157-
"@angular/[email protected]next.4":
158-
version "11.1.0-next.4"
159-
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.1.0-next.4.tgz#ea1f25c0034e970bc74a0b1b26c59e7a4cefb143"
160-
integrity sha512-RSYx2D/g4Pn33JUQIdGEmXDWYiztZH+tqes2408msWiq9PNXd4JHdmamHNS/dnCB/OMoxtFG2N++jz10bbhEqQ==
157+
"@angular/[email protected]rc.0":
158+
version "11.1.0-rc.0"
159+
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.1.0-rc.0.tgz#a6954df0a6e100c00e33077dab1c5429b6ae8622"
160+
integrity sha512-KUkNXGVrObstqw81STkERH+8Dp8//HNeadISAuCVMtkkqVnSSkASVce4jBHyCu4dg3hFEGAdAgMWOqC/Dr7OSQ==
161161
dependencies:
162162
domino "^2.1.2"
163163
tslib "^2.0.0"
164164
xhr2 "^0.2.0"
165165

166-
"@angular/[email protected]next.4":
167-
version "11.1.0-next.4"
168-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.1.0-next.4.tgz#1204848b79f97503da6f4a2cfe0dd6f9bd0046db"
169-
integrity sha512-l4LW1/BHTBihV9+d2KYOmvTJZUS75JdXziB7iNCGp7ZBRD51YDr8rbBHQnQTYVE8lFi5y6uzZonkrHVEm9CKWQ==
166+
"@angular/[email protected]rc.0":
167+
version "11.1.0-rc.0"
168+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.1.0-rc.0.tgz#5bf8a01d7d09e0aac36b3d8fe3119c8a6cc2efff"
169+
integrity sha512-yevlvefmCa0ltlKPeTz9sT5d5UKVthMB2mOIopVsbr3U0HKVbIMJUhaLQmWdbBC1L2AKuBmUm4ljuOWEsIO4VA==
170170
dependencies:
171171
tslib "^2.0.0"
172172

173-
"@angular/[email protected]next.4":
174-
version "11.1.0-next.4"
175-
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.1.0-next.4.tgz#58af6e3e47866d718ec8ad710bb4ff55833ec3f5"
176-
integrity sha512-fpL6bXGc5QAIx3tphkgXntYB4OHSUek7zlAJTM8MPgiVrdCErpjLUufATYII+34X0blgZ1AarpWwpI/MOZUMiA==
173+
"@angular/[email protected]rc.0":
174+
version "11.1.0-rc.0"
175+
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.1.0-rc.0.tgz#08d2073a6b7c86894fc0b9647405883576331021"
176+
integrity sha512-8eRlxwK+56Po0LUEfObYxhoWe0yruMgRmfe46wel02rz/aPXnc7wqbxb6/PDYiJrTvBxkyxZ1MAh4ezAo6py+Q==
177177
dependencies:
178178
tslib "^2.0.0"
179179

0 commit comments

Comments
 (0)