Skip to content

Commit d2b8466

Browse files
committed
build: clean up BUILD files and update dependencies
This commit cleans up various `BUILD.bazel` files by removing unused file globs from `RUNTIME_ASSETS` and test sources. It also updates the `rules_pkg` dependency to v1.1.0 and removes the `multiple_version_override` for it in `MODULE.bazel`. Additionally, the conditional `include_npm` setting in `tests/legacy-cli/e2e.bzl` has been removed.
1 parent e4fa5f3 commit d2b8466

File tree

9 files changed

+2852
-63
lines changed

9 files changed

+2852
-63
lines changed

MODULE.bazel

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,7 @@ bazel_dep(name = "yq.bzl", version = "0.3.1")
88
bazel_dep(name = "rules_nodejs", version = "6.5.2")
99
bazel_dep(name = "aspect_rules_js", version = "2.6.0")
1010
bazel_dep(name = "aspect_rules_ts", version = "3.7.0")
11-
bazel_dep(name = "rules_pkg", version = "0.8.1")
12-
13-
# Alow for usage of [email protected] even though other deps want a later verison.
14-
multiple_version_override(
15-
module_name = "rules_pkg",
16-
versions = [
17-
"0.8.1",
18-
"1.1.0",
19-
],
20-
)
21-
22-
bazel_dep(name = "rules_python", version = "1.5.3")
23-
single_version_override(
24-
module_name = "rules_python",
25-
version = "1.5.3",
26-
)
27-
11+
bazel_dep(name = "rules_pkg", version = "1.1.0")
2812
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
2913
bazel_dep(name = "bazel_skylib", version = "1.8.2")
3014
bazel_dep(name = "aspect_rules_esbuild", version = "0.22.1")

MODULE.bazel.lock

Lines changed: 2849 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/angular/build/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ RUNTIME_ASSETS = glob(
4848
include = [
4949
"src/**/schema.json",
5050
"src/**/*.js",
51-
"src/**/*.mjs",
52-
"src/**/*.html",
5351
],
5452
) + [
5553
"builders.json",

packages/angular/create/BUILD.bazel

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ load("//tools:defaults.bzl", "npm_package", "ts_project")
77

88
licenses(["notice"])
99

10-
RUNTIME_ASSETS = glob(
11-
include = [
12-
"src/*.js",
13-
"src/*.mjs",
14-
],
15-
) + [
10+
RUNTIME_ASSETS = [
1611
"package.json",
1712
]
1813

packages/angular/pwa/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ npm_link_all_packages()
1515

1616
RUNTIME_ASSETS = glob(
1717
include = [
18-
"pwa/*.js",
19-
"pwa/*.mjs",
2018
"pwa/files/**/*",
2119
],
2220
) + [

packages/angular_devkit/schematics/tools/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ts_project(
1414
include = ["**/*.ts"],
1515
exclude = [
1616
"**/*_spec.ts",
17-
"test/**/*.ts",
1817
],
1918
),
2019
data = ["package.json"],
@@ -35,7 +34,6 @@ ts_project(
3534
srcs = glob(
3635
include = [
3736
"**/*_spec.ts",
38-
"test/**/*.ts",
3937
],
4038
),
4139
deps = [

packages/ngtools/webpack/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ ts_project(
2121
],
2222
exclude = [
2323
"src/**/*_spec.ts",
24-
"src/**/*_spec_helpers.ts",
2524
],
2625
) + [
2726
"index.ts",
@@ -43,7 +42,6 @@ ts_project(
4342
srcs = glob(
4443
include = [
4544
"src/**/*_spec.ts",
46-
"src/**/*_spec_helpers.ts",
4745
],
4846
),
4947
deps = [

packages/schematics/angular/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUNTIME_ASSETS = [
5151
include = [
5252
"*/schema.json",
5353
"*/files/**/*",
54-
"*/other-files/**/*",
5554
"*/implements-files/**/*",
5655
"*/type-files/**/*",
5756
"*/functional-files/**/*",

tests/legacy-cli/e2e.bzl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,7 @@ def _e2e_tests(name, runner, toolchain, **kwargs):
129129
tags = tags,
130130
toolchains = toolchains,
131131
node_toolchain = toolchain,
132-
include_npm = select({
133-
# For Windows testing mode, we use the real global NPM as otherwise this
134-
# will be a lot of files that need to be brought from WSL to the host FS.
135-
"@platforms//os:windows": False,
136-
"//conditions:default": True,
137-
}),
132+
include_npm = True,
138133
**kwargs
139134
)
140135

0 commit comments

Comments
 (0)