build: migrate more usages from @bazel/typescript to @bazel/concatjs (angular#45431)

As mentioned in previous commits (check them for more details), `@bazel/typescript`
no longer contains `ts_library`-specific code, so we no longer need that dependency.

PR Close angular#45431

Author: devversion

WORKSPACE

@@ -8,11 +8,10 @@ workspace(
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# Fetch rules_nodejs and install its dependencies so we can install our npm dependencies.
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "965ee2492a2b087cf9e0f2ca472aeaf1be2eb650e0cfbddf514b9a7d3ea4b02a",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.2.0/rules_nodejs-5.2.0.tar.gz"],
+    sha256 = "3ceb1e5b5dcad5fa2ad8870a20201cfbb9c9c63cac4055c9ab370034c765297f",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.3.0/rules_nodejs-5.3.0.tar.gz"],
 )
 
 load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")

devtools/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("//tools:defaults.bzl", "ts_config")
 
 package(default_visibility = ["//visibility:public"])
 

integration/bazel_workspace_tests/bazel_ngtsc_plugin/WORKSPACE

@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "4913ea835810c195df24d3a929315c29a64566cc48e409d8b0f35008b4e02e59",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.4/rules_nodejs-4.4.4.tar.gz"],
+    sha256 = "3ceb1e5b5dcad5fa2ad8870a20201cfbb9c9c63cac4055c9ab370034c765297f",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.3.0/rules_nodejs-5.3.0.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
@@ -20,26 +20,29 @@ http_archive(
     ],
 )
 
-# Check the bazel version and download npm dependencies
-load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
+load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
 
-# Setup the Node.js toolchain
-node_repositories(
-    # Use same node version as root angular WORKSPACE since
+build_bazel_rules_nodejs_dependencies()
+
+# Setup the Node.js toolchain.
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+
+nodejs_register_toolchains(
+    name = "nodejs",
     node_version = "16.10.0",
-    yarn_version = "1.22.11",
 )
 
-# Install our npm dependencies into @npm
+# Install our NPM dependencies
+load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
+
 yarn_install(
     name = "npm",
+    # Currently disabled due to:
+    #  1. Missing Windows support currently.
+    #  2. Incompatibilites with the `ts_library` rule.
+    exports_directories_only = False,
     frozen_lockfile = False,
     package_json = "//:package.json",
-    # Turn off symlink_node_modules here as it causes flakiness with missing
-    # files in node_modules.
-    # TODO: track down the root cause of the flakiness; current suspect is that
-    # it is an issue with managed_directories when resources are limited
-    symlink_node_modules = False,
     yarn_lock = "//:yarn.lock",
 )
 
@@ -67,4 +70,6 @@ sass_repositories()
 
 load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
 
-esbuild_repositories()
+esbuild_repositories(
+    npm_repository = "npm",
+)

integration/bazel_workspace_tests/bazel_ngtsc_plugin/package.json

@@ -4,34 +4,33 @@
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/animations": "file:../../../dist/packages-dist/animations",
     "@angular/cdk": "13.0.0",
-    "@angular/common": "file:../../dist/packages-dist/common",
-    "@angular/core": "file:../../dist/packages-dist/core",
-    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/common": "file:../../../dist/packages-dist/common",
+    "@angular/core": "file:../../../dist/packages-dist/core",
+    "@angular/forms": "file:../../../dist/packages-dist/forms",
     "@angular/material": "13.0.0",
-    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
-    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
-    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/platform-browser": "file:../../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/router": "file:../../../dist/packages-dist/router",
     "reflect-metadata": "0.1.12",
-    "rxjs": "file:../../node_modules/rxjs",
-    "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
+    "rxjs": "file:../../../node_modules/rxjs",
+    "tslib": "file:../../../node_modules/tslib",
+    "zone.js": "file:../../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
-    "@angular/bazel": "file:../../dist/packages-dist/bazel",
-    "@angular/compiler": "file:../../dist/packages-dist/compiler",
-    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/bazel": "file:../../../dist/packages-dist/bazel",
+    "@angular/compiler": "file:../../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../../dist/packages-dist/compiler-cli",
     "@babel/core": "^7.16.0",
-    "@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
-    "@bazel/concatjs": "4.4.0",
-    "@bazel/esbuild": "4.4.0",
-    "@bazel/protractor": "4.4.0",
-    "@bazel/rollup": "4.4.0",
-    "@bazel/terser": "4.4.0",
-    "@bazel/typescript": "4.4.0",
-    "@rollup/plugin-commonjs": "file:../../node_modules/@rollup/plugin-commonjs",
-    "@rollup/plugin-node-resolve": "file:../../node_modules/@rollup/plugin-node-resolve",
+    "@bazel/bazelisk": "file:../../../node_modules/@bazel/bazelisk",
+    "@bazel/concatjs": "5.3.0",
+    "@bazel/esbuild": "5.3.0",
+    "@bazel/protractor": "5.3.0",
+    "@bazel/rollup": "5.3.0",
+    "@bazel/terser": "5.3.0",
+    "@rollup/plugin-commonjs": "file:../../../node_modules/@rollup/plugin-commonjs",
+    "@rollup/plugin-node-resolve": "file:../../../node_modules/@rollup/plugin-node-resolve",
     "@types/jasmine": "2.8.8",
     "@types/node": "^12.11.1",
     "http-server": "0.12.0",
@@ -42,12 +41,12 @@
     "karma-jasmine": "2.0.1",
     "karma-requirejs": "1.1.0",
     "karma-sourcemap-loader": "0.3.7",
-    "protractor": "file:../../node_modules/protractor",
+    "protractor": "file:../../../node_modules/protractor",
     "requirejs": "2.3.6",
-    "rollup": "file:../../node_modules/rollup",
-    "rollup-plugin-sourcemaps": "file:../../node_modules/rollup-plugin-sourcemaps",
-    "terser": "file:../../node_modules/terser",
-    "typescript": "file:../../node_modules/typescript"
+    "rollup": "file:../../../node_modules/rollup",
+    "rollup-plugin-sourcemaps": "file:../../../node_modules/rollup-plugin-sourcemaps",
+    "terser": "file:../../../node_modules/terser",
+    "typescript": "file:../../../node_modules/typescript"
   },
   "scripts": {
     "test": "bazelisk build ... --noshow_progress && bazelisk test ..."

integration/bazel_workspace_tests/bazel_ngtsc_plugin/tools/BUILD.bazel

@@ -10,9 +10,9 @@ nodejs_binary(
     name = "tsc_wrapped_with_angular",
     data = [
         "@npm//@angular/compiler-cli",
-        "@npm//@bazel/typescript",
+        "@npm//@bazel/concatjs",
     ],
-    entry_point = "@npm//:node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js",
+    entry_point = "@npm//:node_modules/@bazel/concatjs/internal/tsc_wrapped/tsc_wrapped.js",
     visibility = ["//:__subpackages__"],
 )