Skip to content

build: never use interop targets for ts compilations #29290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2025
Merged

build: never use interop targets for ts compilations #29290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/angular/build/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ ts_project(
"builders.json",
"package.json",
],
interop_deps = [
"//packages/angular/ssr",
"//packages/angular/ssr/node",
"//packages/angular_devkit/architect",
],
module_name = "@angular/build",
deps = [
"//:root_modules/@ampproject/remapping",
Expand Down Expand Up @@ -101,6 +96,9 @@ ts_project(
"//:root_modules/typescript",
"//:root_modules/vite",
"//:root_modules/watchpack",
"//packages/angular/ssr:ssr_rjs",
"//packages/angular/ssr/node:node_rjs",
"//packages/angular_devkit/architect:architect_rjs",
],
)

Expand Down
14 changes: 5 additions & 9 deletions packages/angular/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ ts_project(
) + [
"//packages/angular/cli:lib/config/schema.json",
],
interop_deps = [
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics/tasks",
"//packages/angular_devkit/schematics/tools",
],
module_name = "@angular/cli",
deps = [
"//:root_modules/@angular/core",
Expand All @@ -71,6 +66,9 @@ ts_project(
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/angular_devkit/schematics:schematics_rjs",
"//packages/angular_devkit/schematics/tasks:tasks_rjs",
"//packages/angular_devkit/schematics/tools:tools_rjs",
],
)

Expand Down Expand Up @@ -138,15 +136,13 @@ ts_project(
"node_modules/**",
],
),
interop_deps = [
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics/testing",
],
deps = [
":angular-cli_rjs",
"//:root_modules/@types/semver",
"//:root_modules/@types/yargs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/schematics:schematics_rjs",
"//packages/angular_devkit/schematics/testing:testing_rjs",
],
)

Expand Down
8 changes: 2 additions & 6 deletions packages/angular/pwa/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ ts_project(
"pwa/files/**/*",
],
),
interop_deps = [
"//packages/angular_devkit/schematics",
],
module_name = "@angular/pwa",
deps = [
"//:root_modules/@types/node",
"//:root_modules/parse5-html-rewriting-stream",
"//packages/angular_devkit/schematics:schematics_rjs",
"//packages/schematics/angular:angular_rjs",
],
)
Expand All @@ -46,12 +44,10 @@ ts_project(
name = "pwa_test_lib",
testonly = True,
srcs = glob(["pwa/**/*_spec.ts"]),
interop_deps = [
"//packages/angular_devkit/schematics/testing",
],
deps = [
":pwa_rjs",
"//:root_modules/@types/jasmine",
"//packages/angular_devkit/schematics/testing:testing_rjs",
],
)

Expand Down
10 changes: 3 additions & 7 deletions packages/angular_devkit/architect/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,29 +64,25 @@ ts_project(
"node_modules/**",
],
),
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
module_name = "@angular-devkit/architect",
deps = [
"//:root_modules/@types/node",
"//:root_modules/rxjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

ts_project(
name = "architect_test_lib",
testonly = True,
srcs = glob(["src/**/*_spec.ts"]),
interop_deps = [
"//packages/angular_devkit/core",
],
deps = [
":architect_rjs",
"//:root_modules/@types/jasmine",
"//:root_modules/rxjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
],
)

Expand Down
10 changes: 3 additions & 7 deletions packages/angular_devkit/architect/node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ ts_project(
include = ["**/*.ts"],
exclude = ["**/*_spec.ts"],
),
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
module_name = "@angular-devkit/architect/node",
deps = [
"//:root_modules/@types/node",
"//:root_modules/rxjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

Expand All @@ -36,14 +34,12 @@ ts_project(
"**/*_spec.ts",
],
),
interop_deps = [
"//tests/angular_devkit/architect/node/jobs:jobs_test_lib",
],
deps = [
":node_rjs",
"//:root_modules/@types/jasmine",
"//:root_modules/rxjs",
"//packages/angular_devkit/architect:architect_rjs",
"//tests/angular_devkit/architect/node/jobs:jobs_test_lib_rjs",
],
)

