Skip to content

Commit 4ece0eb

Browse files
gkalpakmhevery
authored andcommitted
build: use exact versions for integration project dependencies (angular#33968)
Since we cannot run `yarn install` with the `--frozen-lockfile` option (because we want to be able to install the locally built Angular packages), integration project lockfiles are susceptible to getting out-of-sync with the corresponding `package.json`. When this happens, yarn will install the latest available version that satisfies the version range specified in `package.json`. This commit adds another line of defense, by specifying exact versions for the dependencies in `package.json` files (i.e. `1.33.7` instead of `^1.33.0`). While transitive dependencies will be unpinned, this still ensures that the same version of direct dependencies will be installed in case of an out-of-sync lockfile, thus reducing the probability of random failures. PR Close angular#33968
1 parent 7f0d7f4 commit 4ece0eb

File tree

22 files changed

+268
-277
lines changed

22 files changed

+268
-277
lines changed

integration/bazel/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
"@bazel/terser": "0.40.0",
3030
"@bazel/typescript": "0.40.0",
3131
"@types/jasmine": "2.8.8",
32-
"http-server": "^0.11.1",
33-
"rollup": "~1.25.0",
34-
"rollup-plugin-commonjs": "^10.1.0",
35-
"rollup-plugin-node-resolve": "^5.2.0",
36-
"rollup-plugin-sourcemaps": "^0.4.2",
37-
"terser": "^4.3.9",
32+
"http-server": "0.11.1",
33+
"rollup": "1.25.2",
34+
"rollup-plugin-commonjs": "10.1.0",
35+
"rollup-plugin-node-resolve": "5.2.0",
36+
"rollup-plugin-sourcemaps": "0.4.2",
37+
"terser": "4.3.9",
3838
"typescript": "3.6.4"
3939
},
4040
"scripts": {

integration/bazel/yarn.lock

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
dependencies:
1111
"@microsoft/api-extractor" "^7.3.9"
1212
shelljs "0.8.2"
13-
tsickle "^0.37.0"
13+
tsickle "^0.37.1"
1414

1515
"@angular/cdk@8.0.1":
1616
version "8.0.1"
@@ -1502,7 +1502,7 @@ http-proxy@^1.13.0, http-proxy@^1.8.1:
15021502
follow-redirects "^1.0.0"
15031503
requires-port "^1.0.0"
15041504

1505-
http-server@^0.11.1:
1505+
http-server@0.11.1:
15061506
version "0.11.1"
15071507
resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
15081508
integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
@@ -2830,7 +2830,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimra
28302830
dependencies:
28312831
glob "^7.1.3"
28322832

2833-
rollup-plugin-commonjs@^10.1.0:
2833+
rollup-plugin-commonjs@10.1.0:
28342834
version "10.1.0"
28352835
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
28362836
integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
@@ -2841,7 +2841,7 @@ rollup-plugin-commonjs@^10.1.0:
28412841
resolve "^1.11.0"
28422842
rollup-pluginutils "^2.8.1"
28432843

2844-
rollup-plugin-node-resolve@^5.2.0:
2844+
rollup-plugin-node-resolve@5.2.0:
28452845
version "5.2.0"
28462846
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
28472847
integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
@@ -2852,7 +2852,7 @@ rollup-plugin-node-resolve@^5.2.0:
28522852
resolve "^1.11.1"
28532853
rollup-pluginutils "^2.8.1"
28542854

2855-
rollup-plugin-sourcemaps@^0.4.2:
2855+
rollup-plugin-sourcemaps@0.4.2:
28562856
version "0.4.2"
28572857
resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
28582858
integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
@@ -2867,7 +2867,7 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.8.1:
28672867
dependencies:
28682868
estree-walker "^0.6.1"
28692869

2870-
rollup@~1.25.0:
2870+
rollup@1.25.2:
28712871
version "1.25.2"
28722872
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
28732873
integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
@@ -3137,11 +3137,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
31373137
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
31383138
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
31393139

3140-
source-map@^0.7.3:
3141-
version "0.7.3"
3142-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
3143-
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
3144-
31453140
sourcemap-codec@^1.4.4:
31463141
version "1.4.6"
31473142
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"
@@ -3296,7 +3291,7 @@ tar@^4:
32963291
safe-buffer "^5.1.2"
32973292
yallist "^3.0.3"
32983293

3299-
terser@^4.3.9:
3294+
terser@4.3.9:
33003295
version "4.3.9"
33013296
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
33023297
integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
@@ -3362,14 +3357,10 @@ tough-cookie@~2.4.3:
33623357
psl "^1.1.24"
33633358
punycode "^1.4.1"
33643359

3365-
tsickle@^0.37.0:
3366-
version "0.37.0"
3367-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.37.0.tgz#cc8a174310ac349913c62477b346db4f342c87d1"
3368-
integrity sha512-ufUZqLUNqh+kOfr52N/hJ5JbiDO32/CO7ZCteZBX9HA2kiejwEgDaJeJe1GAj2TIu683IgTA/LPKvlns6Liw0w==
3369-
dependencies:
3370-
minimist "^1.2.0"
3371-
mkdirp "^0.5.1"
3372-
source-map "^0.7.3"
3360+
tsickle@^0.37.1:
3361+
version "0.37.1"
3362+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.37.1.tgz#2f8a87c1b15766e866457bd06fb6c0e0d84eed09"
3363+
integrity sha512-0GwgOJEnsmRsrONXCvcbAWY0CvdqF3UugPVoupUpA8Ul0qCPTuqqq0ou/hLqtKZOyyulzCP6MYRjb9/J1g9bJg==
33733364

33743365
tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
33753366
version "1.10.0"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@
2828
"zone.js": "file:../../dist/zone.js-dist/zone.js"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "^0.900.0-rc.3",
31+
"@angular-devkit/build-angular": "0.900.0-rc.3",
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",
35-
"@types/jasmine": "~3.4.0",
36-
"@types/jasminewd2": "~2.0.3",
35+
"@types/jasmine": "3.4.6",
36+
"@types/jasminewd2": "2.0.6",
3737
"@types/node": "file:../../node_modules/@types/node",
38-
"codelyzer": "^5.1.2",
39-
"jasmine-core": "~3.5.0",
40-
"jasmine-spec-reporter": "~4.2.1",
41-
"karma": "~4.3.0",
42-
"karma-chrome-launcher": "~3.1.0",
43-
"karma-coverage-istanbul-reporter": "~2.1.0",
44-
"karma-jasmine": "~2.0.1",
45-
"karma-jasmine-html-reporter": "^1.4.2",
38+
"codelyzer": "5.2.0",
39+
"jasmine-core": "3.5.0",
40+
"jasmine-spec-reporter": "4.2.1",
41+
"karma": "4.3.0",
42+
"karma-chrome-launcher": "3.1.0",
43+
"karma-coverage-istanbul-reporter": "2.1.0",
44+
"karma-jasmine": "2.0.1",
45+
"karma-jasmine-html-reporter": "1.4.2",
4646
"protractor": "file:../../node_modules/protractor",
47-
"ts-node": "~8.3.0",
48-
"tslint": "~5.18.0",
47+
"ts-node": "8.3.0",
48+
"tslint": "5.18.0",
4949
"typescript": "file:../../node_modules/typescript"
5050
}
5151
}

