build: update bazel (angular#45431)

renovate-bot · dylhunn · commit 010a39f85600 · 2022-03-25T12:18:33.000-07:00
Update `@bazel` packages to the latest 5.x version. Some of the changes here are modeled after angular/dev-infra@40c0ac8. Co-Authored-By: George Kalpakas <kalpakas.g@gmail.com> PR Close angular#45431
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files([
@@ -56,3 +58,10 @@ config_setting(
     name = "stamp",
     values = {"stamp": "true"},
 )
+
+nodejs_binary(
+    name = "yarn_vendored",
+    data = [".yarn/releases/yarn-1.22.17.cjs"],
+    entry_point = ".yarn/releases/yarn-1.22.17.cjs",
+    visibility = ["//integration:__subpackages__"],
+)
diff --git a/WORKSPACE b/WORKSPACE
@@ -8,13 +8,17 @@ workspace(
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# Fetch rules_nodejs so we can install our npm dependencies
+# Fetch rules_nodejs and install its dependencies so we can install our npm dependencies.
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "2644a66772938db8d8c760334a252f1687455daa7e188073f2d46283f2f6fbb7",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.6.2/rules_nodejs-4.6.2.tar.gz"],
+    sha256 = "965ee2492a2b087cf9e0f2ca472aeaf1be2eb650e0cfbddf514b9a7d3ea4b02a",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.2.0/rules_nodejs-5.2.0.tar.gz"],
 )
 
+load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
+
+build_bazel_rules_nodejs_dependencies()
+
 # The PKG rules are needed to build tar packages for integration tests. The builtin
 # rule in `@bazel_tools` is not Windows compatible and outdated.
 http_archive(
@@ -34,35 +38,61 @@ http_archive(
     url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v0.5.0.tar.gz",
 )
 
-# Check the rules_nodejs version and download npm dependencies
-# Note: bazel (version 2 and after) will check the .bazelversion file so we don't need to
-# assert on that.
-load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
+# Setup the Node.js toolchain.
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
-check_rules_nodejs_version(minimum_version_string = "2.2.0")
-
-# Setup the Node.js toolchain
-node_repositories(
+nodejs_register_toolchains(
+    name = "nodejs",
     node_version = "16.10.0",
-    package_json = ["//:package.json"],
 )
 
+# Download npm dependencies.
+load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
 load("//integration:npm_package_archives.bzl", "npm_package_archives")
 
 yarn_install(
     name = "npm",
-    # Note that we add the postinstall script here so that the dependencies are re-installed
+    # Note that we add the postinstall scripts here so that the dependencies are re-installed
     # when the postinstall patches are modified.
-    data = ["//tools:postinstall-patches.js"],
+    data = [
+        "//:.yarn/releases/yarn-1.22.17.cjs",
+        "//:.yarnrc",
+        "//:scripts/puppeteer-chromedriver-versions.js",
+        "//:scripts/webdriver-manager-update.js",
+        "//tools:postinstall-patches.js",
+    ],
+    # Currently disabled due to:
+    #  1. Missing Windows support currently.
+    #  2. Incompatibilites with the `ts_library` rule.
+    exports_directories_only = False,
     manual_build_file_contents = npm_package_archives(),
     package_json = "//:package.json",
+    # We prefer to symlink the `node_modules` to only maintain a single install.
+    # See https://github.com/angular/dev-infra/pull/446#issuecomment-1059820287 for details.
+    symlink_node_modules = True,
+    yarn = "//:.yarn/releases/yarn-1.22.17.cjs",
     yarn_lock = "//:yarn.lock",
 )
 
 yarn_install(
     name = "aio_npm",
+    # Note that we add the postinstall scripts here so that the dependencies are re-installed
+    # when the postinstall patches are modified.
+    data = [
+        "//:.yarn/releases/yarn-1.22.17.cjs",
+        "//:.yarnrc",
+        "//aio:tools/cli-patches/patch.js",
+    ],
+    # Currently disabled due to:
+    #  1. Missing Windows support currently.
+    #  2. Incompatibilites with the `ts_library` rule.
+    exports_directories_only = False,
     manual_build_file_contents = npm_package_archives(),
     package_json = "//aio:package.json",
+    # We prefer to symlink the `node_modules` to only maintain a single install.
+    # See https://github.com/angular/dev-infra/pull/446#issuecomment-1059820287 for details.
+    symlink_node_modules = True,
+    yarn = "//:.yarn/releases/yarn-1.22.17.cjs",
     yarn_lock = "//aio:yarn.lock",
 )
 
@@ -86,7 +116,9 @@ browser_repositories()
 
 load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
 
-esbuild_repositories()
+esbuild_repositories(
+    npm_repository = "npm",
+)
 
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
diff --git a/devtools/tools/esbuild/index.bzl b/devtools/tools/esbuild/index.bzl
@@ -23,9 +23,14 @@ def _linker_mapping_impl(ctx):
             sources = depset(ctx.files.srcs),
         ),
         LinkerPackageMappingInfo(
-            mappings = {
-                ctx.attr.module_name: "%s/%s" % (ctx.label.package, ctx.attr.subpath),
-            },
+            mappings = depset([
+                struct(
+                    package_name = ctx.attr.module_name,
+                    package_path = "",
+                    link_path = "%s/%s" % (ctx.label.package, ctx.attr.subpath),
+                ),
+            ]),
+            node_modules_roots = depset([]),
         ),
     ]
 
diff --git a/integration/bazel_workspace_tests/bazel_ngtsc_plugin/test/BUILD.bazel b/integration/bazel_workspace_tests/bazel_ngtsc_plugin/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/integration/bazel_workspace_tests/bazel_ngtsc_plugin/test/e2e/BUILD.bazel b/integration/bazel_workspace_tests/bazel_ngtsc_plugin/test/e2e/BUILD.bazel
@@ -1,5 +1,5 @@
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "e2e",
diff --git a/integration/bazel_workspace_tests/bazel_ngtsc_plugin/tools/ng_ts_library.bzl b/integration/bazel_workspace_tests/bazel_ngtsc_plugin/tools/ng_ts_library.bzl
@@ -1,6 +1,6 @@
 "Shows how to enable both worker mode and use_angular_plugin to make a drop-in replacement for ng_module"
 
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 
 def ng_ts_library(**kwargs):
     angular_assets = kwargs.pop("assets", []) + kwargs.pop("angular_assets", [])
diff --git a/integration/index.bzl b/integration/index.bzl
@@ -41,12 +41,6 @@ def _ng_integration_test(name, setup_chromium = False, **kwargs):
     track_payload_size = kwargs.pop("track_payload_size", None)
     data = kwargs.pop("data", [])
 
-    data += [
-        # The Yarn files also need to be part of the integration test as runfiles
-        # because the `yarn_bin` target is not a self-contained standalone binary.
-        "@nodejs//:yarn_files",
-    ]
-
     if setup_chromium:
         data += ["@npm//@angular/dev-infra-private/bazel/browsers/chromium"]
         toolchains += ["@npm//@angular/dev-infra-private/bazel/browsers/chromium:toolchain_alias"]
@@ -110,8 +104,8 @@ def _ng_integration_test(name, setup_chromium = False, **kwargs):
         environment = environment,
         toolchains = toolchains,
         tool_mappings = {
-            "@nodejs//:yarn_bin": "yarn",
-            "@nodejs//:node_bin": "node",
+            "//:yarn_vendored": "yarn",
+            "@nodejs_toolchains//:resolved_toolchain": "node",
         },
         # 15-minute timeout
         timeout = "long",
diff --git a/package.json b/package.json
@@ -65,14 +65,14 @@
     "@babel/template": "7.16.7",
     "@babel/traverse": "7.17.3",
     "@babel/types": "7.17.0",
-    "@bazel/concatjs": "4.6.0",
-    "@bazel/esbuild": "4.6.0",
-    "@bazel/jasmine": "4.6.0",
-    "@bazel/protractor": "4.6.0",
-    "@bazel/rollup": "4.6.0",
-    "@bazel/runfiles": "4.6.0",
-    "@bazel/terser": "4.6.0",
-    "@bazel/typescript": "4.6.0",
+    "@bazel/concatjs": "5.2.0",
+    "@bazel/esbuild": "5.2.0",
+    "@bazel/jasmine": "5.2.0",
+    "@bazel/protractor": "5.2.0",
+    "@bazel/rollup": "5.2.0",
+    "@bazel/runfiles": "5.2.0",
+    "@bazel/terser": "5.2.0",
+    "@bazel/typescript": "5.2.0",
     "@microsoft/api-extractor": "7.19.4",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^21.0.0",
@@ -179,7 +179,7 @@
   "devDependencies": {
     "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#5a82e6017227f7017c76c8117bcbf975e19ef894",
     "@bazel/bazelisk": "^1.7.5",
-    "@bazel/buildifier": "^4.0.1",
+    "@bazel/buildifier": "^5.0.0",
     "@bazel/ibazel": "^0.15.8",
     "@octokit/graphql": "^4.6.1",
     "@types/browser-sync": "^2.26.1",
diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl
@@ -2,13 +2,13 @@
 """
 
 load(
-    # Replaced with "//@bazel/typescript/internal:..." in published package
-    "@npm//@bazel/typescript/internal:build_defs.bzl",
+    # Replaced with "//@bazel/concatjs/internal:..." in published package
+    "@npm//@bazel/concatjs/internal:build_defs.bzl",
     _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig",
 )
 load(
-    # Replaced with "//@bazel/typescript/internal:..." in published package
-    "@npm//@bazel/typescript/internal:common/compilation.bzl",
+    # Replaced with "//@bazel/concatjs/internal:..." in published package
+    "@npm//@bazel/concatjs/internal:common/compilation.bzl",
     _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES",
     _COMMON_OUTPUTS = "COMMON_OUTPUTS",
     _DEPS_ASPECTS = "DEPS_ASPECTS",
@@ -25,10 +25,13 @@ load(
     _LinkablePackageInfo = "LinkablePackageInfo",
     _NpmPackageInfo = "NpmPackageInfo",
     _js_ecma_script_module_info = "js_ecma_script_module_info",
-    _js_module_info = "js_module_info",
     _js_named_module_info = "js_named_module_info",
     _node_modules_aspect = "node_modules_aspect",
 )
+load(
+    "@rules_nodejs//nodejs:providers.bzl",
+    _js_module_info = "js_module_info",
+)
 
 LinkablePackageInfo = _LinkablePackageInfo
 NpmPackageInfo = _NpmPackageInfo
diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
 # BEGIN-DEV-ONLY
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 # END-DEV-ONLY
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
@@ -13,14 +13,15 @@ It packages your library following the Angular Package Format, see the
 specification of this format at https://goo.gl/jB3GVv
 """
 
-load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "JSEcmaScriptModuleInfo", "NodeContextInfo", "NpmPackageInfo", "node_modules_aspect")
+load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "JSEcmaScriptModuleInfo", "NpmPackageInfo", "node_modules_aspect")
 load("@build_bazel_rules_nodejs//internal/linker:link_node_modules.bzl", "LinkerPackageMappingInfo")
 load(
     "@build_bazel_rules_nodejs//internal/pkg_npm:pkg_npm.bzl",
     "PKG_NPM_ATTRS",
     "PKG_NPM_OUTPUTS",
     "create_package",
 )
+load("@rules_nodejs//nodejs:providers.bzl", "StampSettingInfo")
 load("//packages/bazel/src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
 load("//packages/bazel/src/ng_module:partial_compilation.bzl", "partial_compilation_transition")
 
@@ -159,7 +160,7 @@ def _write_rollup_config(
     externals = WELL_KNOWN_EXTERNALS + ctx.attr.externals
 
     # Whether the --stamp flag is applied in the context of the action's execution.
-    stamp = ctx.attr.node_context_data[NodeContextInfo].stamp
+    stamp = ctx.attr.stamp[StampSettingInfo].value
 
     # Pass external & globals through a templated config file because on Windows there is
     # an argument limit and we there might be a lot of globals which need to be passed to
@@ -212,7 +213,7 @@ def _run_rollup(ctx, bundle_name, rollup_config, entry_point, inputs, js_output,
     args.add("--silent")
 
     # Whether the --stamp flag is applied in the context of the action's execution.
-    stamp = ctx.attr.node_context_data[NodeContextInfo].stamp
+    stamp = ctx.attr.stamp[StampSettingInfo].value
 
     other_inputs = [rollup_config]
     if ctx.file.license_banner:
@@ -531,6 +532,10 @@ def _ng_package_impl(ctx):
         [],
         [npm_package_directory] + ctx.files.nested_packages,
     )
+
+    # Empty depset. Since these are immutable we don't need to multiple new instances.
+    empty_depset = depset([])
+
     return [
         DefaultInfo(files = depset([package_dir])),
         # We disable propagation of the `link_node_modules` aspect. We do not want
@@ -540,7 +545,7 @@ def _ng_package_impl(ctx):
         # conflicts if tests rely on both a `ng_package` and a transitive dep target of it.
         # More details: https://github.com/bazelbuild/rules_nodejs/issues/2941.
         # TODO(devversion): Consider supporting the `package_name` attribute.
-        LinkerPackageMappingInfo(mappings = {}),
+        LinkerPackageMappingInfo(mappings = empty_depset, node_modules_roots = empty_depset),
     ]
 
 _NG_PACKAGE_DEPS_ASPECTS = [ng_package_module_mappings_aspect, node_modules_aspect]
@@ -612,6 +617,7 @@ ng_package = rule(
     implementation = _ng_package_impl,
     attrs = _NG_PACKAGE_ATTRS,
     outputs = _ng_package_outputs,
+    toolchains = ["@rules_nodejs//nodejs:toolchain_type"],
 )
 """
 ng_package produces an npm-ready package from an Angular library.
diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel
@@ -1,6 +1,6 @@
 # BEGIN-DEV-ONLY
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 
 ts_library(
     name = "ngc_lib",
diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel
@@ -32,7 +32,7 @@ jasmine_node_test(
         "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
         "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
         "//packages/private/testing",
-        "@npm//@bazel/typescript/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
+        "@npm//@bazel/concatjs/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
     ],
 )
 
diff --git a/packages/zone.js/lib/BUILD.bazel b/packages/zone.js/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/concatjs:index.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -3,10 +3,9 @@
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _pkg_npm = "pkg_npm")
 load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test")
-load("@npm//@bazel/concatjs:index.bzl", _concatjs_devserver = "concatjs_devserver")
+load("@npm//@bazel/concatjs:index.bzl", _concatjs_devserver = "concatjs_devserver", _ts_config = "ts_config", _ts_library = "ts_library")
 load("@npm//@bazel/rollup:index.bzl", _rollup_bundle = "rollup_bundle")
 load("@npm//@bazel/terser:index.bzl", "terser_minified")
-load("@npm//@bazel/typescript:index.bzl", _ts_config = "ts_config", _ts_library = "ts_library")
 load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
 load("@npm//typescript:index.bzl", "tsc")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@npm//@bazel/typescript:index.bzl", "ts_library")`
	`1`	`+load("@npm//@bazel/concatjs:index.bzl", "ts_library")`
`2`	`2`
`3`	`3`	`package(default_visibility = ["//visibility:public"])`
`4`	`4`