From 63160c59b7c709bf0dcb28b8f156c3a47928b517 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Fri, 26 Mar 2021 13:40:24 -0700 Subject: [PATCH] fix(esbuild): update to esbuild 0.10.0 Fixes #2552 --- examples/esbuild/WORKSPACE | 8 +-- packages/esbuild/_README.md | 2 +- packages/esbuild/esbuild.bzl | 4 +- packages/esbuild/esbuild_repo.bzl | 8 +-- .../esbuild/test/typescript/bundle.golden.txt | 54 +++++++++++++------ 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/examples/esbuild/WORKSPACE b/examples/esbuild/WORKSPACE index 92e689924f..851709a072 100644 --- a/examples/esbuild/WORKSPACE +++ b/examples/esbuild/WORKSPACE @@ -25,12 +25,12 @@ http_archive( urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.3/rules_nodejs-3.2.3.tar.gz"], ) -_ESBUILD_VERSION = "0.8.48" +_ESBUILD_VERSION = "0.10.0" http_archive( name = "esbuild_darwin", build_file_content = """exports_files(["bin/esbuild"])""", - sha256 = "d21a722873ed24586f071973b77223553fca466946f3d7e3976eeaccb14424e6", + sha256 = "09765dac7f614897a9df422a63354305bf9b861d6d6d87d6bb5fdacde633090c", strip_prefix = "package", urls = [ "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-%s.tgz" % _ESBUILD_VERSION, @@ -40,7 +40,7 @@ http_archive( http_archive( name = "esbuild_windows", build_file_content = """exports_files(["esbuild.exe"])""", - sha256 = "fe5dcb97b4c47f9567012f0a45c19c655f3d2e0d76932f6dd12715dbebbd6eb0", + sha256 = "5a5f84f1fc7eaf8be461e550a0698bfd1a140dd3902d6881f7b812cd7f49852c", strip_prefix = "package", urls = [ "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-%s.tgz" % _ESBUILD_VERSION, @@ -50,7 +50,7 @@ http_archive( http_archive( name = "esbuild_linux", build_file_content = """exports_files(["bin/esbuild"])""", - sha256 = "60dabe141e5dfcf99e7113bded6012868132068a582a102b258fb7b1cfdac14b", + sha256 = "1208fdef28f052cfbef308401040a9d7635401333ed8e9c60930fb2e77777309", strip_prefix = "package", urls = [ "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-%s.tgz" % _ESBUILD_VERSION, diff --git a/packages/esbuild/_README.md b/packages/esbuild/_README.md index 59135f1805..4751a38999 100644 --- a/packages/esbuild/_README.md +++ b/packages/esbuild/_README.md @@ -18,7 +18,7 @@ yarn add -D @bazel/esbuild Add an `http_archive` fetching the esbuild binary for each platform that you need to support. ```python -_ESBUILD_VERSION = "0.8.48" # reminder: update SHAs below when changing this value +_ESBUILD_VERSION = "0.10.0" # reminder: update SHAs below when changing this value http_archive( name = "esbuild_darwin", urls = [ diff --git a/packages/esbuild/esbuild.bzl b/packages/esbuild/esbuild.bzl index ca64ee6694..e562711e42 100644 --- a/packages/esbuild/esbuild.bzl +++ b/packages/esbuild/esbuild.bzl @@ -68,8 +68,8 @@ def _esbuild_impl(ctx): args.add_all(ctx.attr.define, format_each = "--define:%s") args.add_all(ctx.attr.external, format_each = "--external:%s") - # disable the error limit and show all errors - args.add_joined(["--error-limit", "0"], join_with = "=") + # disable the log limit and show all logs + args.add_joined(["--log-limit", "0"], join_with = "=") if ctx.attr.minify: args.add("--minify") diff --git a/packages/esbuild/esbuild_repo.bzl b/packages/esbuild/esbuild_repo.bzl index 2b9cbcba21..c1ca11ade4 100644 --- a/packages/esbuild/esbuild_repo.bzl +++ b/packages/esbuild/esbuild_repo.bzl @@ -6,7 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # IMPORTANT: Keep this file in sync with the documentation in _README.md -_VERSION = "0.8.48" # reminder: update SHAs below when changing this version +_VERSION = "0.10.0" # reminder: update SHAs below when changing this version def esbuild_dependencies(): """Helper to install required dependencies for the esbuild rules""" @@ -20,7 +20,7 @@ def esbuild_dependencies(): ], strip_prefix = "package", build_file_content = """exports_files(["bin/esbuild"])""", - sha256 = "d21a722873ed24586f071973b77223553fca466946f3d7e3976eeaccb14424e6", + sha256 = "09765dac7f614897a9df422a63354305bf9b861d6d6d87d6bb5fdacde633090c", ) http_archive( @@ -30,7 +30,7 @@ def esbuild_dependencies(): ], strip_prefix = "package", build_file_content = """exports_files(["esbuild.exe"])""", - sha256 = "fe5dcb97b4c47f9567012f0a45c19c655f3d2e0d76932f6dd12715dbebbd6eb0", + sha256 = "5a5f84f1fc7eaf8be461e550a0698bfd1a140dd3902d6881f7b812cd7f49852c", ) http_archive( @@ -40,5 +40,5 @@ def esbuild_dependencies(): ], strip_prefix = "package", build_file_content = """exports_files(["bin/esbuild"])""", - sha256 = "60dabe141e5dfcf99e7113bded6012868132068a582a102b258fb7b1cfdac14b", + sha256 = "1208fdef28f052cfbef308401040a9d7635401333ed8e9c60930fb2e77777309", ) diff --git a/packages/esbuild/test/typescript/bundle.golden.txt b/packages/esbuild/test/typescript/bundle.golden.txt index 9039c1c4c2..caad5e193a 100644 --- a/packages/esbuild/test/typescript/bundle.golden.txt +++ b/packages/esbuild/test/typescript/bundle.golden.txt @@ -6,13 +6,7 @@ var __getOwnPropNames = Object.getOwnPropertyNames; var __getOwnPropDesc = Object.getOwnPropertyDescriptor; var __markAsModule = (target) => __defProp(target, "__esModule", {value: true}); var __name = (target, value) => __defProp(target, "name", {value, configurable: true}); -var __commonJS = (callback, module) => () => { - if (!module) { - module = {exports: {}}; - callback(module.exports, module); - } - return module.exports; -}; +var __commonJS = (cb, mod) => () => (mod || cb((mod = {exports: {}}).exports, mod), mod.exports); var __exportStar = (target, module, desc) => { if (module && typeof module === "object" || typeof module === "function") { for (let key of __getOwnPropNames(module)) @@ -22,9 +16,7 @@ var __exportStar = (target, module, desc) => { return target; }; var __toModule = (module) => { - if (module && module.__esModule) - return module; - return __exportStar(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", {value: module, enumerable: true})), module); + return __exportStar(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? {get: () => module.default, enumerable: true} : {value: module, enumerable: true})), module); }; @@ -45,22 +37,52 @@ var require_module_dynamic = __commonJS((exports, module) => { }); -var import_module_dynamic = __toModule(require_module_dynamic()); +var require_lib = __commonJS((exports, module) => { + (function(factory) { + if (typeof module === "object" && typeof module.exports === "object") { + var v = factory(require, exports); + if (v !== void 0) + module.exports = v; + } else if (typeof define === "function" && define.amd) { + define("build_bazel_rules_nodejs/packages/esbuild/test/typescript/generated-module/lib", ["require", "exports"], factory); + } + })(function(require2, exports2) { + "use strict"; + Object.defineProperty(exports2, "__esModule", {value: true}); + exports2.getId = () => `generated-module`; + }); +}); -var getId = /* @__PURE__ */ __name(() => "module-one", "getId"); +var require_lib2 = __commonJS((exports, module) => { + (function(factory) { + if (typeof module === "object" && typeof module.exports === "object") { + var v = factory(require, exports); + if (v !== void 0) + module.exports = v; + } else if (typeof define === "function" && define.amd) { + define("build_bazel_rules_nodejs/packages/esbuild/test/typescript/relative-module/lib", ["require", "exports"], factory); + } + })(function(require2, exports2) { + "use strict"; + Object.defineProperty(exports2, "__esModule", {value: true}); + exports2.getId = () => "relative-module"; + }); +}); -var getId2 = /* @__PURE__ */ __name(() => "module-two", "getId"); +var import_module_dynamic = __toModule(require_module_dynamic()); -var getId3 = /* @__PURE__ */ __name(() => `generated-module`, "getId"); +var getId = /* @__PURE__ */ __name(() => "module-one", "getId"); -var getId4 = /* @__PURE__ */ __name(() => "relative-module", "getId"); +var getId2 = /* @__PURE__ */ __name(() => "module-two", "getId"); -var ID = `Full ID: ${getId()} - ${getId2()} - ${import_module_dynamic.getId()} - ${getId4()} - ${getId3()}`; +var import_lib = __toModule(require_lib()); +var import_lib2 = __toModule(require_lib2()); +var ID = `Full ID: ${getId()} - ${getId2()} - ${(0, import_module_dynamic.getId)()} - ${(0, import_lib2.getId)()} - ${(0, import_lib.getId)()}`; console.log(ID); export { ID