build: remove rules_js migration interop files and clean up

BUILD.bazel

@@ -1,7 +1,7 @@
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "copy_to_bin")
+load("//tools:defaults.bzl", "copy_to_bin")
 
 package(default_visibility = ["//visibility:public"])
 

WORKSPACE

@@ -207,10 +207,9 @@ http_archive(
 load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
 
 rules_ts_dependencies(
-    # ts_version_from = "//:package.json",
+    ts_version_from = "//:package.json",
     # Obtained by: curl --silent https://registry.npmjs.org/typescript/5.7.2 | jq -r '.dist.integrity'
     ts_integrity = "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
-    ts_version = "5.7.2",
 )
 
 http_file(

modules/testing/builder/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 

packages/angular/build/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -72,7 +72,6 @@ ts_project(
         "//packages/angular/build:src/builders/ng-packagr/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/build",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",
@@ -158,24 +157,22 @@ ts_project(
     srcs = glob(include = ["src/builders/application/tests/**/*.ts"]),
     deps = [
         ":build",
-        "//packages/angular/build/private",
-        "//modules/testing/builder",
         ":node_modules/@angular-devkit/architect",
-        ":node_modules/@angular-devkit/core",
-
-        # Base dependencies for the application in hello-world-app.
+        ":node_modules/@angular-devkit/core",  # Base dependencies for the application in hello-world-app.
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/compiler",
         "//:node_modules/@angular/compiler-cli",
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/platform-browser",
         "//:node_modules/@angular/platform-browser-dynamic",
         "//:node_modules/@angular/router",
+        "//:node_modules/buffer",
         "//:node_modules/rxjs",
         "//:node_modules/tslib",
         "//:node_modules/typescript",
         "//:node_modules/zone.js",
-        "//:node_modules/buffer",
+        "//modules/testing/builder",
+        "//packages/angular/build/private",
     ],
 )
 
@@ -185,31 +182,27 @@ ts_project(
     srcs = glob(include = ["src/builders/dev-server/tests/**/*.ts"]),
     deps = [
         ":build",
-        "//packages/angular/build/private",
-        "//modules/testing/builder",
         ":node_modules/@angular-devkit/architect",
-        ":node_modules/@angular-devkit/core",
-
-        # dev server only test deps
-        "//:node_modules/@types/http-proxy",
-        "//:node_modules/@types/node",
-        "//:node_modules/http-proxy",
-        "//:node_modules/puppeteer",
-
-        # Base dependencies for the application in hello-world-app.
+        ":node_modules/@angular-devkit/core",  # dev server only test deps
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/compiler",
         "//:node_modules/@angular/compiler-cli",
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/platform-browser",
         "//:node_modules/@angular/platform-browser-dynamic",
         "//:node_modules/@angular/router",
+        "//:node_modules/@types/http-proxy",
+        "//:node_modules/@types/node",
+        "//:node_modules/buffer",
+        "//:node_modules/http-proxy",
         "//:node_modules/ng-packagr",
+        "//:node_modules/puppeteer",  # Base dependencies for the application in hello-world-app.
         "//:node_modules/rxjs",
         "//:node_modules/tslib",
         "//:node_modules/typescript",
         "//:node_modules/zone.js",
-        "//:node_modules/buffer",
+        "//modules/testing/builder",
+        "//packages/angular/build/private",
     ],
 )
 
@@ -219,32 +212,28 @@ ts_project(
     srcs = glob(include = ["src/builders/karma/tests/**/*.ts"]),
     deps = [
         ":build",
-        "//packages/angular/build/private",
-        "//modules/testing/builder",
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",
-        "//:node_modules/@types/node",
-
-        # karma specific test deps
-        "//:node_modules/karma-chrome-launcher",
-        "//:node_modules/karma-coverage",
-        "//:node_modules/karma-jasmine",
-        "//:node_modules/karma-jasmine-html-reporter",
-        "//:node_modules/puppeteer",
-
-        # Base dependencies for the karma in hello-world-app.
         "//:node_modules/@angular/common",
         "//:node_modules/@angular/compiler",
         "//:node_modules/@angular/compiler-cli",
         "//:node_modules/@angular/core",
         "//:node_modules/@angular/platform-browser",
         "//:node_modules/@angular/platform-browser-dynamic",
         "//:node_modules/@angular/router",
+        "//:node_modules/@types/node",  # karma specific test deps
+        "//:node_modules/buffer",
+        "//:node_modules/karma-chrome-launcher",
+        "//:node_modules/karma-coverage",
+        "//:node_modules/karma-jasmine",
+        "//:node_modules/karma-jasmine-html-reporter",
+        "//:node_modules/puppeteer",  # Base dependencies for the karma in hello-world-app.
         "//:node_modules/rxjs",
         "//:node_modules/tslib",
         "//:node_modules/typescript",
         "//:node_modules/zone.js",
-        "//:node_modules/buffer",
+        "//modules/testing/builder",
+        "//packages/angular/build/private",
     ],
 )
 

packages/angular/build/private/BUILD.bazel

@@ -1,11 +1,10 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
 ts_project(
     name = "private",
     srcs = ["index.ts"],
-    module_name = "@angular/build/private",
     deps = [
         "//packages/angular/build",
     ],

packages/angular/cli/BUILD.bazel

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.dev/license
 
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ng_cli_schema_generator.bzl", "cli_json_schema")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -43,7 +43,6 @@ ts_project(
         "//packages/angular/cli:src/commands/update/schematic/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/cli",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",

packages/angular/create/BUILD.bazel

@@ -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.dev/license
 
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "npm_package", "ts_project")
 
 licenses(["notice"])
 
@@ -22,7 +22,6 @@ ts_project(
         "src/*.ts",
     ]),
     data = RUNTIME_ASSETS,
-    module_name = "@angular/create",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular/cli:angular-cli",

packages/angular/pwa/BUILD.bazel

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.dev/license
 
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -32,7 +32,6 @@ ts_project(
         "//packages/angular/pwa:pwa/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/pwa",
     deps = [
         ":node_modules/@angular-devkit/schematics",
         ":node_modules/@schematics/angular",

packages/angular/ssr/BUILD.bazel

@@ -2,7 +2,7 @@ load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
-load("//tools:defaults2.bzl", "ng_package", "ts_project")
+load("//tools:defaults.bzl", "ng_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -26,7 +26,6 @@ ts_project(
     data = [
         "//packages/angular/ssr/third_party/beasties:beasties_bundled",
     ],
-    module_name = "@angular/ssr",
     source_map = True,
     tsconfig = "//:build-tsconfig-esm",
     deps = [

packages/angular/ssr/node/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -16,7 +16,6 @@ ts_project(
     ],
     # TODO: Fix strict_deps failure
     ignore_strict_deps = True,
-    module_name = "@angular/ssr/node",
     source_map = True,
     tsconfig = "//:build-tsconfig-esm",
     deps = [

packages/angular/ssr/node/test/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 ts_project(
     name = "unit_test_lib",

packages/angular/ssr/schematics/BUILD.bazel

@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.dev/license
 
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -57,7 +57,6 @@ ts_project(
         "//packages/angular/ssr/schematics:" + src.replace(".json", ".ts")
         for (src, _) in ALL_SCHEMA_TARGETS
     ],
-    module_name = "@angular/ssr/schematics",
     deps = [
         "//packages/angular/ssr:node_modules/@angular-devkit/schematics",
         "//packages/angular/ssr:node_modules/@schematics/angular",

packages/angular/ssr/test/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 ts_project(
     name = "unit_test_lib",

packages/angular/ssr/test/npm_package/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 ts_project(
     name = "unit_test_lib",

packages/angular_devkit/architect/BUILD.bazel

@@ -5,7 +5,7 @@
 
 load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
@@ -66,7 +66,6 @@ ts_project(
     ],
     # Ensure tests can execute the output JS, relying on schemas/JSON files.
     data = JSON_FILES,
-    module_name = "@angular-devkit/architect",
     deps = [
         ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",

packages/angular_devkit/architect/node/BUILD.bazel

@@ -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.dev/license
 
-load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
+load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 licenses(["notice"])
 
@@ -15,7 +15,6 @@ ts_project(
         include = ["**/*.ts"],
         exclude = ["**/*_spec.ts"],
     ),
-    module_name = "@angular-devkit/architect/node",
     deps = [
         "//:node_modules/@types/node",
         "//:node_modules/rxjs",

packages/angular_devkit/architect/node/test/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "test_lib",

packages/angular_devkit/architect/testing/BUILD.bazel

@@ -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.dev/license
 
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 licenses(["notice"])
 
@@ -15,7 +15,6 @@ ts_project(
         include = ["**/*.ts"],
         exclude = ["**/*_spec.ts"],
     ),
-    module_name = "@angular-devkit/architect/testing",
     deps = [
         "//:node_modules/@types/node",
         "//:node_modules/rxjs",

packages/angular_devkit/architect_cli/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -16,7 +16,6 @@ ts_project(
     srcs = [
         "bin/architect.ts",
     ] + glob(["src/**/*.ts"]),
-    module_name = "@angular-devkit/architect-cli",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",

packages/angular_devkit/build_angular/BUILD.bazel

@@ -5,7 +5,7 @@
 
 load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -127,7 +127,6 @@ ts_project(
         "//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular-devkit/build-angular",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/build-webpack",
@@ -394,9 +393,7 @@ LARGE_SPECS = {
             ":node_modules/@angular-devkit/architect",
             ":node_modules/@angular-devkit/core",
             ":node_modules/@angular-devkit/build-webpack",
-            "//modules/testing/builder",
-
-            # Base dependencies for the application in hello-world-app.
+            "//modules/testing/builder",  # Base dependencies for the application in hello-world-app.
             # Some tests also require extra dependencies.
             "//:node_modules/@angular/common",
             "//:node_modules/@angular/compiler",