integration/cli-hello-world-ivy-compat/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@angular-devkit/core" "9.0.0-rc.3"
1111
rxjs "6.5.3"
1212

13-
"@angular-devkit/build-angular@^0.900.0-rc.3":
13+
"@angular-devkit/build-angular@0.900.0-rc.3":
1414
version "0.900.0-rc.3"
1515
resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.900.0-rc.3.tgz#44c963f10a90e47d6b666adc351d9ddd872dfd9c"
1616
integrity sha512-Ioz9sHHI+5Q3XrMLrPEeo7RLYGqJs+KuGE+IyFT1CUCiNH8/YZhx0x4+Z++oTpPiN/by27QjWfE61AHTRloAtA==
@@ -1053,12 +1053,12 @@
10531053
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.4.tgz#492cc70364f6dee047887b4fa2135bedd41fb143"
10541054
integrity sha512-543S+ZCJfN4jKWzRkptbJqTY2vc4h7+lPVqU2hXb1XFofDcUxNANAimdZPYaH6/yhezVAsNeujoZjAFU06bfmA==
10551055

1056-
"@types/jasmine@~3.4.0":
1056+
"@types/jasmine@3.4.6":
10571057
version "3.4.6"
10581058
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.4.6.tgz#afcb210af0fa751b85a96b2034eedada65390be1"
10591059
integrity sha512-hpQHs+lmZ0uuCrGyqypdI1Ho7jRFolOBT6OkNdZPFziLSSEKvWu+VxWU6bGdNEA/hoV4jV8pdDeNx8EWlmfNAw==
10601060

1061-
"@types/jasminewd2@~2.0.3":
1061+
"@types/jasminewd2@2.0.6":
10621062
version "2.0.6"
10631063
resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.6.tgz#2f57a8d9875a6c9ef328a14bd070ba14a055ac39"
10641064
integrity sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==
@@ -2442,7 +2442,7 @@ code-point-at@^1.0.0:
24422442
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
24432443
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
24442444

2445-
codelyzer@^5.1.2:
2445+
codelyzer@5.2.0:
24462446
version "5.2.0"
24472447
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.0.tgz#b0ee573a12779c996090e596c5c1755479d83758"
24482448
integrity sha512-izfUfhEOOgAizszPlEDxo71DK/C4wprZw0vkY6UWcOSTQvN1JyfXf9DXwaV7WX+/JC+hH0ShXfdtGLA9Rca7LA==
@@ -4787,7 +4787,7 @@ istanbul-reports@^2.2.4:
47874787
dependencies:
47884788
handlebars "^4.1.2"
47894789

