From 4ee354da9921959e8eda91a5aaf59c4ffff2daf7 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 25 Oct 2019 01:13:43 -0700 Subject: [PATCH] build: switch to @build_bazel_rules_nodejs//:index.bzl load point (#33433) The defs.bzl load point will be removed for the rules_nodejs 1.0 release. PR Close #33433 --- WORKSPACE | 2 +- integration/bazel/WORKSPACE | 2 +- integration/bazel/src/BUILD.bazel | 2 +- packages/bazel/src/BUILD.bazel | 2 +- packages/bazel/src/api-extractor/BUILD.bazel | 2 +- packages/bazel/src/builders/files/WORKSPACE.template | 2 +- packages/bazel/src/ng_package/BUILD.bazel | 2 +- packages/bazel/src/ngc-wrapped/BUILD.bazel | 2 +- packages/compiler-cli/integrationtest/BUILD.bazel | 2 +- packages/zone.js/BUILD.bazel | 2 +- tools/brotli-cli/BUILD.bazel | 2 +- tools/defaults.bzl | 2 +- tools/ng_benchmark.bzl | 2 +- tools/size-tracking/index.bzl | 2 +- tools/symbol-extractor/index.bzl | 2 +- tools/ts-api-guardian/BUILD.bazel | 2 +- tools/ts-api-guardian/index.bzl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index bc5b1bba7c..15e6436758 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -26,7 +26,7 @@ http_archive( ) # Check the bazel version and download npm dependencies -load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "check_rules_nodejs_version", "node_repositories", "yarn_install") +load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "check_rules_nodejs_version", "node_repositories", "yarn_install") # Bazel version must be at least the following version because: # - 0.26.0 managed_directories feature added which is required for nodejs rules 0.30.0 diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index b9359027e0..7182ac2670 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -21,7 +21,7 @@ http_archive( ) # Check the bazel version and download npm dependencies -load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") +load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repositories", "yarn_install") # Bazel version must be at least the following version because: # - 0.26.0 managed_directories feature added which is required for nodejs rules 0.30.0 diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index 4ba1bf0d46..f0c9f5cce4 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "ng_module") -load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle") +load("@build_bazel_rules_nodejs//:index.bzl", "rollup_bundle") load("@npm//http-server:index.bzl", "http_server") load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package") load("@npm_bazel_typescript//:index.bzl", "ts_devserver") diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel index 16121e38c6..f661f8a17c 100644 --- a/packages/bazel/src/BUILD.bazel +++ b/packages/bazel/src/BUILD.bazel @@ -8,7 +8,7 @@ filegroup( # For generating skydoc exports_files(glob(["*.bzl"])) -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") nodejs_binary( name = "rollup_with_build_optimizer", diff --git a/packages/bazel/src/api-extractor/BUILD.bazel b/packages/bazel/src/api-extractor/BUILD.bazel index 2cb8db7836..29a694b794 100644 --- a/packages/bazel/src/api-extractor/BUILD.bazel +++ b/packages/bazel/src/api-extractor/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//packages:__subpackages__"]) -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") # BEGIN-DEV-ONLY load("//tools:defaults.bzl", "ts_library") diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template index bedf14e2e2..4c50186337 100644 --- a/packages/bazel/src/builders/files/WORKSPACE.template +++ b/packages/bazel/src/builders/files/WORKSPACE.template @@ -36,7 +36,7 @@ http_archive( #################################### # Load and install our dependencies downloaded above. -load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", +load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repositories", "yarn_install") check_bazel_version( message = """ diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel index 48a1cc03af..c2e931be78 100644 --- a/packages/bazel/src/ng_package/BUILD.bazel +++ b/packages/bazel/src/ng_package/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") # BEGIN-DEV-ONLY load("@npm_bazel_typescript//:index.bzl", "ts_library") diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel index 280a40634b..f9088bcb44 100644 --- a/packages/bazel/src/ngc-wrapped/BUILD.bazel +++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") load("@npm_bazel_typescript//:index.bzl", "ts_library") ts_library( diff --git a/packages/compiler-cli/integrationtest/BUILD.bazel b/packages/compiler-cli/integrationtest/BUILD.bazel index 4cfbe197d4..aeade7be60 100644 --- a/packages/compiler-cli/integrationtest/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/BUILD.bazel @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_test") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test") load("//tools:defaults.bzl", "nodejs_binary") nodejs_binary( diff --git a/packages/zone.js/BUILD.bazel b/packages/zone.js/BUILD.bazel index 7cbb572215..45916e46a5 100644 --- a/packages/zone.js/BUILD.bazel +++ b/packages/zone.js/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package") +load("@build_bazel_rules_nodejs//:index.bzl", "npm_package") load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES") exports_files([ diff --git a/tools/brotli-cli/BUILD.bazel b/tools/brotli-cli/BUILD.bazel index c5938cb1c6..4a0ecc6f93 100644 --- a/tools/brotli-cli/BUILD.bazel +++ b/tools/brotli-cli/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") nodejs_binary( name = "brotli-cli", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 8012abef68..08c078de62 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -1,6 +1,6 @@ """Re-export of some bazel rules with repository-wide defaults.""" -load("@build_bazel_rules_nodejs//:defs.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package", _rollup_bundle = "rollup_bundle") +load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package", _rollup_bundle = "rollup_bundle") load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test") load("@npm_bazel_karma//:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite", _ts_web_test = "ts_web_test", _ts_web_test_suite = "ts_web_test_suite") load("@npm_bazel_typescript//:index.bzl", _ts_library = "ts_library") diff --git a/tools/ng_benchmark.bzl b/tools/ng_benchmark.bzl index 3b5be5f3c2..925e6e8812 100644 --- a/tools/ng_benchmark.bzl +++ b/tools/ng_benchmark.bzl @@ -4,7 +4,7 @@ # found in the LICENSE file at https://angular.io/license """Bazel macro for running Angular benchmarks""" -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") def ng_benchmark(name, bundle): """ diff --git a/tools/size-tracking/index.bzl b/tools/size-tracking/index.bzl index 5a9e485fd1..409fc0a974 100644 --- a/tools/size-tracking/index.bzl +++ b/tools/size-tracking/index.bzl @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.io/license -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "nodejs_test") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") """ Macro that can be used to track the size of a given input file by inspecting diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl index a795bffd9b..8c0a04cb72 100644 --- a/tools/symbol-extractor/index.bzl +++ b/tools/symbol-extractor/index.bzl @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.io/license -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "nodejs_test") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") """ This test verifies that a set of top level symbols from a javascript file match a gold file. diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index 42daf3eeee..746712514b 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -1,5 +1,5 @@ # BEGIN-INTERNAL -load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package") +load("@build_bazel_rules_nodejs//:index.bzl", "npm_package") load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test") load("@npm_bazel_typescript//:index.bzl", "ts_library") diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl index 1dd7950a8f..c1ffb5d7dd 100644 --- a/tools/ts-api-guardian/index.bzl +++ b/tools/ts-api-guardian/index.bzl @@ -15,7 +15,7 @@ """Runs ts_api_guardian """ -load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "nodejs_test") +load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor"]