diff --git a/package.json b/package.json index 789170a69f6e..8113188b9d8d 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "stylelint": "gulp lint", "e2e": "gulp e2e", "deploy": "gulp deploy:devapp", + "webdriver-manager": "webdriver-manager", "docs": "gulp docs", "api": "gulp api-docs", "breaking-changes": "gulp breaking-changes" diff --git a/packages.bzl b/packages.bzl index f468b38d623e..befb5e66790f 100644 --- a/packages.bzl +++ b/packages.bzl @@ -72,15 +72,11 @@ MATERIAL_PACKAGES = [ MATERIAL_TARGETS = ["//src/lib:material"] + ["//src/lib/%s" % p for p in MATERIAL_PACKAGES] # Each individual package uses a placeholder for the version of Angular to ensure they're -# all in-sync. -ANGULAR_PACKAGE_VERSION = ">=6.0.0 <7.0.0" - -# This map is passed to each ng_package rule to stamp out the appropriate +# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate # version for the placeholders. +ANGULAR_PACKAGE_VERSION = ">=6.0.0-beta.0 <7.0.0" VERSION_PLACEHOLDER_REPLACEMENTS = { "0.0.0-NG": ANGULAR_PACKAGE_VERSION, - # Note that the "0.0.0-PLACEHOLDER" for the project version is automatically being replaced. - # https://github.com/bazelbuild/rules_nodejs/blob/master/internal/npm_package/npm_package.bzl#L94 } # Base rollup globals for everything in the repo. diff --git a/tools/bazel-stamp-vars.sh b/tools/bazel-stamp-vars.sh index 421d5cac72de..a58a9f4b989b 100755 --- a/tools/bazel-stamp-vars.sh +++ b/tools/bazel-stamp-vars.sh @@ -11,19 +11,6 @@ function onError { echo "" } -# Function that throws an error if the Bazel Angular version does not match the -# required Angular version in the project package.json file. -function checkBazelAngularVersion { - requiredAngularVersion=$(node -p 'require("./package.json").requiredAngularVersion') - bazelAngularVersion=$(sed -nr 's/ANGULAR_PACKAGE_VERSION = "(.*)"/\1/p' ./packages.bzl) - - if [[ "${requiredAngularVersion}" != "${bazelAngularVersion}" ]]; then - echo "ERROR: The required Angular version that has been specified in the 'package.json' file " \ - "does not match the given Angular version in the //:packages.bzl file." - exit 1 - fi -} - # Setup crash trap trap 'onError' ERR @@ -36,9 +23,6 @@ if [[ "$(git tag)" == "" ]]; then echo "" fi -# Check the Bazel Angular version to be in sync with the angular version in the package.json -checkBazelAngularVersion - # Gets a human-readable name for HEAD, e.g. "6.0.0-rc.0-15-g846ddfa" git_version_raw=$(git describe --abbrev=7 --tags HEAD)