build: use common macro to define tsconfig for service worker (angular#61341)

josephperrott · alxhub · commit 68d774f49d63 · 2025-05-14T10:43:25.000-07:00
Define the tsconfig for service worker instead of manually including the tsconfig on each target PR Close angular#61341
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -65,6 +65,7 @@ rules_js_tsconfig(
     deps = [
         ":tsconfig_build",
         "//:node_modules/@types/jasmine",
+        "//:node_modules/@types/node",
     ],
 )
 
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
@@ -13,15 +13,6 @@ rules_js_tsconfig(
     ],
 )
 
-rules_js_tsconfig(
-    name = "tsconfig_test",
-    src = "tsconfig-test.json",
-    deps = [
-        "//:node_modules/@types/node",
-        "//packages:tsconfig_test",
-    ],
-)
-
 ng_project(
     name = "service-worker",
     srcs = glob(
diff --git a/packages/service-worker/cli/BUILD.bazel b/packages/service-worker/cli/BUILD.bazel
@@ -8,7 +8,6 @@ ts_project(
     srcs = glob(
         ["**/*.ts"],
     ),
-    tsconfig = "//packages/service-worker:tsconfig_build",
     deps = [
         "//packages/service-worker/config:config_rjs",
     ],
diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel
@@ -7,7 +7,6 @@ ts_project(
     srcs = glob(
         ["**/*.ts"],
     ),
-    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//packages/service-worker/config:config_rjs",
         "//packages/service-worker/config/testing:testing_rjs",
diff --git a/packages/service-worker/config/testing/BUILD.bazel b/packages/service-worker/config/testing/BUILD.bazel
@@ -9,7 +9,6 @@ ts_project(
     srcs = glob([
         "*.ts",
     ]),
-    tsconfig = "//packages/service-worker:tsconfig_build",
     deps = [
         "//packages/service-worker/cli:cli_rjs",
         "//packages/service-worker/config:config_rjs",
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
@@ -13,7 +13,6 @@ ts_project(
         "//packages/service-worker",
         "//packages/service-worker/testing",
     ],
-    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//:node_modules/rxjs",
         "//packages:types_rjs",
diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel
@@ -9,7 +9,6 @@ ng_project(
     interop_deps = [
         "//packages/core",
     ],
-    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//:node_modules/rxjs",
     ],
diff --git a/packages/service-worker/tsconfig-test.json b/packages/service-worker/tsconfig-test.json
diff --git a/packages/service-worker/worker/BUILD.bazel b/packages/service-worker/worker/BUILD.bazel
@@ -14,14 +14,11 @@ ts_project(
             "main.ts",
         ],
     ),
-    tsconfig = "//packages/service-worker:tsconfig_build",
-    deps = ["//:node_modules/@types/node"],
 )
 
 ts_project(
     name = "main",
     srcs = ["main.ts"],
-    tsconfig = "//packages/service-worker:tsconfig_build",
     deps = [":worker_rjs"],
 )
 
diff --git a/packages/service-worker/worker/test/BUILD.bazel b/packages/service-worker/worker/test/BUILD.bazel
@@ -7,7 +7,6 @@ ts_project(
     srcs = glob([
         "**/*.ts",
     ]),
-    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//packages:types_rjs",
         "//packages/service-worker/config:config_rjs",
diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel
@@ -9,7 +9,6 @@ ts_project(
     interop_deps = [
         "//packages/core",
     ],
-    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//:node_modules/rxjs",
         "//:node_modules/typescript",
diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl
@@ -8,6 +8,18 @@ load("//tools/bazel:ts_project_interop.bzl", _ts_project = "ts_project")
 npm_package = _npm_package
 ts_config = _ts_config
 
+def _determine_tsconfig(testonly):
+    if native.package_name().startswith("packages/compiler-cli/src/ngtsc"):
+        return "//packages/compiler-cli:tsconfig_test" if testonly else "//packages/compiler-cli:tsconfig_build"
+
+    if native.package_name().startswith("packages/service-worker"):
+        return "//packages:tsconfig_test" if testonly else "//packages/service-worker:tsconfig_build"
+
+    if native.package_name().startswith("packages"):
+        return "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"
+
+    fail("Failing... a tsconfig value must be provided.")
+
 def ts_project(
         name,
         source_map = True,
@@ -17,10 +29,7 @@ def ts_project(
     module_name = kwargs.pop("module_name", compute_module_name(testonly))
 
     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"
+        tsconfig = _determine_tsconfig(testonly)
 
     _ts_project(
         name,
@@ -39,8 +48,9 @@ def ng_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:
+        tsconfig = _determine_tsconfig(testonly)
+
     _ts_project(
         name,
         source_map = source_map,

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ rules_js_tsconfig(`
`65`	`65`	`deps = [`
`66`	`66`	`":tsconfig_build",`
`67`	`67`	`"//:node_modules/@types/jasmine",`
	`68`	`+ "//:node_modules/@types/node",`
`68`	`69`	`],`
`69`	`70`	`)`
`70`	`71`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,11 @@ ts_project(`
`14`	`14`	`"main.ts",`
`15`	`15`	`],`
`16`	`16`	`),`
`17`		`- tsconfig = "//packages/service-worker:tsconfig_build",`
`18`		`- deps = ["//:node_modules/@types/node"],`
`19`	`17`	`)`
`20`	`18`
`21`	`19`	`ts_project(`
`22`	`20`	`name = "main",`
`23`	`21`	`srcs = ["main.ts"],`
`24`		`- tsconfig = "//packages/service-worker:tsconfig_build",`
`25`	`22`	`deps = [":worker_rjs"],`
`26`	`23`	`)`
`27`	`24`