build: replace all ng_package with new rule from rules_angular (angular#61843)

Replaces all `ng_package` rule with the new rule from `rules_angular`.

PR Close angular#61843

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -4,6 +4,7 @@
 .npmrc=-1406867100
 .pnpmfile.cjs=-2033668682
 adev/shared-docs/pipeline/api-gen/package.json=939673974
+integration/package.json=-239561259
 modules/package.json=-1315257891
 package.json=288136953
 packages/animations/package.json=-678724831
@@ -20,7 +21,7 @@ packages/platform-browser/package.json=-1163479450
 packages/router/package.json=860819913
 packages/upgrade/package.json=16347051
 packages/zone.js/package.json=-1545343303
-pnpm-lock.yaml=481102297
-pnpm-workspace.yaml=-1489095561
+pnpm-lock.yaml=1289250097
+pnpm-workspace.yaml=1973735808
 tools/bazel/rules_angular_store/package.json=-239561259
 yarn.lock=1099737031

.bazelignore

@@ -42,6 +42,7 @@ modules/ssr-benchmarks/node_modules
 # For rules_js
 adev/shared-docs/pipeline/api-gen/node_modules
 modules/node_modules
+integration/node_modules
 packages/animations/node_modules
 packages/common/node_modules
 packages/localize/node_modules

WORKSPACE

@@ -111,6 +111,7 @@ npm_translate_lock(
         "//:package.json",
         "//:pnpm-workspace.yaml",
         "//adev/shared-docs/pipeline/api-gen:package.json",
+        "//integration:package.json",
         "//modules:package.json",
         "//packages/animations:package.json",
         "//packages/common:package.json",

adev/tools/local_deps/index.bzl

@@ -29,7 +29,7 @@ def link_local_packages(all_deps):
         pkg_name = _angular_dep_to_pkg_name(dep)
         npm_link(
             name = _npm_link_name(pkg_name),
-            target = to_package_label(pkg_name),
+            target = to_package_label(pkg_name) + "__adev_link",
             package_name = pkg_name,
             package_path = native.package_name(),
             tags = ["manual"],

integration/BUILD.bazel

@@ -0,0 +1,3 @@
+load("@npm2//:defs.bzl", "npm_link_all_packages")
+
+npm_link_all_packages()

integration/ng-modules-importability/BUILD.bazel

@@ -8,13 +8,11 @@ ts_project(
     data = [
         "//packages:package_json",
     ],
-    interop_deps = [
-        "//packages/compiler-cli",
-    ],
     tsconfig = "tsconfig.json",
     deps = [
         "//:node_modules/@types/node",
         "//:node_modules/typescript",
+        "//integration:node_modules/@angular/compiler-cli",
     ],
 )
 

integration/ng-modules-importability/index.bzl

@@ -1,5 +1,5 @@
+load("@aspect_rules_js//js:defs.bzl", "js_test")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
-load("//tools:defaults.bzl", "nodejs_test")
 
 def module_test(name, npm_packages, skipped_entry_points = [], additional_deps = [], **kwargs):
     write_file(
@@ -11,14 +11,13 @@ def module_test(name, npm_packages, skipped_entry_points = [], additional_deps =
         })],
     )
 
-    nodejs_test(
+    js_test(
         name = "test",
         data = [
             ":%s_config" % name,
-            "//integration/ng-modules-importability:test_lib",
+            "//integration/ng-modules-importability:test_lib_rjs",
         ] + additional_deps + [pkg[0] for pkg in npm_packages.items()],
         entry_point = "//integration/ng-modules-importability:index.mjs",
-        enable_linker = True,
-        templated_args = ["$(rootpath :%s_config)" % name],
+        fixed_args = ["$(rootpath :%s_config)" % name],
         **kwargs
     )

integration/ng-modules-importability/index.mts

@@ -1,4 +1,4 @@
-import {performCompilation} from '../../packages/compiler-cli/index.js';
+import {performCompilation} from '@angular/compiler-cli';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
@@ -33,6 +33,11 @@ async function main() {
   const testChunkStart = testChunkSize * testShardIndex;
   const shardExports = allExports.slice(testChunkStart, testChunkStart + testChunkSize);
 
+  // Sub-test directory where the first-party linked node modules end up being available.
+  const testDir = path.join(tmpDir, 'test');
+  await fs.mkdir(testDir);
+  await fs.mkdir(path.join(testDir, 'node_modules/@angular'), {recursive: true});
+
   const testFiles = shardExports.map((e) => ({
     content: `
       import {NgModule, Component} from '@angular/core';
@@ -46,15 +51,16 @@ async function main() {
       @Component({imports: [TestModule], template: ''})
       export class TestComponent {}
   `,
-    path: path.join(tmpDir, `${e.symbolName.toLowerCase()}.ts`),
+    path: path.join(testDir, `${e.symbolName.toLowerCase()}.ts`),
   }));
 
   // Prepare node modules to resolve e.g. `@angular/core`
-  await fs.symlink(path.resolve('./node_modules'), path.join(tmpDir, 'node_modules'));
+  await fs.symlink(path.resolve('./integration/node_modules'), path.join(tmpDir, 'node_modules'));
+
   // Prepare node modules to resolve e.g. `@angular/cdk`. This is possible
   // as we are inside the sandbox, inside our test runfiles directory.
   for (const {packagePath, name} of packages) {
-    await fs.symlink(path.resolve(packagePath), `./node_modules/${name}`);
+    await fs.symlink(path.resolve(packagePath), path.join(testDir, 'node_modules', name));
   }
 
   const diagnostics: ts.Diagnostic[] = [];

integration/ng-modules-importability/tsconfig.json

@@ -3,8 +3,8 @@
     "strict": true,
     "declaration": true,
     "sourceMap": true,
-    "module": "node16",
-    "moduleResolution": "node16",
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "types": ["node"]
   }
 }

integration/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@angular/compiler-cli": "workspace:*"
+  }
+}

