Skip to content

Commit e884c59

Browse files
authored
Revert "build: sync bazel angular version placeholder (#12635)"
This reverts commit bbd2a61.
1 parent bbd2a61 commit e884c59

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"stylelint": "gulp lint",
2121
"e2e": "gulp e2e",
2222
"deploy": "gulp deploy:devapp",
23+
"webdriver-manager": "webdriver-manager",
2324
"docs": "gulp docs",
2425
"api": "gulp api-docs",
2526
"breaking-changes": "gulp breaking-changes"

packages.bzl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,11 @@ 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.
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
75+
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
7976
# version for the placeholders.
77+
ANGULAR_PACKAGE_VERSION = ">=6.0.0-beta.0 <7.0.0"
8078
VERSION_PLACEHOLDER_REPLACEMENTS = {
8179
"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
8480
}
8581

8682
# Base rollup globals for everything in the repo.

tools/bazel-stamp-vars.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,6 @@ 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-
2714
# Setup crash trap
2815
trap 'onError' ERR
2916

@@ -36,9 +23,6 @@ if [[ "$(git tag)" == "" ]]; then
3623
echo ""
3724
fi
3825

39-
# Check the Bazel Angular version to be in sync with the angular version in the package.json
40-
checkBazelAngularVersion
41-
4226
# Gets a human-readable name for HEAD, e.g. "6.0.0-rc.0-15-g846ddfa"
4327
git_version_raw=$(git describe --abbrev=7 --tags HEAD)
4428

0 commit comments

Comments
 (0)