Skip to content

Commit f038803

Browse files
josephperrottAndrewKushnir
josephperrott
authored and
AndrewKushnir
committed
build: migrate esbuild usages to aspect_rules_esbuild esbuild rule (#62529)
Migrate more usages of esbuild to new toolchain PR Close #62529
1 parent ee16715 commit f038803

File tree

11 files changed

+71
-33
lines changed

11 files changed

+71
-33
lines changed

‎packages/compiler-cli/BUILD.bazel‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm//@bazel/esbuild:index.bzl", "esbuild", "esbuild_config")
1+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
22
load("@npm2//:defs.bzl", "npm_link_all_packages")
33
load("//tools:defaults.bzl", "api_golden_test", "extract_types", "pkg_npm")
44
load("//tools:defaults2.bzl", "npm_package", "ts_config", "ts_project")
@@ -12,6 +12,13 @@ PUBLIC_TARGETS = [
1212
"//packages/compiler-cli/linker/babel",
1313
]
1414

15+
PUBLIC_TARGETS_RJS = [
16+
":compiler-cli_rjs",
17+
"//packages/compiler-cli/private:private_rjs",
18+
"//packages/compiler-cli/linker:linker_rjs",
19+
"//packages/compiler-cli/linker/babel:babel_rjs",
20+
]
21+
1522
npm_link_all_packages()
1623

1724
ts_config(
@@ -33,23 +40,16 @@ ts_config(
3340
],
3441
)
3542

36-
esbuild_config(
37-
name = "esbuild_config",
38-
config_file = "esbuild.config.js",
39-
)
40-
4143
esbuild(
4244
name = "bundles",
43-
config = ":esbuild_config",
45+
config = "esbuild.config.js",
4446
entry_points = [
4547
":index.ts",
4648
"//packages/compiler-cli:src/bin/ngc.ts",
4749
"//packages/compiler-cli:src/bin/ng_xi18n.ts",
48-
"//packages/compiler-cli/linker:index.ts",
49-
"//packages/compiler-cli/linker/babel:index.ts",
50-
"//packages/compiler-cli/private:localize.ts",
51-
"//packages/compiler-cli/private:migrations.ts",
52-
"//packages/compiler-cli/private:tooling.ts",
50+
"//packages/compiler-cli/linker:files",
51+
"//packages/compiler-cli/linker/babel:files",
52+
"//packages/compiler-cli/private:files",
5353
],
5454
external = [
5555
"@angular/compiler",
@@ -68,7 +68,7 @@ esbuild(
6868
platform = "node",
6969
splitting = True,
7070
target = "node20",
71-
deps = PUBLIC_TARGETS,
71+
deps = PUBLIC_TARGETS_RJS,
7272
)
7373

7474
ts_project(

‎packages/compiler-cli/linker/BUILD.bazel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
12
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

6+
copy_to_bin(
7+
name = "files",
8+
srcs = [
9+
"index.ts",
10+
],
11+
)
12+
513
ts_project(
614
name = "linker",
715
srcs = ["index.ts"] + glob([

‎packages/compiler-cli/linker/babel/BUILD.bazel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
12
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

6+
copy_to_bin(
7+
name = "files",
8+
srcs = [
9+
"index.ts",
10+
],
11+
)
12+
513
ts_project(
614
name = "babel",
715
srcs = ["index.ts"] + glob([

‎packages/compiler-cli/private/BUILD.bazel‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
12
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

6+
copy_to_bin(
7+
name = "files",
8+
srcs = [
9+
"localize.ts",
10+
"migrations.ts",
11+
"tooling.ts",
12+
],
13+
)
14+
515
ts_project(
616
name = "private",
717
srcs = glob(["*.ts"]),

‎packages/core/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ generate_api_docs(
179179

180180
genrule(
181181
name = "event_dispatch_contract_binary",
182-
srcs = ["//packages/core/primitives/event-dispatch:contract_bundle_min"],
182+
srcs = ["//packages/core/primitives/event-dispatch:contract_bundle_min.js"],
183183
outs = ["event-dispatch-contract.min.js"],
184184
cmd = "cp $< $@",
185185
)

‎packages/core/primitives/event-dispatch/BUILD.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "esbuild", "tsec_test")
1+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
2+
load("//tools:defaults.bzl", "tsec_test")
23
load("//tools:defaults2.bzl", "ts_project")
34

45
package(default_visibility = ["//visibility:public"])
@@ -33,8 +34,7 @@ filegroup(
3334

3435
esbuild(
3536
name = "contract_bundle_min",
36-
args = {
37-
"sourcemap": False,
37+
config = {
3838
"resolveExtensions": [
3939
".mjs",
4040
".js",
@@ -44,6 +44,6 @@ esbuild(
4444
entry_point = ":contract_binary.js",
4545
format = "iife",
4646
minify = True,
47-
sourcemap = "inline",
48-
deps = [":event-dispatch"],
47+
sourcemap = "external",
48+
deps = [":event-dispatch_rjs"],
4949
)

‎packages/examples/router/activated-route/BUILD.bazel‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "esbuild", "http_server")
1+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
2+
load("//tools:defaults.bzl", "http_server")
23
load("//tools:defaults2.bzl", "ng_project")
34

45
package(default_visibility = ["//visibility:public"])
@@ -8,21 +9,26 @@ ng_project(
89
srcs = glob(
910
["**/*.ts"],
1011
),
11-
interop_deps = [
12-
"//packages/platform-browser",
13-
],
1412
deps = [
1513
"//:node_modules/rxjs",
1614
"//:node_modules/zone.js",
1715
"//packages/core:core_rjs",
16+
"//packages/platform-browser:platform-browser_rjs",
1817
"//packages/router:router_rjs",
1918
],
2019
)
2120

2221
esbuild(
2322
name = "app_bundle",
23+
config = {
24+
"resolveExtensions": [".js"],
25+
},
2426
entry_point = ":main.ts",
25-
deps = [":router_activated_route_examples"],
27+
tsconfig = "//packages/examples:tsconfig_build",
28+
deps = [
29+
":router_activated_route_examples_rjs",
30+
"//packages/examples:tsconfig_build",
31+
],
2632
)
2733

2834
http_server(

‎packages/language-service/BUILD.bazel‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "esbuild", "extract_types", "pkg_npm")
1+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
2+
load("//tools:defaults.bzl", "extract_types", "pkg_npm")
23
load("//tools:defaults2.bzl", "ts_config", "ts_project")
34

45
package(default_visibility = ["//visibility:public"])
@@ -34,16 +35,16 @@ ts_project(
3435
esbuild(
3536
name = "factory_bundle",
3637
entry_point = ":plugin-factory.ts",
37-
external = ["./bundles/language-service.js"],
38+
external = ["@angular/language-service/bundles/language-service.js"],
3839
format = "cjs",
39-
deps = [":factory_lib"],
40+
deps = [":factory_lib_rjs"],
4041
)
4142

4243
esbuild(
4344
name = "api_bundle",
4445
entry_point = ":api.ts",
4546
format = "cjs",
46-
deps = [":api"],
47+
deps = [":api_rjs"],
4748
)
4849

4950
extract_types(

‎packages/language-service/plugin-factory.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export const factory: ts.server.PluginModuleFactory = (tsModule): PluginModule =
2121

2222
return {
2323
create(info: ts.server.PluginCreateInfo): NgLanguageService {
24-
plugin = require(`./bundles/language-service.js`)(tsModule);
24+
// Use a module name based import path to allow it to be marked external.
25+
plugin = require(`@angular/language-service/bundles/language-service.js`)(tsModule);
2526
return plugin.create(info);
2627
},
2728
getExternalFiles(project: ts.server.Project): string[] {

‎packages/localize/schematics/ng-add/BUILD.bazel‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "esbuild")
1+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
22
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -27,7 +27,11 @@ esbuild(
2727
output = "ng_add_bundle.cjs",
2828
platform = "node",
2929
target = "node20",
30-
deps = [":ng-add"],
30+
tsconfig = "//packages:tsconfig_build",
31+
deps = [
32+
":ng-add_rjs",
33+
"//packages:tsconfig_build",
34+
],
3135
)
3236

3337
filegroup(

0 commit comments

Comments
 (0)