Skip to content

Commit c729a6a

Browse files
committed
build: use rules_esbuild in universal testing
The old `devmode` rule isn't necessary anymore and doesn't work with the real node module directories.
1 parent ca25415 commit c729a6a

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/universal-app/BUILD.bazel

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("@bazel_skylib//rules:build_test.bzl", "build_test")
22
load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary")
3-
load("//tools:defaults.bzl", "devmode_esbuild", "http_server", "protractor_web_test_suite", "sass_binary")
4-
load("//tools/angular:index.bzl", "LINKER_PROCESSED_FW_PACKAGES")
3+
load("//tools:defaults.bzl", "http_server", "protractor_web_test_suite", "sass_binary")
54
load("//tools:defaults2.bzl", "ng_project", "ts_project")
65
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
76
load("@npm2//:defs.bzl", "npm_link_all_packages")
7+
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
88

99
package(default_visibility = ["//visibility:public"])
1010

@@ -63,6 +63,7 @@ ts_project(
6363
tsconfig = ":tsconfig",
6464
deps = [
6565
":kitchen-sink",
66+
"//:node_modules/@angular/compiler",
6667
"//:node_modules/@angular/core",
6768
"//:node_modules/@angular/platform-browser",
6869
"//:node_modules/@angular/platform-server",
@@ -92,27 +93,25 @@ js_binary(
9293
entry_point = ":prerender_bundle.js",
9394
)
9495

95-
devmode_esbuild(
96+
esbuild(
9697
name = "client_bundle",
97-
entry_points = [":main.ts"],
98+
entry_points = [":main.js"],
9899
platform = "browser",
99100
target = "es2016",
100-
deps = LINKER_PROCESSED_FW_PACKAGES + [
101-
":client_lib_legacy",
101+
deps = [
102+
":client_lib",
102103
],
103104
)
104105

105-
devmode_esbuild(
106+
esbuild(
106107
name = "prerender_bundle",
107-
entry_point = ":prerender.ts",
108+
entry_point = ":prerender.js",
108109
platform = "node",
109110
# We cannot use `ES2017` or higher as that would result in `async/await` not being downleveled.
110111
# ZoneJS needs to be able to intercept these as otherwise change detection would not work properly.
111112
target = "es2016",
112-
# Note: We add all linker-processed FW packages as dependencies here so that ESBuild will
113-
# map all framework packages to their linker-processed bundles from `tools/angular`.
114-
deps = LINKER_PROCESSED_FW_PACKAGES + [
115-
":prerender_lib_legacy",
113+
deps = [
114+
":prerender_lib",
116115
],
117116
)
118117

0 commit comments

Comments
 (0)