mirror of
https://github.com/angular/angular
synced 2026-05-24 09:28:37 +00:00
build: use common macro to define tsconfig for service worker (#61341)
Define the tsconfig for service worker instead of manually including the tsconfig on each target PR Close #61341
This commit is contained in:
parent
a4e3c12965
commit
dfd068da9f
12 changed files with 17 additions and 31 deletions
|
|
@ -65,6 +65,7 @@ rules_js_tsconfig(
|
|||
deps = [
|
||||
":tsconfig_build",
|
||||
"//:node_modules/@types/jasmine",
|
||||
"//:node_modules/@types/node",
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ ts_project(
|
|||
srcs = glob(
|
||||
["**/*.ts"],
|
||||
),
|
||||
tsconfig = "//packages/service-worker:tsconfig_build",
|
||||
deps = [
|
||||
"//packages/service-worker/config:config_rjs",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ ng_project(
|
|||
interop_deps = [
|
||||
"//packages/core",
|
||||
],
|
||||
tsconfig = "//packages/service-worker:tsconfig_test",
|
||||
deps = [
|
||||
"//:node_modules/rxjs",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"extends": "../tsconfig-test.json",
|
||||
"compilerOptions": {
|
||||
"types": ["node", "jasmine"]
|
||||
}
|
||||
}
|
||||
|
|
@ -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"],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ ts_project(
|
|||
interop_deps = [
|
||||
"//packages/core",
|
||||
],
|
||||
tsconfig = "//packages/service-worker:tsconfig_test",
|
||||
deps = [
|
||||
"//:node_modules/rxjs",
|
||||
"//:node_modules/typescript",
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue