Skip to content

Commit f0ee681

Browse files
josephperrottAndrewKushnir
authored andcommitted
build: move macros/build set up for zone.js into zone.js directories (angular#63421)
Move the zone_bundle and configurations into zone.js's tool directory PR Close angular#63421
1 parent 17c232a commit f0ee681

10 files changed

Lines changed: 13 additions & 15 deletions

File tree

packages/zone.js/test/karma_test.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, tes
1212
entry_point = env_entry_point,
1313
testonly = True,
1414
output = name + "_env.js",
15-
config = "//tools/bazel/esbuild/zone-config:umd",
15+
config = "//packages/zone.js/tools:umd",
1616
deps = [
1717
":" + name + "_env_lib",
1818
],
@@ -30,7 +30,7 @@ def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, tes
3030
entry_point = test_entry_point,
3131
testonly = True,
3232
output = name + "_env.spec.js",
33-
config = "//tools/bazel/esbuild/zone-config:umd",
33+
config = "//packages/zone.js/tools:umd",
3434
deps = [
3535
":" + name + "_env_spec_lib",
3636
],

packages/zone.js/tools.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Provides the rollup and dist file generation macro."""
22

3-
load("//tools:defaults.bzl", "zone_bundle")
3+
load("//packages/zone.js/tools:zone_bundle.bzl", "zone_bundle")
44

55
def copy_dist(module_name, module_format, output_module_name, suffix, umd):
66
umd_output = umd
File renamed without changes.
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ def zone_bundle(
3535
esbuild(
3636
name = name + ".esm",
3737
entry_point = entry_point,
38-
config = "//tools/bazel/esbuild/zone-config:esm",
38+
config = "//packages/zone.js/tools:esm",
3939
deps = deps,
4040
)
4141
esbuild(
4242
name = name + ".min.esm",
4343
entry_point = entry_point,
44-
config = "//tools/bazel/esbuild/zone-config:esm",
44+
config = "//packages/zone.js/tools:esm",
4545
deps = deps,
4646
minify = True,
4747
)
@@ -50,22 +50,22 @@ def zone_bundle(
5050
esbuild(
5151
name = name + ".es2015",
5252
entry_point = entry_point,
53-
config = "//tools/bazel/esbuild/zone-config:iife",
53+
config = "//packages/zone.js/tools:iife",
5454
target = "es2015",
5555
deps = deps,
5656
)
5757
esbuild(
5858
name = name + ".min.es2015",
5959
entry_point = entry_point,
60-
config = "//tools/bazel/esbuild/zone-config:iife",
60+
config = "//packages/zone.js/tools:iife",
6161
target = "es2015",
6262
deps = deps,
6363
minify = True,
6464
)
6565
esbuild(
6666
name = name + ".min_debug.es2015",
6767
entry_point = entry_point,
68-
config = "//tools/bazel/esbuild/zone-config:iife",
68+
config = "//packages/zone.js/tools:iife",
6969
target = "es2015",
7070
deps = deps,
7171
minify = True,
@@ -96,7 +96,7 @@ def zone_bundle(
9696
esbuild(
9797
name = name + ".min",
9898
entry_point = name + ".js",
99-
config = "//tools/bazel/esbuild/zone-config:iife",
99+
config = "//packages/zone.js/tools:iife",
100100
target = "es5",
101101
srcs = [
102102
name + ".js",
@@ -106,7 +106,7 @@ def zone_bundle(
106106
esbuild(
107107
name = name + ".min_debug",
108108
entry_point = name + ".js",
109-
config = "//tools/bazel/esbuild/zone-config:iife",
109+
config = "//packages/zone.js/tools:iife",
110110
target = "es5",
111111
srcs = [
112112
name + ".js",
@@ -119,13 +119,13 @@ def zone_bundle(
119119
esbuild(
120120
name = name + ".umd",
121121
entry_point = entry_point,
122-
config = "//tools/bazel/esbuild/zone-config:umd",
122+
config = "//packages/zone.js/tools:umd",
123123
deps = deps,
124124
)
125125
esbuild(
126126
name = name + ".min.umd",
127127
entry_point = entry_point,
128-
config = "//tools/bazel/esbuild/zone-config:umd",
128+
config = "//packages/zone.js/tools:umd",
129129
deps = deps,
130130
minify = True,
131131
)
@@ -155,7 +155,7 @@ def zone_bundle(
155155
esbuild(
156156
name = name + ".min.es5umd",
157157
entry_point = name + ".es5umd.js",
158-
config = "//tools/bazel/esbuild/zone-config:umd",
158+
config = "//packages/zone.js/tools:umd",
159159
target = "es5",
160160
srcs = [
161161
name + ".es5umd.js",

tools/bazel/esbuild/BUILD.bazel

Whitespace-only changes.

tools/defaults.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ load("//tools/bazel:npm_packages.bzl", _ng_package = "ng_package", _npm_package
1616
load("//tools/bazel:protractor_test.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
1717
load("//tools/bazel:tsec.bzl", _tsec_test = "tsec_test")
1818
load("//tools/bazel:web_test.bzl", _ng_web_test_suite = "ng_web_test_suite", _web_test = "web_test", _zoneless_web_test_suite = "zoneless_web_test_suite")
19-
load("//tools/bazel/esbuild:zone_bundle.bzl", _zone_bundle = "zone_bundle")
2019

2120
extract_types = _extract_types
2221
esbuild = _esbuild
23-
zone_bundle = _zone_bundle
2422
js_binary = _js_binary
2523
js_run_binary = _js_run_binary
2624
js_test = _js_test

0 commit comments

Comments
 (0)