build: prepare for compiler-cli to be using ts_project (#61237)

devversion · josephperrott · commit 1bfd7bbd1c0c · 2025-05-09T16:01:49.000Z
Prepare the compiler-cli package for being ready for migration to `ts_project`. PR Close #61237
diff --git a/WORKSPACE b/WORKSPACE
@@ -85,7 +85,7 @@ yarn_install(
         "//:tools/npm-patches/@angular+ng-dev+0.0.0-a6dcd24107d12114198251ee5d20cda814a1986a.patch",
         "//:tools/npm-patches/@bazel+jasmine+5.8.1.patch",
         "//tools:postinstall-patches.js",
-        "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-d30a56c19bafaac67cf44e605ed8c2c0e45b0a51.patch",
+        "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch",
         "//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch",
         "//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch",
         "//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch",
diff --git a/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel b/adev/shared-docs/pipeline/api-gen/extraction/BUILD.bazel
@@ -16,8 +16,6 @@ esbuild_esm_bundle(
     target = "es2022",
     deps = [
         ":extract_api_to_json_lib",
-        "@angular//packages/compiler-cli",
-        "@npm//typescript",
     ],
 )
 
@@ -44,17 +42,11 @@ ts_library(
 nodejs_binary(
     name = "extract_api_to_json",
     data = [
-        ":bin",
         "@angular//packages/compiler",
-        "@angular//packages/compiler-cli",
+        "@angular//packages/compiler-cli:npm_package",
         "@npm//typescript",
     ],
     entry_point = "bin.mjs",
-    # Note: Using the linker here as we need it for ESM. The linker is not
-    # super reliably when running concurrently on Windows- but we have existing
-    # actions using the linker. An alternative would be to:
-    #   - bundle the Angular compiler into a CommonJS bundle
-    #   - use the patched resolution- but also patch the ESM imports (similar to how FW does it).
     visibility = ["//visibility:public"],
 )
 
diff --git a/devtools/tools/esbuild/BUILD.bazel b/devtools/tools/esbuild/BUILD.bazel
@@ -8,6 +8,7 @@ js_library(
     name = "esbuild_base",
     srcs = ["esbuild-base.config.mjs"],
     deps = [
+        "//packages:package_json",
         "//packages/compiler-cli/private",
         "@npm//@angular/build-tooling/shared-scripts/angular-optimization:js_lib",
     ],
diff --git a/devtools/tools/esbuild/esbuild-base.config.mjs b/devtools/tools/esbuild/esbuild-base.config.mjs
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {createEsbuildAngularOptimizePlugin} from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs';
-import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling.js';
+import {createEsbuildAngularOptimizePlugin} from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin';
+import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling';
 
 /** Converts an object to a string dictionary. */
 function convertObjectToStringDictionary(value) {
diff --git a/integration/ng-modules-importability/BUILD.bazel b/integration/ng-modules-importability/BUILD.bazel
@@ -5,6 +5,9 @@ ts_library(
     name = "test_lib",
     testonly = True,
     srcs = glob(["*.ts"]),
+    data = [
+        "//packages:package_json",
+    ],
     deps = [
         "//packages/compiler-cli",
         "@npm//typescript",
diff --git a/integration/ng-modules-importability/index.ts b/integration/ng-modules-importability/index.ts
@@ -1,4 +1,4 @@
-import {performCompilation} from '@angular/compiler-cli';
+import {performCompilation} from '../../packages/compiler-cli';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 load("//:packages.bzl", "DOCS_ENTRYPOINTS")
 load("//adev/shared-docs/pipeline/api-gen/manifest:generate_api_manifest.bzl", "generate_api_manifest")
@@ -10,6 +11,11 @@ exports_files([
     "tsconfig.json",
 ])
 
+copy_to_bin(
+    name = "package_json",
+    srcs = ["package.json"],
+)
+
 ts_library(
     name = "types",
     srcs = glob(["*.ts"]),
diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel
@@ -29,6 +29,10 @@ nodejs_binary(
     data = [
         ":ngc_lib",
         "//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
+        # Ensure compiler-cli `ts_project` `.js` files are picked up as ESM.
+        # Notably this is temporary and compiler raw sources are not valid ESM anyway.
+        # That is because there is no explicit import extensions.
+        "//packages:package_json",
     ],
     entry_point = ":ngc-wrapped-main.ts",
     # Disables the Bazel node modules linker. The node module linker is unreliable for the
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@npm//@bazel/esbuild:index.bzl", "esbuild", "esbuild_config")
 load("//packages/bazel/src:ng_perf.bzl", "ng_perf_flag")
-load("//tools:defaults.bzl", "api_golden_test", "extract_types", "pkg_npm", "ts_config", "ts_library")
+load("//tools:defaults.bzl", "api_golden_test", "extract_types", "pkg_npm", "ts_library")
+load("//tools:defaults2.bzl", "ts_config")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -12,6 +13,25 @@ PUBLIC_TARGETS = [
     "//packages/compiler-cli/linker/babel",
 ]
 
+ts_config(
+    name = "tsconfig_build",
+    src = "tsconfig.json",
+    deps = [
+        "//:node_modules/@types/node",
+        "//packages:tsconfig_build",
+    ],
+)
+
+ts_config(
+    name = "tsconfig_test",
+    testonly = True,
+    src = "tsconfig-test.json",
+    deps = [
+        ":tsconfig_build",
+        "//:node_modules/@types/jasmine",
+    ],
+)
+
 esbuild_config(
     name = "esbuild_config",
     config_file = "esbuild.config.js",
@@ -51,12 +71,6 @@ esbuild(
     deps = PUBLIC_TARGETS,
 )
 
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig-build.json",
-    deps = ["//packages:tsconfig-build.json"],
-)
-
 ts_library(
     name = "compiler-cli",
     srcs = glob(
@@ -68,7 +82,6 @@ ts_library(
             "src/integrationtest/**/*.ts",
         ],
     ),
-    tsconfig = ":tsconfig",
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/private",
@@ -112,13 +125,17 @@ pkg_npm(
     tags = [
         "release-with-framework",
     ],
-    # Do not add more to this list.
-    # Dependencies on the full npm_package cause long re-builds.
     visibility = [
         "//adev:__pkg__",
+        "//adev/shared-docs/pipeline/api-gen:__subpackages__",
         "//integration:__subpackages__",
+        "//modules/benchmarks:__subpackages__",
+        "//modules/playground:__subpackages__",
         "//modules/ssr-benchmarks:__subpackages__",
         "//packages/compiler-cli/integrationtest:__pkg__",
+        "//packages/core/test/bundling:__subpackages__",
+        "//packages/core/test/playground/zone-signal-input:__pkg__",
+        "@npm//@angular/build-tooling/shared-scripts:__subpackages__",
     ],
     deps = [
         ":api_type_definitions",
diff --git a/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl b/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl
@@ -11,6 +11,7 @@ def partial_compliance_golden(filePath):
     data = [
         "//packages/compiler-cli/test/compliance/partial:generate_golden_partial_lib",
         "//packages/core:npm_package",
+        "//packages:package_json",
         filePath,
     ] + native.glob(["%s/*.ts" % path, "%s/**/*.html" % path, "%s/**/*.css" % path])
 
diff --git a/packages/compiler-cli/tsconfig-build.json b/packages/compiler-cli/tsconfig-build.json
diff --git a/packages/compiler-cli/tsconfig-test.json b/packages/compiler-cli/tsconfig-test.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["jasmine", "node"]
+  }
+}
diff --git a/packages/compiler-cli/tsconfig.json b/packages/compiler-cli/tsconfig.json
@@ -1,14 +1,6 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig-build.json",
   "compilerOptions": {
-    "target": "es2020",
-    "module": "es2020",
-    "lib": [
-      "es2020"
-    ],
-    "strict": true,
-    "types": [
-      "jasmine"
-    ]
+    "types": ["node"]
   }
 }
diff --git a/packages/core/test/acceptance/authoring/BUILD.bazel b/packages/core/test/acceptance/authoring/BUILD.bazel
@@ -33,7 +33,10 @@ ts_library(
 nodejs_binary(
     name = "test_compiler",
     testonly = True,
-    data = [":test_compiler_lib"],
+    data = [
+        ":test_compiler_lib",
+        "//packages:package_json",
+    ],
     entry_point = ":authoring_test_compiler.ts",
 )
 
diff --git a/packages/package.json b/packages/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -483,12 +483,17 @@ def jasmine_node_test(name, srcs = [], data = [], bootstrap = [], env = {}, **kw
         bootstrap = bootstrap,
     )
 
+    extra_data = []
+
+    if native.package_name().startswith("packages/compiler-cli"):
+        extra_data.append("//packages:package_json")
+
     _jasmine_node_test(
         name = name,
         srcs = [":%s_spec_entrypoint.spec" % name],
         # Note: `deps`, `srcs` and `bootstrap` are explicitly added here as otherwise their linker
         # mappings may not be discovered, given the `bootstrap` attr not being covered by the aspect.
-        data = data + deps + srcs + bootstrap,
+        data = extra_data + data + deps + srcs + bootstrap,
         use_direct_specs = True,
         configuration_env_vars = configuration_env_vars,
         env = env,
diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl
@@ -10,8 +10,11 @@ def ts_project(
         **kwargs):
     module_name = kwargs.pop("module_name", compute_module_name(testonly))
 
-    if tsconfig == None and native.package_name().startswith("packages"):
-        tsconfig = "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"
+    if tsconfig == None:
+        if native.package_name().startswith("packages/compiler-cli/src/ngtsc"):
+            tsconfig = "//packages/compiler-cli:tsconfig_test" if testonly else "//packages/compiler-cli:tsconfig_build"
+        elif native.package_name().startswith("packages"):
+            tsconfig = "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"
 
     _ts_project(
         name,
diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {performCompilation} from '@angular/compiler-cli';`
	`1`	`+import {performCompilation} from '../../packages/compiler-cli';`
`2`	`2`	`import * as fs from 'fs/promises';`
`3`	`3`	`import * as path from 'path';`
`4`	`4`	`import * as os from 'os';`