diff --git a/.bazelversion b/.bazelversion index 6c7efdc..b4258ec 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1,4 +1,4 @@ -6.3.2 +6.4.0 # The first line of this file is used by Bazelisk and Bazel to be sure # the right version of Bazel is used to build and test this repo. # This also defines which version is used on CI. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 014f49a..a4358e3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,18 +9,18 @@ default_stages: [commit] repos: # Check formatting and lint for starlark code - repo: https://github.com/keith/pre-commit-buildifier - rev: 4.0.1.1 + rev: 6.4.0 hooks: - id: buildifier - id: buildifier-lint # Enforce that commit messages allow for later changelog generation - repo: https://github.com/commitizen-tools/commitizen - rev: v2.18.0 + rev: v3.13.0 hooks: # Requires that commitizen is already installed - id: commitizen stages: [commit-msg] - repo: https://github.com/pre-commit/mirrors-prettier - rev: 'v2.4.0' + rev: v3.1.0 hooks: - id: prettier diff --git a/BUILD.bazel b/BUILD.bazel index 1a430ed..761ddb9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -12,11 +12,17 @@ gazelle( gazelle = "gazelle_bin", ) +buildifier( + name = "buildifier", + exclude_patterns = ["./.git/*"], + lint_mode = "fix", + mode = "fix", + tags = ["manual"], # tag as manual so windows ci does not build it by default +) + buildifier( name = "buildifier.check", - exclude_patterns = [ - "./.git/*", - ], + exclude_patterns = ["./.git/*"], lint_mode = "warn", mode = "diff", tags = ["manual"], # tag as manual so windows ci does not build it by default diff --git a/MODULE.bazel b/MODULE.bazel index aa790bb..053afc4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,20 +6,22 @@ module( compatibility_level = 1, ) -bazel_dep(name = "bazel_skylib", version = "1.4.1") -bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True) -bazel_dep(name = "gazelle", version = "0.29.0", dev_dependency = True, repo_name = "bazel_gazelle") -bazel_dep(name = "buildifier_prebuilt", version = "6.0.0.1", dev_dependency = True) -bazel_dep(name = "aspect_bazel_lib", version = "1.38.1") -bazel_dep(name = "aspect_rules_js", version = "1.29.2") -bazel_dep(name = "rules_nodejs", version = "5.8.2") -bazel_dep(name = "platforms", version = "0.0.5") +bazel_dep(name = "aspect_bazel_lib", version = "1.39.1") +bazel_dep(name = "aspect_rules_js", version = "1.34.1") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "platforms", version = "0.0.8") +bazel_dep(name = "rules_nodejs", version = "5.8.3") esbuild = use_extension("@aspect_rules_esbuild//esbuild:extensions.bzl", "esbuild") esbuild.toolchain( name = "esbuild", - esbuild_version = "0.16.7", + esbuild_version = "0.19.9", ) use_repo(esbuild, "esbuild_toolchains") +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True) +bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True) +bazel_dep(name = "gazelle", version = "0.35.0", dev_dependency = True, repo_name = "bazel_gazelle") +bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc") + register_toolchains("@esbuild_toolchains//:all") diff --git a/WORKSPACE b/WORKSPACE index 86a4184..7077c5a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,8 +38,8 @@ nodejs_register_toolchains( load("//esbuild:repositories.bzl", "esbuild_register_toolchains") esbuild_register_toolchains( - name = "esbuild14", - esbuild_version = "0.17.10", + name = "esbuild19", + esbuild_version = "0.19.9", ) # Install additional packages to test esbuild plugins @@ -59,10 +59,32 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() +############################################ +# Stardoc +load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories") + +stardoc_repositories() + +load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") + +rules_jvm_external_deps() + +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") + +rules_jvm_external_setup() + +load("@io_bazel_stardoc//:deps.bzl", "stardoc_external_deps") + +stardoc_external_deps() + +load("@stardoc_maven//:defs.bzl", stardoc_pinned_maven_install = "pinned_maven_install") + +stardoc_pinned_maven_install() + ############################################ # Gazelle, for generating bzl_library targets -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") go_rules_dependencies() diff --git a/docs/esbuild.md b/docs/esbuild.md index 26cc664..88ba8b4 100644 --- a/docs/esbuild.md +++ b/docs/esbuild.md @@ -7,10 +7,10 @@ ## esbuild_bundle 
-esbuild_bundle(name, args_file, bazel_sandbox_plugin, bundle, config, data, define, deps,
+esbuild_bundle(name, deps, srcs, data, args_file, bazel_sandbox_plugin, bundle, config, define,
                entry_point, entry_points, esbuild_log_level, external, format, js_log_level, launcher,
                max_threads, metafile, minify, output, output_css, output_dir, output_map, platform,
-               sourcemap, sources_content, splitting, srcs, target, tsconfig)
+               sourcemap, sources_content, splitting, target, tsconfig)
Runs the esbuild bundler under Bazel @@ -21,41 +21,40 @@ Note: esbuild currently follows symlinks and leaves the bazel sandbox, see https For example, escaping the sandbox may require extra configuration such as overriding the default `resolveExtensions` to not load .ts[x] files that are pre-compiled by other rules. - **ATTRIBUTES** | Name | Description | Type | Mandatory | Default | | :------------- | :------------- | :------------- | :------------- | :------------- | | name | A unique name for this target. | Name | required | | -| args_file | Internal use only | Label | optional | None | -| bazel_sandbox_plugin | If true, a custom bazel-sandbox plugin will be enabled that prevents esbuild from leaving the Bazel sandbox. See https://github.com/aspect-build/rules_esbuild/pull/160 for more info. | Boolean | optional | True | -| bundle | If true, esbuild will bundle the input files, inlining their dependencies recursively | Boolean | optional | True | -| config | Configuration file used for esbuild. Note that options set in this file may get overwritten. If you formerly used args from rules_nodejs' npm package @bazel/esbuild, replace it with this attribute. TODO: show how to write a config file that depends on plugins, similar to the esbuild_config macro in rules_nodejs. | Label | optional | None | -| data | Runtime dependencies to include in binaries/tests that depend on this target.

