Skip to content

Commit d883007

Browse files
petebacondarwinAndrewKushnir
petebacondarwin
authored and
AndrewKushnir
committed
build: update CLI and related dependencies (angular#33382)
This commit also ensures that the integration tests are all using the top level dependencies. Resolves angular#33314 (comment) PR Close angular#33382
1 parent 4c4217c commit d883007

File tree

10 files changed

+164
-157
lines changed

10 files changed

+164
-157
lines changed

‎integration/cli-hello-world-ivy-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"zone.js": "file:../../node_modules/zone.js"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "0.900.0-next.12",
31+
"@angular-devkit/build-angular": "^0.900.0-next.15",
3232
"@angular/cli": "file:../../node_modules/@angular/cli",
3333
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3434
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world-ivy-i18n/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"zone.js": "file:../../node_modules/zone.js"
4646
},
4747
"devDependencies": {
48-
"@angular-devkit/build-angular": "^0.900.0-next.14",
49-
"@angular/cli": "^9.0.0-next.14",
48+
"@angular-devkit/build-angular": "^0.900.0-next.15",
49+
"@angular/cli": "file:../../node_modules/@angular/cli",
5050
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
5151
"@angular/language-service": "file:../../dist/packages-dist/language-service",
5252
"@types/jasmine": "~3.4.0",

‎integration/cli-hello-world-ivy-i18n/yarn.lock

+70-72
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
# yarn lockfile v1
33

44

5-
"@angular-devkit/architect@0.900.0-next.14":
6-
version "0.900.0-next.14"
7-
resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-next.14.tgz#446bc66537edb057fe8a29c0d5f952d6da72d4ed"
8-
integrity sha512-cWr5kurKlfpQRVplZFNG4LF/StSnWWB3n2OKp3BZcd3tlsR8GmH7GRN+YLH9LRbfJHgmBikPBz75JDKn3zyEkw==
5+
"@angular-devkit/architect@0.900.0-next.15":
6+
version "0.900.0-next.15"
7+
resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-next.15.tgz#d7e2b929a4d78a2318adfdbf67b4167ea59fe5d4"
8+
integrity sha512-hNcguzc/fojhAWUJHA0K0VxdUY68auDMs2Jfmlxywgv2r6WJuzpdqn+ZfOdQz6mPKVEWkaRtR3and80oJQAc5w==
99
dependencies:
10-
"@angular-devkit/core" "9.0.0-next.14"
10+
"@angular-devkit/core" "9.0.0-next.15"
1111
rxjs "6.5.3"
1212

13-
"@angular-devkit/build-angular@^0.900.0-next.14":
14-
version "0.900.0-next.14"
15-
resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.900.0-next.14.tgz#d18e76c1d09dff18b70cf5051c35530a7693d54d"
16-
integrity sha512-cU3soynun2u06v8qMfHHVa5M215hrByWqKsl0qmJUK3ErjEoL0bZwKAuk5rJIUyR3n3dY29qCw8qxC29gBbO2w==
13+
"@angular-devkit/build-angular@^0.900.0-next.15":
14+
version "0.900.0-next.15"
15+
resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.900.0-next.15.tgz#ac149cdf98cdee065765dcf749b4aedb5d1a99bd"
16+
integrity sha512-+C0Sb8U0xOd6ImqPDLxYGHq9zQSM2+PpPdCGzST0Ed7fESXmLupzMQkCV8mkCAKZSuF8kXKWJSwA0ZmoZoR3DA==
1717
dependencies:
18-
"@angular-devkit/architect" "0.900.0-next.14"
19-
"@angular-devkit/build-optimizer" "0.900.0-next.14"
20-
"@angular-devkit/build-webpack" "0.900.0-next.14"
21-
"@angular-devkit/core" "9.0.0-next.14"
18+
"@angular-devkit/architect" "0.900.0-next.15"
19+
"@angular-devkit/build-optimizer" "0.900.0-next.15"
20+
"@angular-devkit/build-webpack" "0.900.0-next.15"
21+
"@angular-devkit/core" "9.0.0-next.15"
2222
"@babel/core" "7.6.4"
2323
"@babel/generator" "7.6.4"
2424
"@babel/preset-env" "7.6.3"
25-
"@ngtools/webpack" "9.0.0-next.14"
25+
"@ngtools/webpack" "9.0.0-next.15"
2626
ajv "6.10.2"
2727
autoprefixer "9.6.5"
2828
browserslist "4.7.1"
@@ -75,58 +75,56 @@
7575
webpack-subresource-integrity "1.3.4"
7676
worker-plugin "3.2.0"
7777

78-
"@angular-devkit/build-optimizer@0.900.0-next.14":
79-
version "0.900.0-next.14"
80-
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.0-next.14.tgz#e00b9eeb84dc773a0ef040871fa0bbbe78a381d8"
81-
integrity sha512-XWUjgEDcskCYbmNJTTlVn8SQAiVwSHl3tJqwA4MCvUXChd2QNjmjl7MhLG/3AYbgzF3UDPUvSuiheUSzFlo7rQ==
78+
"@angular-devkit/build-optimizer@0.900.0-next.15":
79+
version "0.900.0-next.15"
80+
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.0-next.15.tgz#06b23e17d689bde8cd259aaa3fc0e8ad9569d1d2"
81+
integrity sha512-15MU0mGo6T31wd81aBMNNEli8IgNOyFm7vRW2LwTmijcs7GidoFHc48tRXTBrppiNq2v49P9MLvCv5Tcf4SNbQ==
8282
dependencies:
8383
loader-utils "1.2.3"
8484
source-map "0.7.3"
8585
tslib "1.10.0"
8686
typescript "3.6.4"
8787
webpack-sources "1.4.3"
8888

89-
"@angular-devkit/build-webpack@0.900.0-next.14":
90-
version "0.900.0-next.14"
91-
resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.0-next.14.tgz#af21b0c40944562993aae8357b2f0b77bcb7a344"
92-
integrity sha512-j9wXafszZMdN98ldfc6GlZbUXA6aAxYkGiQG/FX5KhK++lBpQMwrx7y7Xurirzu8Lp0fqAWh9fpWtLTuM9m/Xg==
89+
"@angular-devkit/build-webpack@0.900.0-next.15":
90+
version "0.900.0-next.15"
91+
resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.0-next.15.tgz#4ad78d5ddd03f96f050116ea46f51159356edf95"
92+
integrity sha512-Ih0iml7OP/Xu+HNlBB7caennBPPgJa5LFW+vopEESm5RQ7BDkOVpMPmdnoqZrC7LVMKLIPv+NP/EdRgb5+0ZwA==
9393
dependencies:
94-
"@angular-devkit/architect" "0.900.0-next.14"
95-
"@angular-devkit/core" "9.0.0-next.14"
94+
"@angular-devkit/architect" "0.900.0-next.15"
95+
"@angular-devkit/core" "9.0.0-next.15"
9696
rxjs "6.5.3"
9797

98-
"@angular-devkit/core@9.0.0-next.14":
99-
version "9.0.0-next.14"
100-
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-next.14.tgz#42a51699ae3158c4578822e9f6f32ed3e250a80d"
101-
integrity sha512-OEuU7lHshuDd3lO2rK3p0uxWulWpMWGDQipXInrGDBM77NXuSgtmVsU+ZQlU46XObSjkrr/8YAo97UFlbZby1g==
98+
"@angular-devkit/core@9.0.0-next.15":
99+
version "9.0.0-next.15"
100+
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-next.15.tgz#5f640139a7afa03af6011a768d84e702372eb045"
101+
integrity sha512-wCx6ec5eI9tyTQLNdnLXJ2NNH8Rhey6Yb8I8nAlymEHxZG8d/OvpNRq3GklwVM+I75cLDguAbWMmWGbD02tR3w==
102102
dependencies:
103103
ajv "6.10.2"
104104
fast-json-stable-stringify "2.0.0"
105105
magic-string "0.25.4"
106106
rxjs "6.5.3"
107107
source-map "0.7.3"
108108

109-
"@angular-devkit/schematics@9.0.0-next.14":
110-
version "9.0.0-next.14"
111-
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-next.14.tgz#a35744348dc5dc46028512f499ce6634d268d749"
112-
integrity sha512-TCG8ZQ7eEaqP2u5pPLC7yJB3GMqLO5NmojMyXc40Khop/srWbahQRlGL9UEPUvbWDhfLlx6VpaIwBVzIcDX38A==
109+
"@angular-devkit/schematics@9.0.0-next.15":
110+
version "9.0.0-next.15"
111+
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-next.15.tgz#0a39e4a78860e5e65660025c58e60bc9d4bf9cf7"
112+
integrity sha512-0hfIyC5TP88wOzjKnQgXAI+BaW6JJPY7yinxBS35rowiwB1XWPcWRFacFXuyfLQRv48JXt17voOz+OH2iHRA5A==
113113
dependencies:
114-
"@angular-devkit/core" "9.0.0-next.14"
114+
"@angular-devkit/core" "9.0.0-next.15"
115115
rxjs "6.5.3"
116116

117117
"@angular/animations@file:../../dist/packages-dist/animations":
118-
version "9.0.0-next.12"
119-
120-
"@angular/cli@^9.0.0-next.14":
121-
version "9.0.0-next.14"
122-
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.0-next.14.tgz#483d11a9a384bfc62d152a3f1d1a7c03ca4179e1"
123-
integrity sha512-sE2ypfAjYLNGJr1isFmkUEG3PMFNe9Qs5kq4bkuV85yhfonhKk78QutF7lCvOK9fb3d5BkjDezHWF+bEvIcTNw==
124-
dependencies:
125-
"@angular-devkit/architect" "0.900.0-next.14"
126-
"@angular-devkit/core" "9.0.0-next.14"
127-
"@angular-devkit/schematics" "9.0.0-next.14"
128-
"@schematics/angular" "9.0.0-next.14"
129-
"@schematics/update" "0.900.0-next.14"
118+
version "9.0.0-next.13"
119+
120+
"@angular/cli@file:../../node_modules/@angular/cli":
121+
version "9.0.0-next.15"
122+
dependencies:
123+
"@angular-devkit/architect" "0.900.0-next.15"
124+
"@angular-devkit/core" "9.0.0-next.15"
125+
"@angular-devkit/schematics" "9.0.0-next.15"
126+
"@schematics/angular" "9.0.0-next.15"
127+
"@schematics/update" "0.900.0-next.15"
130128
"@yarnpkg/lockfile" "1.1.0"
131129
ansi-colors "4.1.1"
132130
debug "^4.1.1"
@@ -144,10 +142,10 @@
144142
uuid "^3.3.2"
145143

146144
"@angular/common@file:../../dist/packages-dist/common":
147-
version "9.0.0-next.12"
145+
version "9.0.0-next.13"
148146

149147
"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
150-
version "9.0.0-next.12"
148+
version "9.0.0-next.13"
151149
dependencies:
152150
canonical-path "1.0.0"
153151
chokidar "^2.1.1"
@@ -161,32 +159,32 @@
161159
yargs "13.1.0"
162160

163161
"@angular/compiler@file:../../dist/packages-dist/compiler":
164-
version "9.0.0-next.12"
162+
version "9.0.0-next.13"
165163

166164
"@angular/core@file:../../dist/packages-dist/core":
167-
version "9.0.0-next.12"
165+
version "9.0.0-next.13"
168166

169167
"@angular/forms@file:../../dist/packages-dist/forms":
170-
version "9.0.0-next.12"
168+
version "9.0.0-next.13"
171169

172170
"@angular/language-service@file:../../dist/packages-dist/language-service":
173-
version "9.0.0-next.12"
171+
version "9.0.0-next.13"
174172

175173
"@angular/localize@file:../../dist/packages-dist/localize":
176-
version "9.0.0-next.12"
174+
version "9.0.0-next.13"
177175
dependencies:
178176
"@babel/core" "^7.5.5"
179177
glob "7.1.2"
180178
yargs "13.1.0"
181179

182180
"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
183-
version "9.0.0-next.12"
181+
version "9.0.0-next.13"
184182

185183
"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
186-
version "9.0.0-next.12"
184+
version "9.0.0-next.13"
187185

188186
"@angular/router@file:../../dist/packages-dist/router":
189-
version "9.0.0-next.12"
187+
version "9.0.0-next.13"
190188

191189
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
192190
version "7.5.5"
@@ -882,31 +880,31 @@
882880
lodash "^4.17.13"
883881
to-fast-properties "^2.0.0"
884882

885-
"@ngtools/webpack@9.0.0-next.14":
886-
version "9.0.0-next.14"
887-
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.0-next.14.tgz#da927f08a2f51717ce8466575ae605cdafb72de9"
888-
integrity sha512-7kj4WCDi31cFPc+x4VjE8vjcoMBWZtToyBHvLgHRetyo9afG92mbrAzzEg4mQb9a9pYNCiYZXVKdoWG7psVTuQ==
883+
"@ngtools/webpack@9.0.0-next.15":
884+
version "9.0.0-next.15"
885+
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.0-next.15.tgz#7b9551893f265a8d7ccc675d4fbc8669aa921ad9"
886+
integrity sha512-3ymUVMlmcMlGXrIjGB+7oUZq7OSGPKxLC0PX1PoTLxK/m/BI/tUyggDCx6w35GtYERnp7mhuJ6WReO8usC9cDA==
889887
dependencies:
890-
"@angular-devkit/core" "9.0.0-next.14"
888+
"@angular-devkit/core" "9.0.0-next.15"
891889
enhanced-resolve "4.1.1"
892890
rxjs "6.5.3"
893891
webpack-sources "1.4.3"
894892

895-
"@schematics/angular@9.0.0-next.14":
896-
version "9.0.0-next.14"
897-
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-next.14.tgz#ef5267d284eb7eeb40d4f87617999dfea68cd7f7"
898-
integrity sha512-epx3HbhsYSsfmzD6ch2N31O9uyn3IBbP0lp5PbV3IaJEymFTNE9Kd62Plmd/gLTMEeMbdtTC1oc1O554Y6c0vQ==
893+
"@schematics/angular@9.0.0-next.15":
894+
version "9.0.0-next.15"
895+
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-next.15.tgz#0247585ff7cdb9bdd108525f845e0ba0890b5ffc"
896+
integrity sha512-Xc8Kvmk1s65h9AoaeN/CMuSMkzDnnarBrglk1MNOfD1y/WMmmJGLhcv+cOiTavJGFJNFv+iJmE8FJR6sDga3Wg==
899897
dependencies:
900-
"@angular-devkit/core" "9.0.0-next.14"
901-
"@angular-devkit/schematics" "9.0.0-next.14"
898+
"@angular-devkit/core" "9.0.0-next.15"
899+
"@angular-devkit/schematics" "9.0.0-next.15"
902900

903-
"@schematics/update@0.900.0-next.14":
904-
version "0.900.0-next.14"
905-
resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-next.14.tgz#70fff750dddfdacb0abf92261adec02a88d7ea28"
906-
integrity sha512-Thwomg2kLYOw2SclRzMveopNZ9sTH9VK5izlooB+0az1sGBcmOeOWXcyib5NTcmYqMWfJdZkEyL5//soJweNrA==
901+
"@schematics/update@0.900.0-next.15":
902+
version "0.900.0-next.15"
903+
resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-next.15.tgz#c86ea5c7e43c8bf39020d3861d58154edf3007c5"
904+
integrity sha512-3FQK9hc/LIBY2D9+5MCdg7SfmAvOBh6XyKpN6aoX4GHNm8v5Yn74XZM6h3PWbIPK94EI8x/H7H/ZbXFkrOUUUA==
907905
dependencies:
908-
"@angular-devkit/core" "9.0.0-next.14"
909-
"@angular-devkit/schematics" "9.0.0-next.14"
906+
"@angular-devkit/core" "9.0.0-next.15"
907+
"@angular-devkit/schematics" "9.0.0-next.15"
910908
"@yarnpkg/lockfile" "1.1.0"
911909
ini "1.3.5"
912910
pacote "9.5.8"

‎integration/cli-hello-world-ivy-minimal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"zone.js": "file:../../node_modules/zone.js"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "0.900.0-next.12",
31+
"@angular-devkit/build-angular": "^0.900.0-next.15",
3232
"@angular/cli": "file:../../node_modules/@angular/cli",
3333
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3434
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world-lazy-rollup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"zone.js": "file:../../node_modules/zone.js"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "0.900.0-next.12",
26+
"@angular-devkit/build-angular": "^0.900.0-next.15",
2727
"@angular/cli": "file:../../node_modules/@angular/cli",
2828
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
2929
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world-lazy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"zone.js": "file:../../node_modules/zone.js"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "0.900.0-next.12",
26+
"@angular-devkit/build-angular": "^0.900.0-next.15",
2727
"@angular/cli": "file:../../node_modules/@angular/cli",
2828
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
2929
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"zone.js": "file:../../node_modules/zone.js"
2727
},
2828
"devDependencies": {
29-
"@angular-devkit/build-angular": "0.900.0-next.12",
29+
"@angular-devkit/build-angular": "^0.900.0-next.15",
3030
"@angular/cli": "file:../../node_modules/@angular/cli",
3131
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3232
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/ng_update_migrations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"zone.js": "file:../../node_modules/zone.js"
2525
},
2626
"devDependencies": {
27-
"@angular-devkit/build-angular": "0.900.0-next.12",
27+
"@angular-devkit/build-angular": "^0.900.0-next.15",
2828
"@angular/cli": "file:../../node_modules/@angular/cli",
2929
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3030
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
},
3636
"// 1": "dependencies are used locally and by bazel",
3737
"dependencies": {
38-
"@angular-devkit/architect": "^0.800.0-beta.15",
39-
"@angular-devkit/build-optimizer": "^0.800.0-beta.15",
40-
"@angular-devkit/core": "^8.0.0-beta.15",
41-
"@angular-devkit/schematics": "^8.0.0-beta.15",
38+
"@angular-devkit/architect": "^0.900.0-next.15",
39+
"@angular-devkit/build-optimizer": "^0.900.0-next.15",
40+
"@angular-devkit/core": "^9.0.0-next.15",
41+
"@angular-devkit/schematics": "^9.0.0-next.15",
4242
"@angular/bazel": "file:./tools/npm/@angular_bazel",
4343
"@babel/core": "^7.6.4",
4444
"@bazel/jasmine": "0.38.3",
@@ -128,7 +128,7 @@
128128
"// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.",
129129
"// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)",
130130
"devDependencies": {
131-
"@angular/cli": "9.0.0-next.12",
131+
"@angular/cli": "^9.0.0-next.15",
132132
"@bazel/bazel": "0.28.1",
133133
"@bazel/buildifier": "^0.26.0",
134134
"@bazel/ibazel": "^0.10.3",

0 commit comments

Comments
 (0)