diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index bfa0da546d3..50614852d01 100644 --- 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 index 98baece26dd..3ff9e17f346 100644 --- 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 index 29d4abd251b..87d901080ac 100644 --- 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 index 74641191f65..f27e4b549c4 100644 --- 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 index 1bf90e401b5..ccb13822888 100644 --- 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 index 2087283b333..b1a44588d88 100644 --- 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 index 8ab91c05004..9b211555734 100644 --- 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 deleted file mode 100644 index d17572ea074..00000000000 --- a/packages/service-worker/tsconfig-test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../tsconfig-test.json", - "compilerOptions": { - "types": ["node", "jasmine"] - } -} \ No newline at end of file diff --git a/packages/service-worker/worker/BUILD.bazel b/packages/service-worker/worker/BUILD.bazel index 7efdd89faca..ca955f19958 100644 --- 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 index 08834e5d009..4df3eee69d5 100644 --- 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 index 890ae330152..349856e189f 100644 --- 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 index 682ae8bca88..5bf0498bfd8 100644 --- 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,