packages.bzl

@@ -10,7 +10,7 @@ def to_package_label(package_name):
         return "//packages/misc/angular-in-memory-web-api:npm_package"
 
     if package_name == "@angular/docs":
-        return "//adev/shared-docs:npm_package"
+        return "//adev/shared-docs:pkg"
 
     return "//packages/{package_name}:npm_package".format(package_name = package_name.replace("@angular/", ""))
 

packages/animations/BUILD.bazel

@@ -1,5 +1,5 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
-load("//tools:defaults2.bzl", "ng_project", "npm_package")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs")
+load("//tools:defaults2.bzl", "ng_package", "ng_project", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -21,10 +21,10 @@ ng_project(
 
 ng_package(
     name = "npm_package",
-    package_name = "@angular/animations",
     srcs = [
         "package.json",
     ],
+    package = "@angular/animations",
     tags = [
         "release-with-framework",
     ],
@@ -38,9 +38,9 @@ ng_package(
         "//packages/compiler/test:__pkg__",
     ],
     deps = [
-        ":animations",
-        "//packages/animations/browser",
-        "//packages/animations/browser/testing",
+        ":animations_rjs",
+        "//packages/animations/browser:browser_rjs",
+        "//packages/animations/browser/testing:testing_rjs",
     ],
 )
 

packages/benchpress/BUILD.bazel

@@ -1,6 +1,5 @@
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
-load("//tools:defaults.bzl", "ng_package")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults2.bzl", "ng_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -32,7 +31,6 @@ ts_project(
 
 ng_package(
     name = "npm_package",
-    package_name = "@angular/benchpress",
     srcs = [
         "README.md",
         "package.json",
@@ -41,13 +39,14 @@ ng_package(
         "@angular/core",
         "reflect-metadata",
     ],
+    package = "@angular/benchpress",
     # Do not add more to this list.
     # Dependencies on the full npm_package cause long re-builds.
     visibility = [
         "//integration:__subpackages__",
         "//modules/ssr-benchmarks:__subpackages__",
     ],
     deps = [
-        ":benchpress",
+        ":benchpress_rjs",
     ],
 )

packages/common/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
 load("//packages/common/locales:index.bzl", "generate_base_currencies_file")
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
-load("//tools:defaults2.bzl", "ng_project", "npm_package")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs")
+load("//tools:defaults2.bzl", "ng_package", "ng_project", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -43,6 +43,10 @@ ng_package(
         "package.json",
     ],
     nested_packages = ["//packages/common/locales:package"],
+    package = "@angular/common",
+    replace_prefixes = {
+        "locales/package": "locales/",
+    },
     tags = [
         "release-with-framework",
     ],
@@ -62,11 +66,11 @@ ng_package(
         "//packages/language-service/test:__pkg__",
     ],
     deps = [
-        "//packages/common",
-        "//packages/common/http",
-        "//packages/common/http/testing",
-        "//packages/common/testing",
-        "//packages/common/upgrade",
+        "//packages/common:common_rjs",
+        "//packages/common/http:http_rjs",
+        "//packages/common/http/testing:testing_rjs",
+        "//packages/common/testing:testing_rjs",
+        "//packages/common/upgrade:upgrade_rjs",
     ],
 )
 

packages/compiler-cli/BUILD.bazel

@@ -142,6 +142,12 @@ pkg_npm(
     ],
 )
 
+# TODO(rules_js migration): Remove when adev uses pnpm workspaces.
+alias(
+    name = "npm_package__adev_link",
+    actual = ":npm_package",
+)
+
 # TODO(devversion): Temporary early `npm_package` for making compiler-cli usable in `rules_angular`.
 # Long-term, `pkg_npm` will be migrated to `npm_package` in general.
 npm_package(

packages/compiler-cli/src/ngtsc/testing/fake_common/BUILD.bazel

@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_package")
-load("//tools:defaults2.bzl", "ts_project")
+load("//tools:defaults2.bzl", "ng_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -19,7 +18,8 @@ ng_package(
     srcs = [
         "package.json",
     ],
+    package = "@angular/common",
     deps = [
-        ":fake_common",
+        ":fake_common_rjs",
     ],
 )

packages/compiler/BUILD.bazel

@@ -1,5 +1,5 @@
-load("//tools:defaults.bzl", "ng_package", "tsec_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("//tools:defaults.bzl", "tsec_test")
+load("//tools:defaults2.bzl", "ng_package", "npm_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -24,6 +24,7 @@ ng_package(
     srcs = [
         "package.json",
     ],
+    package = "@angular/compiler",
     side_effect_entry_points = [
         "@angular/compiler",
     ],
@@ -43,7 +44,7 @@ ng_package(
         "@npm//@angular/build-tooling/shared-scripts:__subpackages__",
     ],
     deps = [
-        ":compiler",
+        ":compiler_rjs",
     ],
 )
 

packages/core/BUILD.bazel

@@ -1,8 +1,8 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
 load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs")
 load("//packages/common/locales:index.bzl", "generate_base_locale_file")
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "tsec_test")
-load("//tools:defaults2.bzl", "ng_project", "npm_package", "ts_config")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "tsec_test")
+load("//tools:defaults2.bzl", "ng_package", "ng_project", "npm_package", "ts_config")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -68,14 +68,14 @@ tsec_test(
 
 ng_package(
     name = "npm_package",
-    package_name = "@angular/core",
     srcs = [
         "package.json",
         ":event_dispatch_contract_binary",
     ],
     nested_packages = [
         "//packages/core/schematics:npm_package",
     ],
+    package = "@angular/core",
     tags = [
         "release-with-framework",
     ],
@@ -95,12 +95,12 @@ ng_package(
         "//packages/language-service/test:__pkg__",
     ],
     deps = [
-        ":core",
-        "//packages/core/primitives/di",
-        "//packages/core/primitives/event-dispatch",
-        "//packages/core/primitives/signals",
-        "//packages/core/rxjs-interop",
-        "//packages/core/testing",
+        ":core_rjs",
+        "//packages/core/primitives/di:di_rjs",
+        "//packages/core/primitives/event-dispatch:event-dispatch_rjs",
+        "//packages/core/primitives/signals:signals_rjs",
+        "//packages/core/rxjs-interop:rxjs-interop_rjs",
+        "//packages/core/testing:testing_rjs",
     ],
 )
 

packages/elements/BUILD.bazel

@@ -1,5 +1,5 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs")
+load("//tools:defaults2.bzl", "ng_package", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -22,8 +22,8 @@ ng_project(
 
 ng_package(
     name = "npm_package",
-    package_name = "@angular/elements",
     srcs = ["package.json"],
+    package = "@angular/elements",
     tags = [
         "release-with-framework",
     ],
@@ -34,7 +34,7 @@ ng_package(
         "//modules/ssr-benchmarks:__subpackages__",
     ],
     deps = [
-        ":elements",
+        ":elements_rjs",
     ],
 )