The transitive npm dependencies, transitive sources, default outputs and runfiles of targets in the data attribute are added to the runfiles of this target. They should appear in the '*.runfiles' area of any executable which has a runtime dependency on this target.

If this list contains linked npm packages, npm package store targets or other targets that provide JsInfo, NpmPackageStoreInfo providers are gathered from JsInfo. This is done directly from the npm_package_store_deps field of these. For linked npm package targets, the underlying npm_package_store target(s) that back the links is used. Gathered NpmPackageStoreInfo providers are propagated to the direct dependencies of downstream linked npm_package targets.

NB: Linked npm package targets that are "dev" dependencies do not forward their underlying npm_package_store target(s) through npm_package_store_deps and will therefore not be propagated to the direct dependencies of downstream linked npm_package targets. npm packages that come in from npm_translate_lock are considered "dev" dependencies if they are have dev: true set in the pnpm lock file. This should be all packages that are only listed as "devDependencies" in all package.json files within the pnpm workspace. This behavior is intentional to mimic how devDependencies work in published npm packages. | List of labels | optional | [] | -| define | A dict of global identifier replacements. Values are subject to $(location ...) expansion. Example: 
python esbuild( name = "bundle", define = { "process.env.NODE_ENV": "production" }, )


See https://esbuild.github.io/api/#define for more details | Dictionary: String -> String | optional | {} | -| deps | A list of direct dependencies that are required to build the bundle | List of labels | optional | [] | -| entry_point | The bundle's entry point (e.g. your main.js or app.js or index.js)

This is a shortcut for the entry_points attribute with a single entry. Specify either this attribute or entry_point, but not both. | Label | optional | None | -| entry_points | The bundle's entry points (e.g. your main.js or app.js or index.js)

Specify either this attribute or entry_point, but not both. | List of labels | optional | [] | -| esbuild_log_level | Set the logging level of esbuild.

We set a default of "warmning" since the esbuild default of "info" includes an output file summary which is slightly redundant under Bazel and may lead to spammy bazel build output.

See https://esbuild.github.io/api/#log-level for more details. | String | optional | "warning" | -| external | A list of module names that are treated as external and not included in the resulting bundle

See https://esbuild.github.io/api/#external for more details | List of strings | optional | [] | -| format | The output format of the bundle, defaults to iife when platform is browser and cjs when platform is node. If performing code splitting or multiple entry_points are specified, defaults to esm.