4790-
jasmine-core@^3.3, jasmine-core@~3.5.0:
4790+
jasmine-core@3.5.0, jasmine-core@^3.3:
47914791
version "3.5.0"
47924792
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
47934793
integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
@@ -4797,7 +4797,7 @@ jasmine-core@~2.8.0:
47974797
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
47984798
integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
47994799

4800-
jasmine-spec-reporter@~4.2.1:
4800+
jasmine-spec-reporter@4.2.1:
48014801
version "4.2.1"
48024802
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
48034803
integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
@@ -4959,27 +4959,27 @@ jszip@^3.1.3:
49594959
pako "~1.0.2"
49604960
readable-stream "~2.0.6"
49614961

4962-
karma-chrome-launcher@~3.1.0:
4962+
karma-chrome-launcher@3.1.0:
49634963
version "3.1.0"
49644964
resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738"
49654965
integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==
49664966
dependencies:
49674967
which "^1.2.1"
49684968

4969-
karma-coverage-istanbul-reporter@~2.1.0:
4969+
karma-coverage-istanbul-reporter@2.1.0:
49704970
version "2.1.0"
49714971
resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz#5f1bcc13c5e14ee1d91821ee8946861674f54c75"
49724972
integrity sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==
49734973
dependencies:
49744974
istanbul-api "^2.1.6"
49754975
minimatch "^3.0.4"
49764976

4977-
karma-jasmine-html-reporter@^1.4.2:
4977+
karma-jasmine-html-reporter@1.4.2:
49784978
version "1.4.2"
49794979
resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz#16d100fd701271192d27fd28ddc90b710ad36fff"
49804980
integrity sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==
49814981

4982-
karma-jasmine@~2.0.1:
4982+
karma-jasmine@2.0.1:
49834983
version "2.0.1"
49844984
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
49854985
integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
@@ -4993,7 +4993,7 @@ karma-source-map-support@1.4.0:
49934993
dependencies:
49944994
source-map-support "^0.5.5"
49954995

4996-
karma@~4.3.0:
4996+
karma@4.3.0:
49974997
version "4.3.0"
49984998
resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
49994999
integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
@@ -8047,7 +8047,7 @@ trim-right@^1.0.1:
80478047
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
80488048
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
80498049

8050-
ts-node@~8.3.0:
8050+
ts-node@8.3.0:
80518051
version "8.3.0"
80528052
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
80538053
integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
@@ -8066,7 +8066,7 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
80668066
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
80678067
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
80688068

8069-
tslint@~5.18.0:
8069+
tslint@5.18.0:
80708070
version "5.18.0"
80718071
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
80728072
integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@
2727
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
2828
"@angular/router": "file:../../dist/packages-dist/router",
2929
"core-js": "file:../../node_modules/core-js",
30-
"npm-run-all": "^4.1.5",
30+
"npm-run-all": "4.1.5",
3131
"rxjs": "file:../../node_modules/rxjs",
32-
"serve": "^11.2.0",
32+
"serve": "11.2.0",
3333
"tslib": "file:../../node_modules/tslib",
3434
"zone.js": "file:../../dist/zone.js-dist/zone.js"
3535
},
3636
"devDependencies": {
37-
"@angular-devkit/build-angular": "^0.900.0-rc.3",
37+
"@angular-devkit/build-angular": "0.900.0-rc.3",
3838
"@angular/cli": "file:../../node_modules/@angular/cli",
3939
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
4040
"@angular/language-service": "file:../../dist/packages-dist/language-service",
41-
"@types/jasmine": "~3.4.0",
42-
"@types/jasminewd2": "~2.0.3",
41+
"@types/jasmine": "3.4.4",
42+
"@types/jasminewd2": "2.0.8",
4343
"@types/node": "file:../../node_modules/@types/node",
44-
"codelyzer": "^5.1.2",
45-
"jasmine-core": "~3.5.0",
46-
"jasmine-spec-reporter": "~4.2.1",
47-
"karma": "~4.3.0",
48-
"karma-chrome-launcher": "~3.1.0",
49-
"karma-coverage-istanbul-reporter": "~2.1.0",
50-
"karma-jasmine": "~2.0.1",
51-
"karma-jasmine-html-reporter": "^1.4.2",
44+
"codelyzer": "5.2.0",
45+
"jasmine-core": "3.5.0",
46+
"jasmine-spec-reporter": "4.2.1",
47+
"karma": "4.3.0",
48+
"karma-chrome-launcher": "3.1.0",
49+
"karma-coverage-istanbul-reporter": "2.1.0",
50+
"karma-jasmine": "2.0.1",
51+
"karma-jasmine-html-reporter": "1.4.2",
5252
"protractor": "file:../../node_modules/protractor",
53-
"ts-node": "~8.3.0",
54-
"tslint": "~5.18.0",
53+
"ts-node": "8.3.0",
54+
"tslint": "5.18.0",
5555
"typescript": "file:../../node_modules/typescript"
5656
}
5757
}

0 commit comments

Comments
 (0)