Skip to content

Commit 9a30a0a

Browse files
committed
build: cleanup more usages of @npm// repository
Cleans up usages of the old `@npm` repository, so that we can quickly remove this.
1 parent 965aadf commit 9a30a0a

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

.bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ build:snapshot-build --stamp
5858
####################################
5959
# Bazel custom flags #
6060
####################################
61-
build --flag_alias=partial_compilation=@npm//@angular/bazel/src:partial_compilation
61+
build --flag_alias=partial_compilation=@rules_angular//src/ng_project/config:partial_compilation
6262

6363
##################################
6464
# Always enable Ivy compilation #

goldens/BUILD.bazel

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@devinfra//bazel/api-golden:index.bzl", "api_golden_test_npm_package")
1+
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
22

33
exports_files([
44
"tsec-exemption.json",
@@ -9,29 +9,33 @@ api_golden_test_npm_package(
99
data = glob(["cdk/**"]) + [
1010
"//src/cdk:npm_package",
1111
],
12-
golden_dir = "angular_material/goldens/cdk",
13-
npm_package = "angular_material/src/cdk/npm_package",
12+
golden_dir = "goldens/cdk",
13+
npm_package = "src/cdk/npm_package",
1414
)
1515

1616
api_golden_test_npm_package(
1717
name = "material_api",
1818
data = glob(["material/**"]) + ["//src/material:npm_package"],
19-
golden_dir = "angular_material/goldens/material",
20-
npm_package = "angular_material/src/material/npm_package",
19+
golden_dir = "goldens/material",
20+
npm_package = "src/material/npm_package",
2121
)
2222

2323
api_golden_test_npm_package(
2424
name = "google_maps_api",
2525
data = glob(["google-maps/**"]) + ["//src/google-maps:npm_package"],
26-
golden_dir = "angular_material/goldens/google-maps",
27-
npm_package = "angular_material/src/google-maps/npm_package",
28-
types = ["@npm//@types/google.maps"],
26+
golden_dir = "goldens/google-maps",
27+
npm_package = "src/google-maps/npm_package",
28+
types = {
29+
"//:node_modules/@types/google.maps": "google.maps",
30+
},
2931
)
3032

3133
api_golden_test_npm_package(
3234
name = "youtube_player_api",
3335
data = glob(["youtube-player/**"]) + ["//src/youtube-player:npm_package"],
34-
golden_dir = "angular_material/goldens/youtube-player",
35-
npm_package = "angular_material/src/youtube-player/npm_package",
36-
types = ["@npm//@types/youtube"],
36+
golden_dir = "goldens/youtube-player",
37+
npm_package = "src/youtube-player/npm_package",
38+
types = {
39+
"//:node_modules/@types/youtube": "youtube",
40+
},
3741
)

src/e2e-app/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ npm_link_all_packages()
99

1010
# List of dependencies that are referenced in the `index.html` file.
1111
devserverIndexHtmlDependencies = [
12-
"@npm//zone.js",
13-
"@npm//kagekiri",
12+
"//:node_modules/zone.js",
13+
"//:node_modules/kagekiri",
1414
"//src/material/prebuilt-themes:azure-blue",
1515
":index.html",
1616
":theme",
@@ -91,7 +91,7 @@ http_server(
9191
testonly = True,
9292
srcs = devserverIndexHtmlDependencies,
9393
additional_root_paths = [
94-
"npm/node_modules",
94+
"angular_material/",
9595
],
9696
tags = ["manual"],
9797
deps = [

src/e2e-app/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<e2e-app>Loading...</e2e-app>
1919
<span class="sibling">I am a sibling!</span>
2020

21-
<script src="zone.js/bundles/zone.umd.min.js"></script>
22-
<script src="kagekiri/dist/kagekiri.umd.min.js"></script>
21+
<script src="node_modules/zone.js/bundles/zone.umd.min.js"></script>
22+
<script src="node_modules/kagekiri/dist/kagekiri.umd.min.js"></script>
2323
<script src="bundles/main.js" type="module"></script>
2424
</body>
2525
</html>

tools/BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ rules_js_tsconfig(
1818
],
1919
)
2020

21-
# Bazel config setting that matches if the partial compilation flag
22-
# for `@angular/bazel` is set to `True`.
21+
# Bazel config setting that matches if the partial compilation is enabled.
2322
config_setting(
2423
name = "partial_compilation_enabled",
2524
flag_values = {
26-
"@npm//@angular/bazel/src:partial_compilation": "True",
25+
"@rules_angular//src/ng_project/config:partial_compilation": "True",
2726
},
2827
)
2928

@@ -39,7 +38,7 @@ bool_flag(
3938
config_setting(
4039
name = "force_partial_jit_compilation_enabled",
4140
flag_values = {
42-
"@npm//@angular/bazel/src:partial_compilation": "True",
41+
"@rules_angular//src/ng_project/config:partial_compilation": "True",
4342
":force_partial_jit_compilation": "True",
4443
},
4544
)

0 commit comments

Comments
 (0)