See https://esbuild.github.io/api/#format for more details | String | optional | "" | -| js_log_level | Set the logging level for js_binary launcher and the JavaScript bazel-sandbox plugin.

Log levels: fatal, error, warn, info, debug | String | optional | "error" | -| launcher | Override the default esbuild wrapper, which is supplied by the esbuild toolchain | Label | optional | None | -| max_threads | Sets the GOMAXPROCS variable to limit the number of threads that esbuild can run with. This can be useful if running many esbuild rule invocations in parallel, which has the potential to cause slowdown. For general use, leave this attribute unset. | Integer | optional | 0 | -| metafile | If true, esbuild creates a metafile along with the output | Boolean | optional | False | -| minify | Minifies the bundle with the built in minification. Removes whitespace, shortens identifieres and uses equivalent but shorter syntax.

Sets all --minify-* flags

See https://esbuild.github.io/api/#minify for more details | Boolean | optional | False | +| deps | A list of direct dependencies that are required to build the bundle | List of labels | optional | `[]` | +| srcs | Source files to be made available to esbuild | List of labels | optional | `[]` | +| data | Runtime dependencies to include in binaries/tests that depend on this target.

The transitive npm dependencies, transitive sources, default outputs and runfiles of targets in the `data` attribute are added to the runfiles of this target. They should appear in the '*.runfiles' area of any executable which has a runtime dependency on this target.

If this list contains linked npm packages, npm package store targets or other targets that provide `JsInfo`, `NpmPackageStoreInfo` providers are gathered from `JsInfo`. This is done directly from the `npm_package_store_deps` field of these. For linked npm package targets, the underlying `npm_package_store` target(s) that back the links is used. Gathered `NpmPackageStoreInfo` providers are propagated to the direct dependencies of downstream linked `npm_package` targets.

NB: Linked npm package targets that are "dev" dependencies do not forward their underlying `npm_package_store` target(s) through `npm_package_store_deps` and will therefore not be propagated to the direct dependencies of downstream linked `npm_package` targets. npm packages that come in from `npm_translate_lock` are considered "dev" dependencies if they are have `dev: true` set in the pnpm lock file. This should be all packages that are only listed as "devDependencies" in all `package.json` files within the pnpm workspace. This behavior is intentional to mimic how `devDependencies` work in published npm packages. | List of labels | optional | `[]` | +| args_file | Internal use only | Label | optional | `None` | +| bazel_sandbox_plugin | If true, a custom bazel-sandbox plugin will be enabled that prevents esbuild from leaving the Bazel sandbox. See https://github.com/aspect-build/rules_esbuild/pull/160 for more info. | Boolean | optional | `True` | +| bundle | If true, esbuild will bundle the input files, inlining their dependencies recursively | Boolean | optional | `True` | +| config | Configuration file used for esbuild. Note that options set in this file may get overwritten. If you formerly used `args` from rules_nodejs' npm package `@bazel/esbuild`, replace it with this attribute. TODO: show how to write a config file that depends on plugins, similar to the esbuild_config macro in rules_nodejs. | Label | optional | `None` | +| define | A dict of global identifier replacements. Values are subject to $(location ...) expansion. Example: 
esbuild(
name = "bundle",
define = {
"process.env.NODE_ENV": "production"
},
)


See https://esbuild.github.io/api/#define for more details | Dictionary: String -> String | optional | `{}` | +| entry_point | The bundle's entry point (e.g. your main.js or app.js or index.js)

This is a shortcut for the `entry_points` attribute with a single entry. Specify either this attribute or `entry_point`, but not both. | Label | optional | `None` | +| entry_points | The bundle's entry points (e.g. your main.js or app.js or index.js)

Specify either this attribute or `entry_point`, but not both. | List of labels | optional | `[]` | +| esbuild_log_level | Set the logging level of esbuild.

We set a default of "warmning" since the esbuild default of "info" includes an output file summary which is slightly redundant under Bazel and may lead to spammy `bazel build` output.

See https://esbuild.github.io/api/#log-level for more details. | String | optional | `"warning"` | +| external | A list of module names that are treated as external and not included in the resulting bundle

