File tree Expand file tree Collapse file tree 3 files changed +22
-3
lines changed
Expand file tree Collapse file tree 3 files changed +22
-3
lines changed Original file line number Diff line number Diff line change 2020 "stylelint" : " gulp lint" ,
2121 "e2e" : " gulp e2e" ,
2222 "deploy" : " gulp deploy:devapp" ,
23- "webdriver-manager" : " webdriver-manager" ,
2423 "docs" : " gulp docs" ,
2524 "api" : " gulp api-docs" ,
2625 "breaking-changes" : " gulp breaking-changes"
Original file line number Diff line number Diff line change @@ -72,11 +72,15 @@ MATERIAL_PACKAGES = [
7272MATERIAL_TARGETS = ["//src/lib:material" ] + ["//src/lib/%s" % p for p in MATERIAL_PACKAGES ]
7373
7474# Each individual package uses a placeholder for the version of Angular to ensure they're
75- # all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
75+ # all in-sync.
76+ ANGULAR_PACKAGE_VERSION = ">=6.0.0 <7.0.0"
77+
78+ # This map is passed to each ng_package rule to stamp out the appropriate
7679# version for the placeholders.
77- ANGULAR_PACKAGE_VERSION = ">=6.0.0-beta.0 <7.0.0"
7880VERSION_PLACEHOLDER_REPLACEMENTS = {
7981 "0.0.0-NG" : ANGULAR_PACKAGE_VERSION ,
82+ # Note that the "0.0.0-PLACEHOLDER" for the project version is automatically being replaced.
83+ # https://github.com/bazelbuild/rules_nodejs/blob/master/internal/npm_package/npm_package.bzl#L94
8084}
8185
8286# Base rollup globals for everything in the repo.
Original file line number Diff line number Diff line change @@ -11,6 +11,19 @@ function onError {
1111 echo " "
1212}
1313
14+ # Function that throws an error if the Bazel Angular version does not match the
15+ # required Angular version in the project package.json file.
16+ function checkBazelAngularVersion {
17+ requiredAngularVersion=$( node -p ' require("./package.json").requiredAngularVersion' )
18+ bazelAngularVersion=$( sed -nr ' s/ANGULAR_PACKAGE_VERSION = "(.*)"/\1/p' ./packages.bzl)
19+
20+ if [[ " ${requiredAngularVersion} " != " ${bazelAngularVersion} " ]]; then
21+ echo " ERROR: The required Angular version that has been specified in the 'package.json' file " \
22+ " does not match the given Angular version in the //:packages.bzl file."
23+ exit 1
24+ fi
25+ }
26+
1427# Setup crash trap
1528trap ' onError' ERR
1629
@@ -23,6 +36,9 @@ if [[ "$(git tag)" == "" ]]; then
2336 echo " "
2437fi
2538
39+ # Check the Bazel Angular version to be in sync with the angular version in the package.json
40+ checkBazelAngularVersion
41+
2642# Gets a human-readable name for HEAD, e.g. "6.0.0-rc.0-15-g846ddfa"
2743git_version_raw=$( git describe --abbrev=7 --tags HEAD)
2844
You can’t perform that action at this time.
0 commit comments