Skip to content

Commit 3ffaa1a

Browse files
devversionmmalerba
authored andcommitted
build: deduplicate node dependencies
Deduplicates some node dependencies by cleaning up the Yarn lock file so that dependencies can be deduplicated and merged together (to a version that satisfies multiple ranges).
1 parent 9a9607f commit 3ffaa1a

File tree

4 files changed

+1974
-2888
lines changed

4 files changed

+1974
-2888
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ var_2: &docker-firefox-image circleci/node:14.16.1-browsers
1313
# **Note**: When updating the beginning of the cache key, also update the cache key to match
1414
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
1515
# Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
16-
var_3: &cache_key v7-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
16+
var_3: &cache_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
1717
# We want to invalidate the cache if the postinstall patches change. In order to apply new
1818
# patches, a clean version of the node modules is needed. Additionally, we invalidate the cache
1919
# if the Bazel version changes. We do this because otherwise the `bazelisk` cache folder will
2020
# contain all previously used versions and ultimately cause the cache restoring to be slower.
21-
var_4: &cache_fallback_key v7-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
21+
var_4: &cache_fallback_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
2222

2323
# Settings common to each job
2424
var_5: &job_defaults

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
},
5656
"version": "12.2.0-next.0",
5757
"dependencies": {
58-
"@angular/animations": "^12.1.2",
59-
"@angular/common": "^12.1.2",
60-
"@angular/compiler": "^12.1.2",
61-
"@angular/core": "^12.1.2",
62-
"@angular/forms": "^12.1.2",
63-
"@angular/platform-browser": "^12.1.2",
58+
"@angular/animations": "12.1.2",
59+
"@angular/common": "12.1.2",
60+
"@angular/compiler": "12.1.2",
61+
"@angular/core": "12.1.2",
62+
"@angular/forms": "12.1.2",
63+
"@angular/platform-browser": "12.1.2",
6464
"@types/googlemaps": "^3.43.1",
6565
"@types/youtube": "^0.0.42",
6666
"core-js-bundle": "^3.8.2",
@@ -72,16 +72,16 @@
7272
"zone.js": "~0.11.3"
7373
},
7474
"devDependencies": {
75-
"@angular-devkit/build-optimizer": "^0.1201.0",
76-
"@angular-devkit/core": "^12.1.2",
77-
"@angular-devkit/schematics": "^12.1.2",
75+
"@angular-devkit/build-optimizer": "0.1201.0",
76+
"@angular-devkit/core": "12.1.2",
77+
"@angular-devkit/schematics": "12.1.2",
7878
"@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
79-
"@angular/compiler-cli": "^12.1.2",
79+
"@angular/compiler-cli": "12.1.2",
8080
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0057daca63205a10c26256b6733b02af835497c0",
81-
"@angular/localize": "^12.1.2",
82-
"@angular/platform-browser-dynamic": "^12.1.2",
83-
"@angular/platform-server": "^12.1.2",
84-
"@angular/router": "^12.1.2",
81+
"@angular/localize": "12.1.2",
82+
"@angular/platform-browser-dynamic": "12.1.2",
83+
"@angular/platform-server": "12.1.2",
84+
"@angular/router": "12.1.2",
8585
"@axe-core/webdriverjs": "^4.1.0",
8686
"@babel/core": "^7.13.10",
8787
"@babel/traverse": "^7.13.0",
@@ -146,7 +146,7 @@
146146
"@octokit/rest": "18.6.7",
147147
"@rollup/plugin-babel": "^5.3.0",
148148
"@rollup/plugin-commonjs": "^18.0.0",
149-
"@schematics/angular": "^12.1.2",
149+
"@schematics/angular": "12.1.2",
150150
"@types/browser-sync": "^2.26.1",
151151
"@types/fs-extra": "^9.0.5",
152152
"@types/glob": "^7.1.3",

tools/gulp/tasks/unit-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ task('test:single-run', series(':test:build', done => {
5151
} else {
5252
// Immediately exit the process if Karma reported errors, because due to
5353
// potential still running tunnel-browsers gulp won't exit properly.
54-
done(`Karma exited with code ${exitCode}.`);
54+
done(new Error(`Karma exited with code ${exitCode}.`));
5555
process.exit(exitCode);
5656
}
5757
}).start();

0 commit comments

Comments
 (0)