See https://esbuild.github.io/api/#external for more details | List of strings | optional | `[]` | +| format | The output format of the bundle, defaults to iife when platform is browser and cjs when platform is node. If performing code splitting or multiple entry_points are specified, defaults to esm.

See https://esbuild.github.io/api/#format for more details | String | optional | `""` | +| js_log_level | Set the logging level for js_binary launcher and the JavaScript bazel-sandbox plugin.

Log levels: fatal, error, warn, info, debug | String | optional | `"error"` | +| launcher | Override the default esbuild wrapper, which is supplied by the esbuild toolchain | Label | optional | `None` | +| max_threads | Sets the `GOMAXPROCS` variable to limit the number of threads that esbuild can run with. This can be useful if running many esbuild rule invocations in parallel, which has the potential to cause slowdown. For general use, leave this attribute unset. | Integer | optional | `0` | +| metafile | If true, esbuild creates a metafile along with the output | Boolean | optional | `False` | +| minify | Minifies the bundle with the built in minification. Removes whitespace, shortens identifieres and uses equivalent but shorter syntax.

Sets all --minify-* flags

See https://esbuild.github.io/api/#minify for more details | Boolean | optional | `False` | | output | Name of the output file when bundling | Label | optional | | | output_css | Declare a .css file will be output next to output bundle.

If your JS code contains import statements that import .css files, esbuild will place the content in a file next to the main output file, which you'll need to declare. If your output file is named 'foo.js', you should set this to 'foo.css'. | Label | optional | | -| output_dir | If true, esbuild produces an output directory containing all output files | Boolean | optional | False | +| output_dir | If true, esbuild produces an output directory containing all output files | Boolean | optional | `False` | | output_map | Name of the output source map when bundling | Label | optional | | -| platform | The platform to bundle for.

See https://esbuild.github.io/api/#platform for more details | String | optional | "browser" | -| sourcemap | Defines where sourcemaps are output and how they are included in the bundle. If linked, a separate .js.map file is generated and referenced by the bundle. If external, a separate .js.map file is generated but not referenced by the bundle. If inline, a sourcemap is generated and its contents are inlined into the bundle (and no external sourcemap file is created). If both, a sourcemap is inlined and a .js.map file is created.

See https://esbuild.github.io/api/#sourcemap for more details | String | optional | "" | -| sources_content | If False, omits the sourcesContent field from generated source maps

See https://esbuild.github.io/api/#sources-content for more details | Boolean | optional | False | -| splitting | If true, esbuild produces an output directory containing all the output files from code splitting for multiple entry points

See https://esbuild.github.io/api/#splitting and https://esbuild.github.io/api/#entry-points for more details | Boolean | optional | False | -| srcs | Source files to be made available to esbuild | List of labels | optional | [] | -| target | Environment target (e.g. es2017, chrome58, firefox57, safari11, edge16, node10, esnext). Default es2015.

See https://esbuild.github.io/api/#target for more details | String | optional | "es2015" | -| tsconfig | TypeScript configuration file used by esbuild. Default to an empty file with no configuration.

See https://esbuild.github.io/api/#tsconfig for more details | Label | required | | +| platform | The platform to bundle for.

See https://esbuild.github.io/api/#platform for more details | String | optional | `"browser"` | +| sourcemap | Defines where sourcemaps are output and how they are included in the bundle. If `linked`, a separate `.js.map` file is generated and referenced by the bundle. If `external`, a separate `.js.map` file is generated but not referenced by the bundle. If `inline`, a sourcemap is generated and its contents are inlined into the bundle (and no external sourcemap file is created). If `both`, a sourcemap is inlined and a `.js.map` file is created.

See https://esbuild.github.io/api/#sourcemap for more details | String | optional | `""` | +| sources_content | If False, omits the `sourcesContent` field from generated source maps

See https://esbuild.github.io/api/#sources-content for more details | Boolean | optional | `False` | +| splitting | If true, esbuild produces an output directory containing all the output files from code splitting for multiple entry points

See https://esbuild.github.io/api/#splitting and https://esbuild.github.io/api/#entry-points for more details | Boolean | optional | `False` | +| target | Environment target (e.g. es2017, chrome58, firefox57, safari11, edge16, node10, esnext). Default es2015.

