From f8d062b4f5dd39ed1a07772e2929681b4c6ef645 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Thu, 9 May 2019 09:03:35 -0700 Subject: [PATCH] Update to bazel 0.26.0-rc5 and new syntax --- WORKSPACE | 15 ++++++- e2e/bazel_bin/.bazelrc | 5 +++ e2e/bazel_bin/WORKSPACE | 5 ++- e2e/define_var/.bazelrc | 5 +++ e2e/define_var/WORKSPACE | 5 ++- e2e/jasmine/.bazelrc | 5 +++ e2e/jasmine/WORKSPACE | 5 ++- e2e/karma/WORKSPACE | 5 ++- e2e/karma_stack_trace/WORKSPACE | 5 ++- e2e/karma_typescript/WORKSPACE | 5 ++- e2e/ts_auto_deps/.bazelrc | 5 +++ e2e/ts_auto_deps/WORKSPACE | 13 +++--- e2e/ts_devserver/.bazelrc | 5 +++ e2e/ts_devserver/WORKSPACE | 13 +++--- e2e/ts_library/.bazelrc | 5 +++ e2e/ts_library/WORKSPACE | 34 +++++++------- e2e/tsconfig_extends/WORKSPACE | 5 ++- e2e/typescript_2.7/.bazelrc | 5 +++ e2e/typescript_2.7/WORKSPACE | 5 ++- e2e/typescript_2.8/.bazelrc | 5 +++ e2e/typescript_2.8/WORKSPACE | 5 ++- e2e/typescript_2.9/.bazelrc | 5 +++ e2e/typescript_2.9/WORKSPACE | 5 ++- e2e/typescript_3.0/.bazelrc | 5 +++ e2e/typescript_3.0/WORKSPACE | 5 ++- e2e/typescript_3.1/.bazelrc | 5 +++ e2e/typescript_3.1/WORKSPACE | 5 ++- e2e/webpack/WORKSPACE | 5 ++- examples/app/.bazelrc | 5 +++ examples/app/WORKSPACE | 27 ++++++++---- examples/bazel_managed_deps/.bazelrc | 5 +++ examples/bazel_managed_deps/WORKSPACE | 19 +++++++- examples/parcel/.bazelrc | 5 +++ examples/parcel/WORKSPACE | 19 +++++++- examples/program/.bazelrc | 5 +++ examples/program/BUILD.bazel | 2 +- examples/program/WORKSPACE | 15 +------ examples/protocol_buffers/WORKSPACE | 13 +++--- examples/vendored_node/.bazelrc | 5 +++ examples/vendored_node/WORKSPACE | 19 +++++++- examples/web_testing/WORKSPACE | 5 ++- examples/webapp/.bazelrc | 5 +++ examples/webapp/WORKSPACE | 19 +++++++- internal/e2e/bazel_workspaces_compat/.bazelrc | 5 +++ .../e2e/bazel_workspaces_compat/WORKSPACE | 5 ++- internal/e2e/fine_grained_symlinks/.bazelrc | 5 +++ internal/e2e/fine_grained_symlinks/WORKSPACE | 6 ++- .../node_loader_no_preserve_symlinks/.bazelrc | 5 +++ .../WORKSPACE | 7 ++- .../node_loader_preserve_symlinks/.bazelrc | 5 +++ .../node_loader_preserve_symlinks/WORKSPACE | 7 ++- internal/e2e/packages/.bazelrc | 5 +++ package.json | 2 +- packages/jasmine/.bazelrc | 5 +++ packages/jasmine/WORKSPACE | 19 +++++++- packages/karma/WORKSPACE | 5 ++- packages/labs/.bazelrc | 5 +++ packages/labs/WORKSPACE | 19 +++++++- packages/typescript/.bazelrc | 5 +++ packages/typescript/WORKSPACE | 24 +++++++++- yarn.lock | 44 +++++++++---------- 61 files changed, 428 insertions(+), 113 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 469b56b570..fa5f69d1be 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -12,7 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "build_bazel_rules_nodejs") +workspace( + name = "build_bazel_rules_nodejs", + managed_directories = { + "@build_bazel_rules_nodejs_npm_install_deps": ["internal/npm_install/node_modules"], + "@build_bazel_rules_nodejs_rollup_deps": ["internal/rollup/node_modules"], + "@build_bazel_rules_nodejs_web_package_deps": ["internal/web_package/node_modules"], + "@fine_grained_deps_npm": ["internal/e2e/fine_grained_deps/npm/node_modules"], + "@fine_grained_deps_yarn": ["internal/e2e/fine_grained_deps/yarn/node_modules"], + "@fine_grained_no_bin": ["internal/e2e/fine_grained_no_bin/node_modules"], + "@history-server_runtime_deps": ["internal/history-server/node_modules"], + "@http-server_runtime_deps": ["internal/http-server/node_modules"], + "@npm": ["node_modules"], + }, +) load("//:package.bzl", "rules_nodejs_dev_dependencies") diff --git a/e2e/bazel_bin/.bazelrc b/e2e/bazel_bin/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/bazel_bin/.bazelrc +++ b/e2e/bazel_bin/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/bazel_bin/WORKSPACE b/e2e/bazel_bin/WORKSPACE index 17aa58a35b..2e2bf0b266 100644 --- a/e2e/bazel_bin/WORKSPACE +++ b/e2e/bazel_bin/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_bazel_bin") +workspace( + name = "e2e_bazel_bin", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/define_var/.bazelrc b/e2e/define_var/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/define_var/.bazelrc +++ b/e2e/define_var/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/define_var/WORKSPACE b/e2e/define_var/WORKSPACE index b9e04773e9..87ed32ec0e 100644 --- a/e2e/define_var/WORKSPACE +++ b/e2e/define_var/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_define_var") +workspace( + name = "e2e_define_var", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/jasmine/.bazelrc b/e2e/jasmine/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/jasmine/.bazelrc +++ b/e2e/jasmine/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/jasmine/WORKSPACE b/e2e/jasmine/WORKSPACE index c76dfe84fb..3e0ba567da 100644 --- a/e2e/jasmine/WORKSPACE +++ b/e2e/jasmine/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_jasmine") +workspace( + name = "e2e_jasmine", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/karma/WORKSPACE b/e2e/karma/WORKSPACE index a75edd966f..7ca75a4c86 100644 --- a/e2e/karma/WORKSPACE +++ b/e2e/karma/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_karma") +workspace( + name = "e2e_karma", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/karma_stack_trace/WORKSPACE b/e2e/karma_stack_trace/WORKSPACE index bedafc7e13..f70dd8e59c 100644 --- a/e2e/karma_stack_trace/WORKSPACE +++ b/e2e/karma_stack_trace/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_karma_stack_trace") +workspace( + name = "e2e_karma_stack_trace", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/karma_typescript/WORKSPACE b/e2e/karma_typescript/WORKSPACE index 9144a666ae..58117207db 100644 --- a/e2e/karma_typescript/WORKSPACE +++ b/e2e/karma_typescript/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_karma_typescript") +workspace( + name = "e2e_karma_typescript", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/ts_auto_deps/.bazelrc b/e2e/ts_auto_deps/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/ts_auto_deps/.bazelrc +++ b/e2e/ts_auto_deps/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/ts_auto_deps/WORKSPACE b/e2e/ts_auto_deps/WORKSPACE index 6f866a6714..362d2fed31 100644 --- a/e2e/ts_auto_deps/WORKSPACE +++ b/e2e/ts_auto_deps/WORKSPACE @@ -12,20 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_ts_auto_deps") +workspace( + name = "e2e_ts_auto_deps", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", path = "../../dist/build_bazel_rules_nodejs/release", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") - -# This test depend on there being a user node_modules folder -# TODO(gregmagolan): remove this once yarn_install sets up the user's node_modules folder -node_repositories( - package_json = ["//:package.json"], -) +load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") yarn_install( name = "npm", diff --git a/e2e/ts_devserver/.bazelrc b/e2e/ts_devserver/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/ts_devserver/.bazelrc +++ b/e2e/ts_devserver/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/ts_devserver/WORKSPACE b/e2e/ts_devserver/WORKSPACE index 84e2c97f09..6b4eb5a560 100644 --- a/e2e/ts_devserver/WORKSPACE +++ b/e2e/ts_devserver/WORKSPACE @@ -12,20 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_ts_devserver") +workspace( + name = "e2e_ts_devserver", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", path = "../../dist/build_bazel_rules_nodejs/release", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") - -# This test depend on there being a user node_modules folder -# TODO(gregmagolan): remove this once yarn_install sets up the user's node_modules folder -node_repositories( - package_json = ["//:package.json"], -) +load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") yarn_install( name = "npm", diff --git a/e2e/ts_library/.bazelrc b/e2e/ts_library/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/ts_library/.bazelrc +++ b/e2e/ts_library/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/ts_library/WORKSPACE b/e2e/ts_library/WORKSPACE index 307c9c052b..503c271f9a 100644 --- a/e2e/ts_library/WORKSPACE +++ b/e2e/ts_library/WORKSPACE @@ -1,25 +1,29 @@ -workspace(name = "e2e_ts_library") +# Copyright 2017 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "e2e_ts_library", + managed_directories = {"@npm": ["node_modules"]}, +) -# In your code, you'd fetch this repository with an `http_archive` call. -# We do this local repository only because this example lives in the same -# repository with the rules_nodejs code and we want to test them together. local_repository( name = "build_bazel_rules_nodejs", path = "../../dist/build_bazel_rules_nodejs/release", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") - -# This test depend on there being a user node_modules folder -# TODO(gregmagolan): remove this once yarn_install sets up the user's node_modules folder -node_repositories( - package_json = ["//:package.json"], -) +load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") -# This runs yarn install, then our generate_build_file.js to create BUILD files -# inside the resulting node_modules directory. -# The name "npm" here means the resulting modules are referenced like -# @npm//jasmine yarn_install( name = "npm", package_json = "//:package.json", diff --git a/e2e/tsconfig_extends/WORKSPACE b/e2e/tsconfig_extends/WORKSPACE index 027cba44aa..5b5e69a8a4 100644 --- a/e2e/tsconfig_extends/WORKSPACE +++ b/e2e/tsconfig_extends/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_tsconfig_extends") +workspace( + name = "e2e_tsconfig_extends", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/typescript_2.7/.bazelrc b/e2e/typescript_2.7/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/typescript_2.7/.bazelrc +++ b/e2e/typescript_2.7/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/typescript_2.7/WORKSPACE b/e2e/typescript_2.7/WORKSPACE index f58b52bd18..1b924f64fe 100644 --- a/e2e/typescript_2.7/WORKSPACE +++ b/e2e/typescript_2.7/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_typescript_2_7") +workspace( + name = "e2e_typescript_2_7", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/typescript_2.8/.bazelrc b/e2e/typescript_2.8/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/typescript_2.8/.bazelrc +++ b/e2e/typescript_2.8/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/typescript_2.8/WORKSPACE b/e2e/typescript_2.8/WORKSPACE index e3bcd87125..3fc4ec41a3 100644 --- a/e2e/typescript_2.8/WORKSPACE +++ b/e2e/typescript_2.8/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_typescript_2_8") +workspace( + name = "e2e_typescript_2_8", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/typescript_2.9/.bazelrc b/e2e/typescript_2.9/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/typescript_2.9/.bazelrc +++ b/e2e/typescript_2.9/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/typescript_2.9/WORKSPACE b/e2e/typescript_2.9/WORKSPACE index 287455900a..a827513853 100644 --- a/e2e/typescript_2.9/WORKSPACE +++ b/e2e/typescript_2.9/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_typescript_2_9") +workspace( + name = "e2e_typescript_2_9", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/typescript_3.0/.bazelrc b/e2e/typescript_3.0/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/typescript_3.0/.bazelrc +++ b/e2e/typescript_3.0/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/typescript_3.0/WORKSPACE b/e2e/typescript_3.0/WORKSPACE index 97b7d50d7b..87324ab909 100644 --- a/e2e/typescript_3.0/WORKSPACE +++ b/e2e/typescript_3.0/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_typescript_3_0") +workspace( + name = "e2e_typescript_3_0", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/typescript_3.1/.bazelrc b/e2e/typescript_3.1/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/e2e/typescript_3.1/.bazelrc +++ b/e2e/typescript_3.1/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/e2e/typescript_3.1/WORKSPACE b/e2e/typescript_3.1/WORKSPACE index 2e630b780a..619fc4691f 100644 --- a/e2e/typescript_3.1/WORKSPACE +++ b/e2e/typescript_3.1/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_typescript_3_1") +workspace( + name = "e2e_typescript_3_1", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/e2e/webpack/WORKSPACE b/e2e/webpack/WORKSPACE index 3cb0381a1a..3a7f7ea252 100644 --- a/e2e/webpack/WORKSPACE +++ b/e2e/webpack/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "e2e_webpack") +workspace( + name = "e2e_webpack", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/examples/app/.bazelrc b/examples/app/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/app/.bazelrc +++ b/examples/app/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/app/WORKSPACE b/examples/app/WORKSPACE index 94576429c5..14674ff068 100644 --- a/examples/app/WORKSPACE +++ b/examples/app/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "examples_app") +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "examples_app", + managed_directories = {"@npm": ["node_modules"]}, +) # In your code, you'd fetch this repository with an `http_archive` call. # We do this local repository only because this example lives in the same @@ -8,13 +25,7 @@ local_repository( path = "../../dist/build_bazel_rules_nodejs/release", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") - -# The tests in this example depend on there being a user node_modules folder -# TODO(gregmagolan): remove this once yarn_install sets up the user's node_modules folder -node_repositories( - package_json = ["//:package.json"], -) +load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") # This runs yarn install, then our generate_build_file.js to create BUILD files # inside the resulting node_modules directory. diff --git a/examples/bazel_managed_deps/.bazelrc b/examples/bazel_managed_deps/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/bazel_managed_deps/.bazelrc +++ b/examples/bazel_managed_deps/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/bazel_managed_deps/WORKSPACE b/examples/bazel_managed_deps/WORKSPACE index dea97f427a..4046eb718e 100644 --- a/examples/bazel_managed_deps/WORKSPACE +++ b/examples/bazel_managed_deps/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "examples_bazel_managed_deps") +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "examples_bazel_managed_deps", + managed_directories = {"@npm": ["node_modules"]}, +) # In your code, you'd fetch this repository with an `http_archive` call. # We do this local repository only because this example lives in the same diff --git a/examples/parcel/.bazelrc b/examples/parcel/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/parcel/.bazelrc +++ b/examples/parcel/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/parcel/WORKSPACE b/examples/parcel/WORKSPACE index 49616a6b00..d4b470336f 100644 --- a/examples/parcel/WORKSPACE +++ b/examples/parcel/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "examples_parcel") +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "examples_parcel", + managed_directories = {"@npm": ["node_modules"]}, +) # In your code, you'd fetch this repository with an `http_archive` call. # We do this local repository only because this example lives in the same diff --git a/examples/program/.bazelrc b/examples/program/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/program/.bazelrc +++ b/examples/program/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/program/BUILD.bazel b/examples/program/BUILD.bazel index 4ad335fafe..e1ad440dbf 100644 --- a/examples/program/BUILD.bazel +++ b/examples/program/BUILD.bazel @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "nodejs_binary") -load("@build_bazel_rules_nodejs//:internal/common/typescript_mock_lib.bzl", "mock_typescript_lib") +load("@build_bazel_rules_nodejs//internal/common:typescript_mock_lib.bzl", "mock_typescript_lib") # Make the jasmine library available at runtime by exposing our node_modules # directory. diff --git a/examples/program/WORKSPACE b/examples/program/WORKSPACE index d064d6b556..379abed16f 100644 --- a/examples/program/WORKSPACE +++ b/examples/program/WORKSPACE @@ -10,17 +10,4 @@ local_repository( load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") -# Install a hermetic version of node. -# After this is run, these labels will be available: -# - NodeJS: -# @nodejs//:node -# - NPM: -# @nodejs//:npm -# - The yarn package manager: -# @nodejs//:yarn -# -# To install the node_modules of all the listed package_json files run: -# bazel run @nodejs//:yarn -# or -# bazel run @nodejs//:npm -node_repositories(package_json = ["//:package.json"]) +node_repositories() diff --git a/examples/protocol_buffers/WORKSPACE b/examples/protocol_buffers/WORKSPACE index ac03f02186..ef2b8d3f80 100644 --- a/examples/protocol_buffers/WORKSPACE +++ b/examples/protocol_buffers/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "examples_protocol_buffers") +workspace( + name = "examples_protocol_buffers", + managed_directories = {"@npm": ["node_modules"]}, +) load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") @@ -27,13 +30,7 @@ http_archive( urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.4/rules_go-0.18.4.tar.gz"], ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install") - -# The tests in this example depend on there being a user node_modules folder -# TODO(gregmagolan): remove this once yarn_install sets up the user's node_modules folder -node_repositories( - package_json = ["//:package.json"], -) +load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install") # This runs yarn install, then our generate_build_file.js to create BUILD files # inside the resulting node_modules directory. diff --git a/examples/vendored_node/.bazelrc b/examples/vendored_node/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/vendored_node/.bazelrc +++ b/examples/vendored_node/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/vendored_node/WORKSPACE b/examples/vendored_node/WORKSPACE index 7b70881abf..593b1bcf44 100644 --- a/examples/vendored_node/WORKSPACE +++ b/examples/vendored_node/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "examples_vendored_node") +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "examples_vendored_node", + managed_directories = {"@npm": ["node_modules"]}, +) # In your code, you'd fetch this repository with an `http_archive` call. # We do this local repository only because this example lives in the same diff --git a/examples/web_testing/WORKSPACE b/examples/web_testing/WORKSPACE index d9ed20aa72..747745f8d7 100644 --- a/examples/web_testing/WORKSPACE +++ b/examples/web_testing/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "examples_webtesting") +workspace( + name = "examples_webtesting", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/examples/webapp/.bazelrc b/examples/webapp/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/examples/webapp/.bazelrc +++ b/examples/webapp/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/examples/webapp/WORKSPACE b/examples/webapp/WORKSPACE index 74a16aa1e5..9fcde9f9f8 100644 --- a/examples/webapp/WORKSPACE +++ b/examples/webapp/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "examples_webapp") +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "examples_webapp", + managed_directories = {"@npm": ["node_modules"]}, +) # In your code, you'd fetch this repository with an `http_archive` call. # We do this local repository only because this example lives in the same diff --git a/internal/e2e/bazel_workspaces_compat/.bazelrc b/internal/e2e/bazel_workspaces_compat/.bazelrc index c51937165c..4a42176786 100644 --- a/internal/e2e/bazel_workspaces_compat/.bazelrc +++ b/internal/e2e/bazel_workspaces_compat/.bazelrc @@ -3,3 +3,8 @@ test --test_output=errors # Enable debugging tests with --config=debug test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates diff --git a/internal/e2e/bazel_workspaces_compat/WORKSPACE b/internal/e2e/bazel_workspaces_compat/WORKSPACE index 9372ae8a48..ddc886596d 100644 --- a/internal/e2e/bazel_workspaces_compat/WORKSPACE +++ b/internal/e2e/bazel_workspaces_compat/WORKSPACE @@ -1,4 +1,7 @@ -workspace(name = "bazel_workspaces_compat") +workspace( + name = "bazel_workspaces_compat", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/internal/e2e/fine_grained_symlinks/.bazelrc b/internal/e2e/fine_grained_symlinks/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/internal/e2e/fine_grained_symlinks/.bazelrc +++ b/internal/e2e/fine_grained_symlinks/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/internal/e2e/fine_grained_symlinks/WORKSPACE b/internal/e2e/fine_grained_symlinks/WORKSPACE index 42f44e3514..0dd5fa8390 100644 --- a/internal/e2e/fine_grained_symlinks/WORKSPACE +++ b/internal/e2e/fine_grained_symlinks/WORKSPACE @@ -1,4 +1,7 @@ -workspace(name = "fine_grained_symlinks") +workspace( + name = "fine_grained_symlinks", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", @@ -12,7 +15,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install" # https://github.com/bazelbuild/rules_nodejs/issues/428 node_repositories( node_version = "10.3.0", - package_json = ["//:package.json"], yarn_version = "1.9.2", ) diff --git a/internal/e2e/node_loader_no_preserve_symlinks/.bazelrc b/internal/e2e/node_loader_no_preserve_symlinks/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/internal/e2e/node_loader_no_preserve_symlinks/.bazelrc +++ b/internal/e2e/node_loader_no_preserve_symlinks/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE b/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE index 752af09d9f..16f83075cb 100644 --- a/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE +++ b/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE @@ -1,4 +1,9 @@ -workspace(name = "node_loader_e2e_no_preserve_symlinks") +workspace( + name = "node_loader_e2e_no_preserve_symlinks", + managed_directories = { + "@node_loader_e2e_no_preserve_symlinks_deps": ["deps/node_modules"], + }, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/internal/e2e/node_loader_preserve_symlinks/.bazelrc b/internal/e2e/node_loader_preserve_symlinks/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/internal/e2e/node_loader_preserve_symlinks/.bazelrc +++ b/internal/e2e/node_loader_preserve_symlinks/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/internal/e2e/node_loader_preserve_symlinks/WORKSPACE b/internal/e2e/node_loader_preserve_symlinks/WORKSPACE index b55731a7ad..4adc1aa75c 100644 --- a/internal/e2e/node_loader_preserve_symlinks/WORKSPACE +++ b/internal/e2e/node_loader_preserve_symlinks/WORKSPACE @@ -1,4 +1,9 @@ -workspace(name = "node_loader_e2e_preserve_symlinks") +workspace( + name = "node_loader_e2e_preserve_symlinks", + managed_directories = { + "@node_loader_e2e_preserve_symlinks_deps": ["deps/node_modules"], + }, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/internal/e2e/packages/.bazelrc b/internal/e2e/packages/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/internal/e2e/packages/.bazelrc +++ b/internal/e2e/packages/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/package.json b/package.json index b00b4fcf57..47d746eb9a 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "homepage": "https://github.com/bazelbuild/rules_nodejs", "license": "Apache-2.0", "devDependencies": { - "@bazel/bazel": "0.24.1", + "@bazel/bazel": "0.26.0-rc5", "@bazel/buildifier": "0.22.0", "@bazel/ibazel": "0.10.1", "@zeit/ncc": "0.18.1", diff --git a/packages/jasmine/.bazelrc b/packages/jasmine/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/packages/jasmine/.bazelrc +++ b/packages/jasmine/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/packages/jasmine/WORKSPACE b/packages/jasmine/WORKSPACE index cb16e3af50..c0b48da76d 100644 --- a/packages/jasmine/WORKSPACE +++ b/packages/jasmine/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "npm_bazel_jasmine") +# Copyright 2018 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "npm_bazel_jasmine", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/packages/karma/WORKSPACE b/packages/karma/WORKSPACE index 33207cc457..85d7ac36e6 100644 --- a/packages/karma/WORKSPACE +++ b/packages/karma/WORKSPACE @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "npm_bazel_karma") +workspace( + name = "npm_bazel_karma", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/packages/labs/.bazelrc b/packages/labs/.bazelrc index dd936be1ad..4b453d7f17 100644 --- a/packages/labs/.bazelrc +++ b/packages/labs/.bazelrc @@ -10,3 +10,8 @@ test --nolegacy_external_runfiles # Faster TypeScript compiles build --strategy=TypeScriptCompile=worker + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/packages/labs/WORKSPACE b/packages/labs/WORKSPACE index 4afaecced2..895a62b515 100644 --- a/packages/labs/WORKSPACE +++ b/packages/labs/WORKSPACE @@ -1,4 +1,21 @@ -workspace(name = "npm_bazel_labs") +# Copyright 2017 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "npm_bazel_labs", + managed_directories = {"@npm": ["node_modules"]}, +) local_repository( name = "build_bazel_rules_nodejs", diff --git a/packages/typescript/.bazelrc b/packages/typescript/.bazelrc index 7aae185e56..51f6fea849 100644 --- a/packages/typescript/.bazelrc +++ b/packages/typescript/.bazelrc @@ -7,3 +7,8 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test # Turn off legacy external runfiles run --nolegacy_external_runfiles test --nolegacy_external_runfiles + +# Turn on managed_directories +build --experimental_allow_incremental_repository_updates +test --experimental_allow_incremental_repository_updates +run --experimental_allow_incremental_repository_updates \ No newline at end of file diff --git a/packages/typescript/WORKSPACE b/packages/typescript/WORKSPACE index 2e403ef824..4464023031 100644 --- a/packages/typescript/WORKSPACE +++ b/packages/typescript/WORKSPACE @@ -1,4 +1,26 @@ -workspace(name = "npm_bazel_typescript") +# Copyright 2017 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +workspace( + name = "npm_bazel_typescript", + managed_directories = { + "@build_bazel_rules_typescript_devserver_deps": ["internal/devserver/node_modules"], + "@build_bazel_rules_typescript_protobufs_compiletime_deps": ["internal/protobufjs/node_modules"], + "@build_bazel_rules_typescript_tsc_wrapped_deps": ["internal/tsc_wrapped/node_modules"], + "@npm": ["node_modules"], + }, +) load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") diff --git a/yarn.lock b/yarn.lock index 8134d2eaf4..7c2ac44247 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,29 +2,29 @@ # yarn lockfile v1 -"@bazel/bazel-darwin_x64@0.24.1": - version "0.24.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.1.tgz#11479d0548d83fea22e664452d3e70c5f2edf94e" - integrity sha512-EF2WlPIQeq4zhkwwSCDJncG/rA1C2xnjUynabzB04KOxEBj0lveqYLgoCvs6L3Y+1vp2TQJmKGVEG6GpYb4uUA== - -"@bazel/bazel-linux_x64@0.24.1": - version "0.24.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.1.tgz#59c61c4ed885fd7ceed1bc9d605db563a51b83bd" - integrity sha512-oFLpfUOzZK4VSOM49FMJjb5UOJ5HXpTZ+zBOVO0hfK+oAkRaRfZjQZoKm6wa67MxfvU4tP/LDWcw7uj6swaGLw== - -"@bazel/bazel-win32_x64@0.24.1": - version "0.24.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.1.tgz#ebc7b9958a5d0bb5ccca761852bcc750d07ec343" - integrity sha512-s+zFYNawvzDLnb0TBY4LmkT+8ZfjMJ6/dyVnH6w8Q24mevnJqTBflcPJUlXoLRCAtaK/S3+1KOfKPccIwDNDDg== - -"@bazel/bazel@0.24.1": - version "0.24.1" - resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.1.tgz#15380c4d5945de47c7be1e3a83e9a8d1607aa33b" - integrity sha512-iTTUqdI2dX4S+fQOGbhr84jRRv9FbYr8GX3L69Z/HurgcDrgErOKo1LGtOuSYqZYaEvQ+ZpV0aP7OzaUsv59WA== +"@bazel/bazel-darwin_x64@0.26.0-rc5": + version "0.26.0-rc5" + resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.26.0-rc5.tgz#237a564ee03abe16ced3622624e40fb5564a9d54" + integrity sha512-1zGZUtC2jzK0bwknMaXStMmfKul15sZ089EoaWPI596VyF3uNkcOMQWDDc5daDz3ZdxpvWYbpByInmXzWQIDzw== + +"@bazel/bazel-linux_x64@0.26.0-rc5": + version "0.26.0-rc5" + resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.26.0-rc5.tgz#fc10602c13ca6ecb1afe76fb2f6c2773ba1204f2" + integrity sha512-HBNn4SL6zHBjA95dY/cpjnZEVB30+L2Uq4PWw48QhuQJGY/CYDwqWk2oFMUK47EEFMFh4OQfoN3q4oHKbvixdw== + +"@bazel/bazel-win32_x64@0.26.0-rc5": + version "0.26.0-rc5" + resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.26.0-rc5.tgz#05fecc69fdf36bc883e66452e01acff89356980e" + integrity sha512-DviEGJHXKlhpvnuqfT3hjyJmGhpsKykNxnZ60dDexlh0GkhIn9rN8OF3vj0EL+pRpYhiBQvcoiwQdvV2gBYbRw== + +"@bazel/bazel@0.26.0-rc5": + version "0.26.0-rc5" + resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.26.0-rc5.tgz#42b4ed498f02a426adee30583b98166611eb49e8" + integrity sha512-pZGUFXzvFUqm/hd7UmMPcCUc5CZd8dknae2pptQTpBhCFUHdsQeTr1alFKTNZPArVqAtqIUL2DS2MadKb3v31A== optionalDependencies: - "@bazel/bazel-darwin_x64" "0.24.1" - "@bazel/bazel-linux_x64" "0.24.1" - "@bazel/bazel-win32_x64" "0.24.1" + "@bazel/bazel-darwin_x64" "0.26.0-rc5" + "@bazel/bazel-linux_x64" "0.26.0-rc5" + "@bazel/bazel-win32_x64" "0.26.0-rc5" "@bazel/buildifier-darwin_x64@0.22.0": version "0.22.0"