Skip to content

Commit 26f99b3

Browse files
josephperrottjosephperrott
committed
build: migrate all npm packages to use new rules_js based npm_package rule (#62989)
Use a common rule for all npm_packages PR Close #62989
1 parent 0aadf04 commit 26f99b3

File tree

29 files changed

+122
-422
lines changed

29 files changed

+122
-422
lines changed

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ http_archive(
219219

220220
git_repository(
221221
name = "devinfra",
222-
commit = "73442df90c353b4b777574ffac1ede88ee89ac4d",
222+
commit = "d7a36bc7f6042e3408655c9f6534f9a1613ec8f6",
223223
remote = "https://github.com/angular/dev-infra.git",
224224
)
225225

@@ -237,7 +237,7 @@ browser_repositories()
237237

238238
git_repository(
239239
name = "rules_angular",
240-
commit = "88ddcf8cccbfef57f8cc3dda4881f18ec739428e",
240+
commit = "c8af5c0d27c66387e9e7df3c4dd3155ce7582609",
241241
remote = "https://github.com/devversion/rules_angular.git",
242242
)
243243

‎adev/shared-docs/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ng_project(
4040
)
4141

4242
ng_package(
43-
name = "pkg",
4443
srcs = [
4544
"package.json",
4645
"//adev/shared-docs/icons",

‎packages/animations/BUILD.bazel

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package")
1+
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -17,7 +17,6 @@ ng_project(
1717
)
1818

1919
ng_package(
20-
name = "npm_package",
2120
srcs = [
2221
"package.json",
2322
],
@@ -41,16 +40,6 @@ ng_package(
4140
],
4241
)
4342

44-
# TODO(devversion): Temporary early `npm_package` for making this package usable in `core/test/bundling`.
45-
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
46-
npm_package(
47-
name = "pkg",
48-
srcs = [":npm_package"],
49-
replace_prefixes = {
50-
"npm_package/": "",
51-
},
52-
)
53-
5443
api_golden_test_npm_package(
5544
name = "animations_api",
5645
data = [

‎packages/benchpress/BUILD.bazel

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ng_package", "npm_package", "ts_config", "ts_project")
1+
load("//tools:defaults2.bzl", "ng_package", "ts_config", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -27,7 +27,6 @@ ts_project(
2727
)
2828

2929
ng_package(
30-
name = "npm_package",
3130
srcs = [
3231
"README.md",
3332
"package.json",
@@ -47,11 +46,3 @@ ng_package(
4746
":benchpress",
4847
],
4948
)
50-
51-
npm_package(
52-
name = "pkg",
53-
srcs = [":npm_package"],
54-
replace_prefixes = {
55-
"npm_package/": "",
56-
},
57-
)

‎packages/common/BUILD.bazel

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//packages/common/locales:index.bzl", "generate_base_currencies_file")
2-
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package")
2+
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project")
33

44
package(default_visibility = ["//visibility:public"])
55

@@ -26,14 +26,13 @@ ng_project(
2626
)
2727

2828
ng_package(
29-
name = "npm_package",
3029
srcs = [
3130
"package.json",
3231
],
33-
nested_packages = ["//packages/common/locales:package"],
32+
nested_packages = ["//packages/common/locales:npm_package"],
3433
package = "@angular/common",
3534
replace_prefixes = {
36-
"locales/package": "locales/",
35+
"locales/npm_package": "locales/",
3736
},
3837
tags = [
3938
"release-with-framework",
@@ -62,16 +61,6 @@ ng_package(
6261
],
6362
)
6463

65-
# TODO(devversion): Temporary early `npm_package` for making this package usable in `core/test/bundling`.
66-
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
67-
npm_package(
68-
name = "pkg",
69-
srcs = [":npm_package"],
70-
replace_prefixes = {
71-
"npm_package/": "",
72-
},
73-
)
74-
7564
api_golden_test_npm_package(
7665
name = "common_api",
7766
data = [

‎packages/common/locales/BUILD.bazel

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("//packages/common/locales:index.bzl", "LOCALES", "generate_all_locale_files", "generate_closure_locale_file")
2-
load("//tools:defaults.bzl", "pkg_npm")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults2.bzl", "npm_package", "ts_project")
43

54
package(default_visibility = ["//visibility:public"])
65

@@ -31,9 +30,8 @@ ts_project(
3130
),
3231
)
3332

34-
pkg_npm(
35-
name = "package",
33+
npm_package(
3634
# TODO(devversion): Remove glob for checked-in legacy locale files that haven't been
3735
# removed in the past (when CLDR has been updated). These can be removed in a major.
38-
deps = ["global/%s.js" % l for l in LOCALES] + [":locales"] + glob(["global/*.js"]),
36+
srcs = ["global/%s.js" % l for l in LOCALES] + [":locales"] + glob(["global/*.js"]),
3937
)

‎packages/compiler-cli/BUILD.bazel

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
22
load("@npm2//:defs.bzl", "npm_link_all_packages")
3-
load("//tools:defaults.bzl", "pkg_npm")
43
load("//tools:defaults2.bzl", "api_golden_test", "extract_types", "npm_package", "ts_config", "ts_project")
54

65
package(default_visibility = ["//visibility:public"])
@@ -107,12 +106,13 @@ extract_types(
107106
deps = PUBLIC_TARGETS,
108107
)
109108

110-
pkg_npm(
111-
name = "npm_package",
112-
package_name = "@angular/compiler-cli",
109+
npm_package(
113110
srcs = [
114111
"package.json",
112+
":api_type_definitions",
113+
":bundles",
115114
],
115+
package = "@angular/compiler-cli",
116116
tags = [
117117
"release-with-framework",
118118
],
@@ -126,20 +126,6 @@ pkg_npm(
126126
"//packages/core/test/bundling:__subpackages__",
127127
"//packages/core/test/playground/zone-signal-input:__pkg__",
128128
],
129-
deps = [
130-
":api_type_definitions",
131-
":bundles",
132-
],
133-
)
134-
135-
# TODO(devversion): Temporary early `npm_package` for making compiler-cli usable in `rules_angular`.
136-
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
137-
npm_package(
138-
name = "pkg",
139-
srcs = [":npm_package"],
140-
replace_prefixes = {
141-
"npm_package/": "",
142-
},
143129
)
144130

145131
api_golden_test(

‎packages/compiler-cli/src/ngtsc/testing/fake_common/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ts_project(
1313
)
1414

1515
ng_package(
16-
name = "npm_package",
1716
srcs = [
1817
"package.json",
1918
],

‎packages/compiler/BUILD.bazel

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults2.bzl", "ng_package", "npm_package", "ts_project", "tsec_test")
1+
load("//tools:defaults2.bzl", "ng_package", "ts_project", "tsec_test")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -19,7 +19,6 @@ tsec_test(
1919
)
2020

2121
ng_package(
22-
name = "npm_package",
2322
srcs = [
2423
"package.json",
2524
],
@@ -30,6 +29,7 @@ ng_package(
3029
tags = [
3130
"release-with-framework",
3231
],
32+
use_no_sub = True,
3333
# Do not add more to this list.
3434
# Dependencies on the full npm_package cause long re-builds.
3535
visibility = [
@@ -47,16 +47,6 @@ ng_package(
4747
],
4848
)
4949

50-
# TODO(devversion): Temporary early `npm_package` for making compiler usable in `rules_angular`.
51-
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
52-
npm_package(
53-
name = "pkg",
54-
srcs = [":npm_package_nosub"],
55-
replace_prefixes = {
56-
"npm_package_nosub/": "",
57-
},
58-
)
59-
6050
filegroup(
6151
name = "files_for_docgen",
6252
srcs = glob([

‎packages/core/BUILD.bazel

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs")
22
load("//packages/common/locales:index.bzl", "generate_base_locale_file")
3-
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package", "ts_config", "tsec_test")
3+
load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "ts_config", "tsec_test")
44

55
package(default_visibility = ["//visibility:public"])
66

@@ -55,7 +55,6 @@ tsec_test(
5555
)
5656

5757
ng_package(
58-
name = "npm_package",
5958
srcs = [
6059
"package.json",
6160
":event_dispatch_contract_binary",
@@ -92,16 +91,6 @@ ng_package(
9291
],
9392
)
9493

95-
# TODO(devversion): Temporary early `npm_package` for making this package usable in `core/test/bundling`.
96-
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
97-
npm_package(
98-
name = "pkg",
99-
srcs = [":npm_package"],
100-
replace_prefixes = {
101-
"npm_package/": "",
102-
},
103-
)
104-
10594
api_golden_test_npm_package(
10695
name = "core_api",
10796
data = [

0 commit comments

Comments
 (0)