See https://esbuild.github.io/api/#target for more details | String | optional | `"es2015"` | +| tsconfig | TypeScript configuration file used by esbuild. Default to an empty file with no configuration.

See https://esbuild.github.io/api/#tsconfig for more details | Label | required | | diff --git a/docs/rules.md b/docs/rules.md index fe72aaf..146246d 100644 --- a/docs/rules.md +++ b/docs/rules.md @@ -21,9 +21,9 @@ For a full list of attributes, see the [`esbuild_bundle`](./esbuild.md) rule | Name | Description | Default Value | | :------------- | :------------- | :------------- | | name | The name used for this rule and output files | none | -| output_dir | If True, produce an output directory | False | -| splitting | If True, produce a code split bundle in the output directory | False | -| config | an esbuild configuration file Can be a dictionary. In this case it is converted to json, and a config file is generated which exports the resulting object, e.g. export default {...} | None | -| kwargs | All other args from esbuild_bundle | none | +| output_dir | If `True`, produce an output directory | `False` | +| splitting | If `True`, produce a code split bundle in the output directory | `False` | +| config | an esbuild configuration file Can be a dictionary. In this case it is converted to json, and a config file is generated which exports the resulting object, e.g. `export default {...}` | `None` | +| kwargs | All other args from `esbuild_bundle` | none | diff --git a/e2e/bundle/MODULE.bazel b/e2e/bundle/MODULE.bazel index 4e53fc7..2b92387 100644 --- a/e2e/bundle/MODULE.bazel +++ b/e2e/bundle/MODULE.bazel @@ -1,7 +1,7 @@ "Bazel dependencies" bazel_dep(name = "aspect_rules_esbuild", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "aspect_bazel_lib", version = "1.36.0", dev_dependency = True) +bazel_dep(name = "aspect_bazel_lib", version = "1.39.1", dev_dependency = True) local_path_override( module_name = "aspect_rules_esbuild", diff --git a/e2e/npm-links/MODULE.bazel b/e2e/npm-links/MODULE.bazel index fa9db98..cc68347 100644 --- a/e2e/npm-links/MODULE.bazel +++ b/e2e/npm-links/MODULE.bazel @@ -1,8 +1,8 @@ "Bazel dependencies" bazel_dep(name = "aspect_rules_esbuild", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "aspect_rules_js", version = "1.29.2", dev_dependency = True) -bazel_dep(name = "bazel_skylib", version = "1.4.1") +bazel_dep(name = "aspect_rules_js", version = "1.34.1", dev_dependency = True) +bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True) local_path_override( module_name = "aspect_rules_esbuild", diff --git a/e2e/npm-links/consumer/BUILD.bazel b/e2e/npm-links/consumer/BUILD.bazel index bef16db..6d16d09 100644 --- a/e2e/npm-links/consumer/BUILD.bazel +++ b/e2e/npm-links/consumer/BUILD.bazel @@ -1,8 +1,8 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_rules_js//js:defs.bzl", "js_library") +load("@aspect_rules_js//npm:defs.bzl", "npm_package") load("@bazel_skylib//rules:build_test.bzl", "build_test") load("@bazel_skylib//rules:write_file.bzl", "write_file") -load("@aspect_rules_js//npm:defs.bzl", "npm_package") # Source consuming that named library js_library( diff --git a/e2e/npm-links/lib/BUILD.bazel b/e2e/npm-links/lib/BUILD.bazel index fbe31e4..6ed172c 100644 --- a/e2e/npm-links/lib/BUILD.bazel +++ b/e2e/npm-links/lib/BUILD.bazel @@ -1,5 +1,5 @@ -load("@bazel_skylib//rules:write_file.bzl", "write_file") load("@aspect_rules_js//npm:defs.bzl", "npm_package") +load("@bazel_skylib//rules:write_file.bzl", "write_file") # A named + linked library npm_package( diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel index 00a5250..065d5dd 100644 --- a/e2e/smoke/MODULE.bazel +++ b/e2e/smoke/MODULE.bazel @@ -1,7 +1,7 @@ "Bazel dependencies" bazel_dep(name = "aspect_rules_esbuild", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "bazel_skylib", version = "1.4.1", dev_dependency = True) +bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True) local_path_override( module_name = "aspect_rules_esbuild", diff --git a/e2e/sourcemaps/MODULE.bazel b/e2e/sourcemaps/MODULE.bazel index 00a5250..065d5dd 100644 --- a/e2e/sourcemaps/MODULE.bazel +++ b/e2e/sourcemaps/MODULE.bazel @@ -1,7 +1,7 @@ "Bazel dependencies" bazel_dep(name = "aspect_rules_esbuild", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "bazel_skylib", version = "1.4.1", dev_dependency = True) +bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True) local_path_override( module_name = "aspect_rules_esbuild", diff --git a/e2e/tsconfig/BUILD.bazel b/e2e/tsconfig/BUILD.bazel index 9b40252..8d1b85f 100644 --- a/e2e/tsconfig/BUILD.bazel +++ b/e2e/tsconfig/BUILD.bazel @@ -1,5 +1,5 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains") +load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") SRCS = [ "main.js", diff --git a/e2e/tsconfig/MODULE.bazel b/e2e/tsconfig/MODULE.bazel index cfb465e..2b92387 100644 --- a/e2e/tsconfig/MODULE.bazel +++ b/e2e/tsconfig/MODULE.bazel @@ -1,7 +1,7 @@ "Bazel dependencies" bazel_dep(name = "aspect_rules_esbuild", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "aspect_bazel_lib", version = "1.29.2", dev_dependency = True) +bazel_dep(name = "aspect_bazel_lib", version = "1.39.1", dev_dependency = True) local_path_override( module_name = "aspect_rules_esbuild", diff --git a/esbuild/dependencies.bzl b/esbuild/dependencies.bzl index 9413f54..0e47058 100644 --- a/esbuild/dependencies.bzl +++ b/esbuild/dependencies.bzl @@ -8,26 +8,26 @@ load("//esbuild/private:maybe.bzl", http_archive = "maybe_http_archive") def rules_esbuild_dependencies(): http_archive( name = "bazel_skylib", - sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7", - urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz"], + sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"], ) http_archive( name = "aspect_bazel_lib", - sha256 = "262e3d6693cdc16dd43880785cdae13c64e6a3f63f75b1993c716295093d117f", - strip_prefix = "bazel-lib-1.38.1", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.1/bazel-lib-v1.38.1.tar.gz", + sha256 = "5e9588d8407a576771f1e0d8956f541f78610f1b6e4cca29af2a096fccfe3b24", + strip_prefix = "bazel-lib-1.39.1", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.39.1/bazel-lib-v1.39.1.tar.gz", ) http_archive( name = "aspect_rules_js", - sha256 = "d9ceb89e97bb5ad53b278148e01a77a3e9100db272ce4ebdcd59889d26b9076e", - strip_prefix = "rules_js-1.34.0", - url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.0/rules_js-v1.34.0.tar.gz", + sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643", + strip_prefix = "rules_js-1.34.1", + url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz", ) http_archive( name = "rules_nodejs", - sha256 = "764a3b3757bb8c3c6a02ba3344731a3d71e558220adcb0cf7e43c9bba2c37ba8", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.2/rules_nodejs-core-5.8.2.tar.gz"], + sha256 = "8fc8e300cb67b89ceebd5b8ba6896ff273c84f6099fc88d23f24e7102319d8fd", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.4/rules_nodejs-core-5.8.4.tar.gz"], ) diff --git a/esbuild/private/esbuild.bzl b/esbuild/private/esbuild.bzl index 7d1ae57..f6c493f 100644 --- a/esbuild/private/esbuild.bzl +++ b/esbuild/private/esbuild.bzl @@ -1,7 +1,7 @@ "# esbuild rule" -load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_variables") load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "COPY_FILE_TO_BIN_TOOLCHAINS", "copy_file_to_bin_action", "copy_files_to_bin_actions") +load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_variables") load("@aspect_rules_js//js:libs.bzl", "js_lib_constants", "js_lib_helpers") load("@aspect_rules_js//js:providers.bzl", "JsInfo", "js_info") load(":helpers.bzl", "desugar_entry_point_names", "write_args_file") diff --git a/examples/banner/BUILD.bazel b/examples/banner/BUILD.bazel index da76947..e704d7f 100644 --- a/examples/banner/BUILD.bazel +++ b/examples/banner/BUILD.bazel @@ -1,7 +1,7 @@ "Demonstrates how to put a banner on output files, see https://esbuild.github.io/api/#banner" -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") +load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") esbuild( name = "banner_newline", diff --git a/examples/define/BUILD.bazel b/examples/define/BUILD.bazel index f89311d..00e2acd 100644 --- a/examples/define/BUILD.bazel +++ b/examples/define/BUILD.bazel @@ -1,7 +1,7 @@ "Demonstrates how to put a banner on output files, see https://esbuild.github.io/api/#banner" -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") +load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") esbuild( name = "bundle_production", diff --git a/examples/format/BUILD.bazel b/examples/format/BUILD.bazel index 98db3dc..abf7f7f 100644 --- a/examples/format/BUILD.bazel +++ b/examples/format/BUILD.bazel @@ -1,7 +1,7 @@ load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test") -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path") +load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") +load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") FORMATS = [ "iife", diff --git a/examples/splitting/BUILD.bazel b/examples/splitting/BUILD.bazel index 8321c28..029322b 100644 --- a/examples/splitting/BUILD.bazel +++ b/examples/splitting/BUILD.bazel @@ -1,7 +1,7 @@ -load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("@aspect_bazel_lib//lib:copy_file.bzl", "copy_file") load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path") load("@aspect_bazel_lib//lib:output_files.bzl", "output_files") +load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") load("//examples:asserts.bzl", "assert_contains") esbuild( diff --git a/internal_deps.bzl b/internal_deps.bzl index c70a076..3d887b6 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -13,43 +13,38 @@ def rules_esbuild_internal_deps(): # opt-in to 2.0 without forcing users to do so http_archive( name = "aspect_bazel_lib", - sha256 = "4b32cf6feab38b887941db022020eea5a49b848e11e3d6d4d18433594951717a", - strip_prefix = "bazel-lib-2.0.1", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.0.1/bazel-lib-v2.0.1.tar.gz", + sha256 = "fc8bd670380eaba5314769abbe9fee21d641e3da06d9d26b8073a301f6d62332", + strip_prefix = "bazel-lib-2.1.0", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.1.0/bazel-lib-v2.1.0.tar.gz", ) http_archive( name = "io_bazel_rules_go", - sha256 = "099a9fb96a376ccbbb7d291ed4ecbdfd42f6bc822ab77ae6f1b5cb9e914e94fa", - urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.35.0/rules_go-v0.35.0.zip"], + sha256 = "7c76d6236b28ff695aa28cf35f95de317a9472fd1fb14ac797c9bf684f09b37c", + urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.44.2/rules_go-v0.44.2.zip"], ) http_archive( name = "bazel_gazelle", - sha256 = "448e37e0dbf61d6fa8f00aaa12d191745e14f07c31cabfa731f0c8e8a4f41b97", - urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.28.0/bazel-gazelle-v0.28.0.tar.gz"], + sha256 = "32938bda16e6700063035479063d9d24c60eda8d79fd4739563f50d331cb3209", + urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz"], ) http_archive( name = "bazel_skylib_gazelle_plugin", - sha256 = "0a466b61f331585f06ecdbbf2480b9edf70e067a53f261e0596acd573a7d2dc3", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-gazelle-plugin-1.4.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-gazelle-plugin-1.4.1.tar.gz", - ], + sha256 = "747addf3f508186234f6232674dd7786743efb8c68619aece5fb0cac97b8f415", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz"], ) http_archive( name = "io_bazel_stardoc", - sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb", - urls = ["https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz"], + sha256 = "62bd2e60216b7a6fec3ac79341aa201e0956477e7c8f6ccc286f279ad1d96432", + urls = ["https://github.com/bazelbuild/stardoc/releases/download/0.6.2/stardoc-0.6.2.tar.gz"], ) http_archive( name = "buildifier_prebuilt", - sha256 = "e46c16180bc49487bfd0f1ffa7345364718c57334fa0b5b67cb5f27eba10f309", - strip_prefix = "buildifier-prebuilt-6.1.0", - urls = [ - "https://github.com/keith/buildifier-prebuilt/archive/6.1.0.tar.gz", - ], + sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e", + strip_prefix = "buildifier-prebuilt-6.4.0", + urls = ["http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz"], )