Skip to content

Commit e9e8fe7

Browse files
authored
fix(esbuild): update to esbuild 0.11 (#2559)
Fixes #2552
1 parent 57218a6 commit e9e8fe7

File tree

7 files changed

+25
-30
lines changed

7 files changed

+25
-30
lines changed

examples/esbuild/WORKSPACE

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ http_archive(
2525
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.3/rules_nodejs-3.2.3.tar.gz"],
2626
)
2727

28-
_ESBUILD_VERSION = "0.8.48"
28+
_ESBUILD_VERSION = "0.11.5"
2929

3030
http_archive(
3131
name = "esbuild_darwin",
3232
build_file_content = """exports_files(["bin/esbuild"])""",
33-
sha256 = "d21a722873ed24586f071973b77223553fca466946f3d7e3976eeaccb14424e6",
33+
sha256 = "98436890727bdb0d4beddd9c9e07d0aeff0e8dfe0169f85e568eca0dd43f665e",
3434
strip_prefix = "package",
3535
urls = [
3636
"https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-%s.tgz" % _ESBUILD_VERSION,
@@ -40,7 +40,7 @@ http_archive(
4040
http_archive(
4141
name = "esbuild_windows",
4242
build_file_content = """exports_files(["esbuild.exe"])""",
43-
sha256 = "fe5dcb97b4c47f9567012f0a45c19c655f3d2e0d76932f6dd12715dbebbd6eb0",
43+
sha256 = "589c8ff97210bd41de106e6317ce88f9e88d2cacfd8178ae1217f2b857ff6c3a",
4444
strip_prefix = "package",
4545
urls = [
4646
"https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-%s.tgz" % _ESBUILD_VERSION,
@@ -50,7 +50,7 @@ http_archive(
5050
http_archive(
5151
name = "esbuild_linux",
5252
build_file_content = """exports_files(["bin/esbuild"])""",
53-
sha256 = "60dabe141e5dfcf99e7113bded6012868132068a582a102b258fb7b1cfdac14b",
53+
sha256 = "113c2e84895f4422a3676db4e15d9f01b2b4fac041edab25284fdb9574ba58a0",
5454
strip_prefix = "package",
5555
urls = [
5656
"https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-%s.tgz" % _ESBUILD_VERSION,

packages/esbuild/_README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ yarn add -D @bazel/esbuild
1818
Add an `http_archive` fetching the esbuild binary for each platform that you need to support.
1919

2020
```python
21-
_ESBUILD_VERSION = "0.8.48" # reminder: update SHAs below when changing this value
21+
_ESBUILD_VERSION = "0.11.5" # reminder: update SHAs below when changing this value
2222
http_archive(
2323
name = "esbuild_darwin",
2424
urls = [
2525
"https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-%s.tgz" % _ESBUILD_VERSION,
2626
],
2727
strip_prefix = "package",
2828
build_file_content = """exports_files(["bin/esbuild"])""",
29-
sha256 = "d21a722873ed24586f071973b77223553fca466946f3d7e3976eeaccb14424e6",
29+
sha256 = "98436890727bdb0d4beddd9c9e07d0aeff0e8dfe0169f85e568eca0dd43f665e",
3030
)
3131

3232
http_archive(
@@ -36,7 +36,7 @@ http_archive(
3636
],
3737
strip_prefix = "package",
3838
build_file_content = """exports_files(["esbuild.exe"])""",
39-
sha256 = "fe5dcb97b4c47f9567012f0a45c19c655f3d2e0d76932f6dd12715dbebbd6eb0",
39+
sha256 = "589c8ff97210bd41de106e6317ce88f9e88d2cacfd8178ae1217f2b857ff6c3a",
4040
)
4141

4242
http_archive(
@@ -46,7 +46,7 @@ http_archive(
4646
],
4747
strip_prefix = "package",
4848
build_file_content = """exports_files(["bin/esbuild"])""",
49-
sha256 = "60dabe141e5dfcf99e7113bded6012868132068a582a102b258fb7b1cfdac14b",
49+
sha256 = "113c2e84895f4422a3676db4e15d9f01b2b4fac041edab25284fdb9574ba58a0",
5050
)
5151
```
5252

packages/esbuild/esbuild.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ def _esbuild_impl(ctx):
6868
args.add_all(ctx.attr.define, format_each = "--define:%s")
6969
args.add_all(ctx.attr.external, format_each = "--external:%s")
7070

71-
# disable the error limit and show all errors
72-
args.add_joined(["--error-limit", "0"], join_with = "=")
71+
# disable the log limit and show all logs
72+
args.add_joined(["--log-limit", "0"], join_with = "=")
7373

7474
if ctx.attr.minify:
7575
args.add("--minify")

packages/esbuild/esbuild_repo.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
66

77
# IMPORTANT: Keep this file in sync with the documentation in _README.md
88

9-
_VERSION = "0.8.48" # reminder: update SHAs below when changing this version
9+
_VERSION = "0.11.5" # reminder: update SHAs below when changing this version
1010

1111
def esbuild_dependencies():
1212
"""Helper to install required dependencies for the esbuild rules"""
@@ -20,7 +20,7 @@ def esbuild_dependencies():
2020
],
2121
strip_prefix = "package",
2222
build_file_content = """exports_files(["bin/esbuild"])""",
23-
sha256 = "d21a722873ed24586f071973b77223553fca466946f3d7e3976eeaccb14424e6",
23+
sha256 = "98436890727bdb0d4beddd9c9e07d0aeff0e8dfe0169f85e568eca0dd43f665e",
2424
)
2525

2626
http_archive(
@@ -30,7 +30,7 @@ def esbuild_dependencies():
3030
],
3131
strip_prefix = "package",
3232
build_file_content = """exports_files(["esbuild.exe"])""",
33-
sha256 = "fe5dcb97b4c47f9567012f0a45c19c655f3d2e0d76932f6dd12715dbebbd6eb0",
33+
sha256 = "589c8ff97210bd41de106e6317ce88f9e88d2cacfd8178ae1217f2b857ff6c3a",
3434
)
3535

3636
http_archive(
@@ -40,5 +40,5 @@ def esbuild_dependencies():
4040
],
4141
strip_prefix = "package",
4242
build_file_content = """exports_files(["bin/esbuild"])""",
43-
sha256 = "60dabe141e5dfcf99e7113bded6012868132068a582a102b258fb7b1cfdac14b",
43+
sha256 = "113c2e84895f4422a3676db4e15d9f01b2b4fac041edab25284fdb9574ba58a0",
4444
)

packages/esbuild/test/splitting/bundle.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ const helper = require(process.env.BAZEL_NODE_RUNFILES_HELPER);
55
const location = helper.resolve('build_bazel_rules_nodejs/packages/esbuild/test/splitting/bundle');
66

77
const main = readFileSync(join(location, 'main.js'), {encoding: 'utf8'});
8-
const hasImportOfCore = main.indexOf(`import("./other.js")`) > -1;
8+
const hasImportOfCore = main.match(/import\(".\/(other-[a-zA-Z0-9]+\.js)"\)/);
99

1010
if (!hasImportOfCore) {
11-
console.error(`Expected entry_point 'main.js' to have an import of './other.js'`);
11+
console.error(`Expected entry_point 'main.js' to have an import of './other-[hash].js'`);
1212
}
1313

1414
// throws if file does not exist
15-
lstatSync(join(location, 'other.js'));
15+
lstatSync(join(location, hasImportOfCore && hasImportOfCore[1]));
1616

1717
process.exit(hasImportOfCore ? 0 : 1);

packages/esbuild/test/typescript/BUILD.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ ts_library(
1919

2020
esbuild(
2121
name = "bundle",
22-
args = ["--keep-names"],
22+
args = [
23+
"--keep-names",
24+
"--resolve-extensions=.mjs,.js",
25+
],
2326
entry_point = "main.ts",
2427
format = "esm",
2528
deps = [":main"],

packages/esbuild/test/typescript/bundle.golden.txt

+4-12
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
66
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
77
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
88
var __name = (target, value) => __defProp(target, "name", {value, configurable: true});
9-
var __commonJS = (callback, module) => () => {
10-
if (!module) {
11-
module = {exports: {}};
12-
callback(module.exports, module);
13-
}
14-
return module.exports;
15-
};
16-
var __exportStar = (target, module, desc) => {
9+
var __commonJS = (cb, mod) => () => (mod || cb((mod = {exports: {}}).exports, mod), mod.exports);
10+
var __reExport = (target, module, desc) => {
1711
if (module && typeof module === "object" || typeof module === "function") {
1812
for (let key of __getOwnPropNames(module))
1913
if (!__hasOwnProp.call(target, key) && key !== "default")
@@ -22,9 +16,7 @@ var __exportStar = (target, module, desc) => {
2216
return target;
2317
};
2418
var __toModule = (module) => {
25-
if (module && module.__esModule)
26-
return module;
27-
return __exportStar(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", {value: module, enumerable: true})), module);
19+
return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? {get: () => module.default, enumerable: true} : {value: module, enumerable: true})), module);
2820
};
2921

3022

@@ -60,7 +52,7 @@ var getId3 = /* @__PURE__ */ __name(() => `generated-module`, "getId");
6052
var getId4 = /* @__PURE__ */ __name(() => "relative-module", "getId");
6153

6254

63-
var ID = `Full ID: ${getId()} - ${getId2()} - ${import_module_dynamic.getId()} - ${getId4()} - ${getId3()}`;
55+
var ID = `Full ID: ${getId()} - ${getId2()} - ${(0, import_module_dynamic.getId)()} - ${getId4()} - ${getId3()}`;
6456
console.log(ID);
6557
export {
6658
ID

0 commit comments

Comments
 (0)