Skip to content

Commit bbd2a61

Browse files
devversionmmalerba
authored andcommitted
build: sync bazel angular version placeholder (#12635)
* Updates the Bazel Angular version that will be replaced within the `npm_package` rule to the required Angular version that has been changed with #12089. * Removes an unused NPM script * Adds a small check to the Bazel workspace status script that ensures that both Angular versions are in sync.
1 parent 411fce3 commit bbd2a61

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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"

packages.bzl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,15 @@ MATERIAL_PACKAGES = [
7272
MATERIAL_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"
7880
VERSION_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.

tools/bazel-stamp-vars.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff 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
1528
trap 'onError' ERR
1629

@@ -23,6 +36,9 @@ if [[ "$(git tag)" == "" ]]; then
2336
echo ""
2437
fi
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"
2743
git_version_raw=$(git describe --abbrev=7 --tags HEAD)
2844

0 commit comments

Comments
 (0)