Skip to content

Commit 7cb14fd

Browse files
mrmekujbedard
authored andcommitted
chore: Transpile javascript to ESM (#8298)
Prior to this change any ts_project or ts_proto_library transpiled to commonjs modules. Now the default is ESM. --- - Covered by existing test cases GitOrigin-RevId: 7be4172ef0e704be36af2187b4be093bbcb60f00
1 parent 2c7f146 commit 7cb14fd

File tree

16 files changed

+35
-27
lines changed

16 files changed

+35
-27
lines changed

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
33
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
44
load("@io_bazel_rules_go//go:def.bzl", "nogo")
55
load("@npm//:defs.bzl", "npm_link_all_packages")
6+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
67

78
npm_link_all_packages(name = "node_modules")
89

WORKSPACE

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,11 @@ http_archive(
157157

158158
http_archive(
159159
name = "buildifier_prebuilt",
160-
sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e",
161-
strip_prefix = "buildifier-prebuilt-6.4.0",
162-
urls = ["http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz"],
160+
sha256 = "bf9101bd5d657046674167986a18d44c5612e417194dc55aff8ca174344de031",
161+
strip_prefix = "buildifier-prebuilt-8.0.3",
162+
urls = [
163+
"http://github.com/keith/buildifier-prebuilt/archive/8.0.3.tar.gz",
164+
],
163165
)
164166

165167
load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps")
@@ -195,6 +197,7 @@ go_rules_dependencies()
195197
go_register_toolchains(version = "1.24.1")
196198

197199
load("//gazelle:deps.bzl", fetch_gazelle_deps = "fetch_deps")
200+
198201
fetch_gazelle_deps()
199202

200203
http_archive(

bazel/action_cache/action_cache_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/analysis/analysis_v2_pb.d.ts

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/buildeventstream/build_event_stream_pb.d.ts

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/command_line/command_line_pb.d.ts

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/failure_details/failure_details_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/flags/flags_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/invocation_policy/invocation_policy_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/options/option_filters_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/packages_metrics/package_load_metrics_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/query/build_pb.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/ts/defs.bzl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ load("@bazel_skylib//rules:write_file.bzl", _write_file = "write_file")
1010

1111
ts_config = _ts_config
1212

13-
def ts_project(name, module_type = "commonjs", **kwargs):
13+
def ts_project(name, **kwargs):
1414
"""Macro around ts_project for silo.
1515
1616
Args:
1717
name: Name of the ts_project target
18-
module_type: Type of module swc should transpile to
1918
**kwargs: Additional attributes to pass to the ts_project rule
2019
"""
2120
swcrc = ".swcrc_%s" % name
@@ -25,6 +24,7 @@ def ts_project(name, module_type = "commonjs", **kwargs):
2524
content = json.encode({
2625
"inlineSourcesContent": True,
2726
"jsc": {
27+
"baseUrl": ".",
2828
"keepClassNames": True,
2929
"parser": {
3030
"decorators": True,
@@ -41,7 +41,8 @@ def ts_project(name, module_type = "commonjs", **kwargs):
4141
},
4242
},
4343
"module": {
44-
"type": module_type,
44+
"resolveFully": True,
45+
"type": "es6",
4546
},
4647
"sourceMaps": True,
4748
}).splitlines(),
@@ -64,8 +65,9 @@ def ts_project(name, module_type = "commonjs", **kwargs):
6465
)
6566

6667
def ts_proto_library(name, protoc_gen_options = {
67-
"js_import_style": "legacy_commonjs",
68+
"js_import_style": "module",
6869
"target": "js+dts",
70+
"import_extension": ".js",
6971
}, **kwargs):
7072
_ts_proto_library(
7173
name = name,

docs/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
22
load("@bazel_skylib//rules:write_file.bzl", "write_file")
3+
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
34
load(":command_list.bzl", "COMMAND_LIST")
45

56
_DOCS = ["aspect.md"] + [

gazelle/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def fetch_gazelle():
77
http_archive(
88
name = "bazel_gazelle",
99
sha256 = "fa1a981ae546684dbb7e7f428bafe0180530af09eace265094e03f4383fc0de4",
10-
strip_prefix = "bazel-gazelle-186298911d38850b47b198e8d933a93125ce7043", # Ensure this version always matches the go.mod version.
10+
strip_prefix = "bazel-gazelle-186298911d38850b47b198e8d933a93125ce7043", # Ensure this version always matches the go.mod version.
1111
#
1212
# :notice: Care should be taken when upgrading gazelle since we have vendored & modified parts of gazelle
1313
# in the CLI configure command (/pkg/aspect/configure).

integration_tests/bats.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"macro function running bats tests using sh_test"
22

3+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
4+
35
def bats_test(srcs = [], **kwargs):
46
"""macro rule running bats tests using sh_test
57
@@ -22,8 +24,7 @@ def bats_test(srcs = [], **kwargs):
2224

2325
env["BATS_LIB_PATH"] = ":".join(["$(rootpaths %s)/.." % helper_dir for helper_dir in helpers_dirs])
2426
env["BIN"] = "$(rootpath @bats_core//:bin)"
25-
26-
native.sh_test(
27+
sh_test(
2728
srcs = [
2829
"//integration_tests:runner.sh",
2930
],

0 commit comments

Comments
 (0)