Skip to content

Commit 6e4d71e

Browse files
josephperrottAndrewKushnir
authored andcommitted
build: remove ts_project_interop file (angular#63421)
Remove the ts_project_interop.bzl file that no longer does interop work PR Close angular#63421
1 parent b4ae94d commit 6e4d71e

3 files changed

Lines changed: 28 additions & 33 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"types": ["node"],
4+
"types": ["node", "jasmine"],
55
"paths": {}
66
}
77
}

tools/bazel/ts_project_interop.bzl

Lines changed: 0 additions & 29 deletions
This file was deleted.

tools/defaults.bzl

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ load("@aspect_rules_js//js:defs.bzl", _js_library = "js_library")
33
load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config")
44
load("@devinfra//bazel:extract_types.bzl", _extract_types = "extract_types")
55
load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server")
6+
load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test")
67
load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project")
8+
load("@rules_angular//src/ts_project:index.bzl", _ts_project = "ts_project")
79
load("@rules_sass//src:index.bzl", _npm_sass_library = "npm_sass_library", _sass_binary = "sass_binary", _sass_library = "sass_library")
810
load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", _generate_api_docs = "generate_api_docs")
911
load("//tools/bazel:api_golden_test.bzl", _api_golden_test = "api_golden_test", _api_golden_test_npm_package = "api_golden_test_npm_package")
@@ -12,7 +14,6 @@ load("//tools/bazel:jasmine_test.bzl", _angular_jasmine_test = "angular_jasmine_
1214
load("//tools/bazel:js_defs.bzl", _js_binary = "js_binary", _js_run_binary = "js_run_binary", _js_test = "js_test")
1315
load("//tools/bazel:npm_packages.bzl", _ng_package = "ng_package", _npm_package = "npm_package")
1416
load("//tools/bazel:protractor_test.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
15-
load("//tools/bazel:ts_project_interop.bzl", _ts_project = "ts_project")
1617
load("//tools/bazel:tsec.bzl", _tsec_test = "tsec_test")
1718
load("//tools/bazel:web_test.bzl", _ng_web_test_suite = "ng_web_test_suite", _web_test = "web_test", _zoneless_web_test_suite = "zoneless_web_test_suite")
1819
load("//tools/bazel/esbuild:zone_bundle.bzl", _zone_bundle = "zone_bundle")
@@ -86,6 +87,8 @@ def _determine_tsconfig(testonly):
8687

8788
def ts_project(
8889
name,
90+
deps = [],
91+
srcs = [],
8992
source_map = True,
9093
testonly = False,
9194
tsconfig = None,
@@ -95,30 +98,51 @@ def ts_project(
9598

9699
_ts_project(
97100
name,
101+
srcs = srcs,
102+
deps = deps,
103+
declaration = True,
98104
source_map = source_map,
99105
testonly = testonly,
100106
tsconfig = tsconfig,
101107
**kwargs
102108
)
103109

110+
strict_deps_test(
111+
name = "%s_deps" % name,
112+
srcs = srcs,
113+
tsconfig = tsconfig,
114+
deps = deps,
115+
)
116+
104117
def ng_project(
105118
name,
119+
deps = [],
120+
srcs = [],
106121
source_map = True,
107122
testonly = False,
108123
tsconfig = None,
109124
**kwargs):
110125
if tsconfig == None:
111126
tsconfig = _determine_tsconfig(testonly)
112127

113-
_ts_project(
128+
_ng_project(
114129
name,
130+
srcs = srcs,
131+
deps = deps,
132+
declaration = True,
115133
source_map = source_map,
116-
rule_impl = _ng_project,
117134
testonly = testonly,
118135
tsconfig = tsconfig,
119136
**kwargs
120137
)
121138

139+
strict_deps_test(
140+
name = "%s_deps" % name,
141+
srcs = srcs,
142+
tsconfig = tsconfig,
143+
deps = deps,
144+
)
145+
122146
def generate_api_docs(**kwargs):
123147
_generate_api_docs(
124148
# We need to specify import mappings for Angular packages that import other Angular

0 commit comments

Comments
 (0)