Update bazel version to 5.3.1 This matches core stable-3.5 and requires updating bazlets to fix rules_nodejs dependencies. Change-Id: I076a0ad60c8faf81be679d69acc02e64648142c2
diff --git a/.bazelignore b/.bazelignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.bazelignore
@@ -0,0 +1 @@ +node_modules
diff --git a/.bazelrc b/.bazelrc index e2feeb4..fb8e4d1 100644 --- a/.bazelrc +++ b/.bazelrc
@@ -1,3 +1,8 @@ +build --java_language_version=11 +build --java_runtime_version=remotejdk_11 +build --tool_java_language_version=11 +build --tool_java_runtime_version=remotejdk_11 + build --workspace_status_command="python3 ./tools/workspace_status.py" build --repository_cache=~/.gerritcodereview/bazel-cache/repository build --action_env=PATH
diff --git a/.bazelversion b/.bazelversion index cf78d5b..c7cb131 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -4.2.4 +5.3.1
diff --git a/BUILD b/BUILD index 8782740..537b627 100644 --- a/BUILD +++ b/BUILD
@@ -96,10 +96,5 @@ ".js", ], ignore = ".eslintignore", - plugins = [ - "@npm//eslint-config-google", - "@npm//eslint-plugin-html", - "@npm//eslint-plugin-import", - "@npm//eslint-plugin-jsdoc", - ], + plugins = [], )
diff --git a/WORKSPACE b/WORKSPACE index 66ad7d0..ce95fe6 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -1,14 +1,11 @@ workspace( name = "task", - managed_directories = { - "@npm": ["node_modules"], - }, ) load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "cd9b114339913aad2c9981e387fd151123f40a44", + commit = "b6120a9fa50945d38f0a4d55d5879e3ec465c5e5", #local_path = "/home/<user>/projects/bazlets", ) @@ -20,12 +17,23 @@ gerrit_polymer() -load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install") +load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies") + +build_bazel_rules_nodejs_dependencies() + +load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") + +node_repositories( + node_version = "16.13.2", + yarn_version = "1.22.17", +) yarn_install( name = "npm", + exports_directories_only = False, frozen_lockfile = False, package_json = "//:package.json", + symlink_node_modules = True, yarn_lock = "//:yarn.lock", )
diff --git a/package.json b/package.json index b68f019..82c0e23 100644 --- a/package.json +++ b/package.json
@@ -3,8 +3,8 @@ "version": "3.5.0-SNAPSHOT", "description": "Task Plugin", "dependencies": { - "@bazel/rollup": "^3.4.0", - "@bazel/terser": "^3.4.0" + "@bazel/rollup": "~5.1.0", + "@bazel/terser": "~5.1.0" }, "devDependencies": { "eslint": "^7.24.0",
diff --git a/yarn.lock b/yarn.lock index 517ec53..da0237a 100644 --- a/yarn.lock +++ b/yarn.lock
@@ -23,15 +23,24 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@bazel/rollup@^3.4.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-3.5.0.tgz#3de2db08cbc62c3cffbbabaa4517ec250cf6419a" - integrity sha512-sFPqbzSbIn6h66uuZdXgK5oitSmEGtnDPfL3TwTS4ZWy75SpYvk9X1TFGlvkralEkVnFfdH15sq80/1t+YgQow== +"@bazel/rollup@~5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-5.1.0.tgz#dc858ddc93c9fdb9cc2e7982e632c939c646ebdc" + integrity sha512-wEiWdSyVbsycSirSYjR6FGfPGbRNI7sGNAYmrV0hIzYIi+KqXeTNcwKIRSE9PESP3mb0VWbZmHvXvmrWk6daPQ== + dependencies: + "@bazel/worker" "5.1.0" -"@bazel/terser@^3.4.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-3.5.0.tgz#4b1c3a3b781e65547694aa05bc600c251e4d8c0b" - integrity sha512-dpWHn1Iu+w0uA/kvPb0pP+4Io0PrVuzCCbVg2Ow4uRt/gTFKQJJWp4EiTitEZlPA2dHlW7PHThAb93lGo2c8qA== +"@bazel/terser@~5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-5.1.0.tgz#5c82b93f4d9def8103c16be2dd33900d156fa066" + integrity sha512-uE3hTqfkZr4nvlk3jwi0xx6URqqI7r6GGPtDAU02/PVei+O4PfThaov7cwHO+D1FnoLncDqChb9Iolr7Crw/8A== + +"@bazel/worker@5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.1.0.tgz#6f1e0f3ef628e3449d424cacd341c9abd09a3735" + integrity sha512-u3aU93UtHz3vL6ozezq0jnw83s1cNT4dAnW+vvB7M++YKFlB3CWzZFb0JRJbCp1b6DDe30ML0WOdd3nVYuylpw== + dependencies: + google-protobuf "^3.6.1" "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -733,6 +742,11 @@ dependencies: type-fest "^0.20.2" +google-protobuf@^3.6.1: + version "3.21.2" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.21.2.tgz#4580a2bea8bbb291ee579d1fefb14d6fa3070ea4" + integrity sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA== + has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"