Expand Down
8 changes: 3 additions & 5 deletions packages/angular_devkit/architect/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ ts_project(
include = ["**/*.ts"],
exclude = ["**/*_spec.ts"],
),
interop_deps = [
"//packages/angular_devkit/architect",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
module_name = "@angular-devkit/architect/testing",
deps = [
"//:root_modules/@types/node",
"//:root_modules/rxjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)
6 changes: 2 additions & 4 deletions packages/angular_devkit/architect_cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ ts_project(
srcs = [
"bin/architect.ts",
] + glob(["src/**/*.ts"]),
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
module_name = "@angular-devkit/architect-cli",
deps = [
"//:root_modules/@types/node",
Expand All @@ -26,6 +22,8 @@ ts_project(
"//:root_modules/ansi-colors",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

Expand Down
41 changes: 14 additions & 27 deletions packages/angular_devkit/build_angular/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ ts_project(
"builders.json",
"package.json",
],
interop_deps = [
"//packages/angular/ssr",
"//packages/angular_devkit/build_webpack",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//packages/ngtools/webpack",
],
module_name = "@angular-devkit/build-angular",
deps = [
"//:root_modules/@ampproject/remapping",
Expand Down Expand Up @@ -201,7 +194,12 @@ ts_project(
"//:root_modules/webpack-subresource-integrity",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular/ssr:ssr_rjs",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/ngtools/webpack:webpack_rjs",
],
)

Expand All @@ -217,9 +215,6 @@ ts_project(
],
),
data = glob(["test/**/*"]),
interop_deps = [
"//packages/angular_devkit/core",
],
deps = [
":build_angular_rjs",
":build_angular_test_utils_rjs",
Expand All @@ -228,6 +223,7 @@ ts_project(
"//:root_modules/typescript",
"//:root_modules/webpack",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
],
)

Expand Down Expand Up @@ -285,19 +281,17 @@ ts_project(
],
),
data = glob(["test/**/*"]),
interop_deps = [
"//modules/testing/builder",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
deps = [
":build_angular_rjs",
"//:root_modules/@types/jasmine",
"//modules/testing/builder:builder_rjs",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"@npm//rxjs",
],
)
Expand All @@ -308,10 +302,8 @@ LARGE_SPECS = {
"shards": 10,
"size": "large",
"flaky": True,
"extra_interop_deps": [
"//packages/angular_devkit/build_webpack",
],
"extra_deps": [
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
"//:root_modules/@types/http-proxy",
"//:root_modules/http-proxy",
"//:root_modules/puppeteer",
Expand Down Expand Up @@ -364,10 +356,8 @@ LARGE_SPECS = {
"prerender": {},
"browser-esbuild": {},
"ssr-dev-server": {
"extra_interop_deps": [
"//packages/angular/ssr/node",
],
"extra_deps": [
"//packages/angular/ssr/node:node_rjs",
"//:root_modules/@types/browser-sync",
"//:root_modules/browser-sync",
"//:root_modules/express",
Expand All @@ -381,15 +371,12 @@ LARGE_SPECS = {
name = "build_angular_" + spec + "_test_lib",
testonly = True,
srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]),
interop_deps = [
# Dependencies needed to compile and run the specs themselves.
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//modules/testing/builder",
] + LARGE_SPECS[spec].get("extra_interop_deps", []),
deps = [
# Dependencies needed to compile and run the specs themselves.
":build_angular_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//modules/testing/builder:builder_rjs",
":build_angular_test_utils_rjs",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
Expand Down
18 changes: 7 additions & 11 deletions packages/angular_devkit/build_webpack/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ ts_project(
"src/builders/webpack-dev-server/schema.json",
"src/builders/webpack/schema.json",
],
interop_deps = [
"//packages/angular_devkit/architect",
],
module_name = "@angular-devkit/build-webpack",
deps = [
"//:root_modules/@types/node",
"//:root_modules/rxjs",
"//:root_modules/webpack",
"//:root_modules/webpack-dev-server",
"//packages/angular_devkit/architect:architect_rjs",
],
)

Expand All @@ -67,17 +65,15 @@ ts_project(
"test/**/*",
],
),
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//packages/ngtools/webpack",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect/node",
"//packages/angular_devkit/architect/testing",
],
deps = [
":build_webpack_rjs",
"//:root_modules/@types/jasmine",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/ngtools/webpack:webpack_rjs",
],
)

Expand Down
16 changes: 6 additions & 10 deletions packages/angular_devkit/schematics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,28 @@ ts_project(
data = [
"package.json",
],
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node", # TODO: get rid of this for 6.0
],
module_name = "@angular-devkit/schematics",
deps = [
"//:root_modules/@types/node",
"//:root_modules/jsonc-parser",
"//:root_modules/magic-string",
"//:root_modules/rxjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs", # TODO: get rid of this for 6.0
],
)

ts_project(
name = "schematics_test_lib",
testonly = True,
srcs = glob(["src/**/*_spec.ts"]),
interop_deps = [
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//packages/angular_devkit/schematics/testing",
],
deps = [
":schematics_rjs",
":schematics",
"//:root_modules/@types/jasmine",
"//:root_modules/rxjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/angular_devkit/schematics/testing:testing_rjs",
],
)

Expand Down
Loading
Loading