From 574549077493704e80c265a398e14d0a125cbd8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 01:59:21 +0000 Subject: [PATCH 1/3] Bump dependabot/fetch-metadata from 1.5.0 to 1.5.1 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee0d9da69a..600b771c5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Fetch Dependabot metadata id: dependabot-metadata - uses: dependabot/fetch-metadata@v1.5.0 + uses: dependabot/fetch-metadata@v1.5.1 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: 'Merge (if dependabot)' From 07332cd8a093d4cdea607d5a941699a7e666bd9b Mon Sep 17 00:00:00 2001 From: Zemnmez's Renovate Bot Date: Tue, 23 May 2023 18:49:29 -0700 Subject: [PATCH 2/3] Update dependabot/fetch-metadata action to v1.5.1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee0d9da69a..600b771c5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Fetch Dependabot metadata id: dependabot-metadata - uses: dependabot/fetch-metadata@v1.5.0 + uses: dependabot/fetch-metadata@v1.5.1 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: 'Merge (if dependabot)' From ea84de96cac1f0a59137520622da5e1db6d0dfe6 Mon Sep 17 00:00:00 2001 From: Thomas Neil James Shadwell Date: Wed, 24 May 2023 13:43:57 +0900 Subject: [PATCH 3/3] fix absolute import issue --- deploy/BUILD.bazel | 6 ++++-- js/rules.bzl | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/deploy/BUILD.bazel b/deploy/BUILD.bazel index 1d13b40ec1..72b84a0555 100644 --- a/deploy/BUILD.bazel +++ b/deploy/BUILD.bazel @@ -36,8 +36,10 @@ ts_project( js_binary( name = "release", - data = [":release_src"], - entry_point = "release.ts", + data = [ + ":release_src" + ], + entry_point = "release.js", ) js_test( diff --git a/js/rules.bzl b/js/rules.bzl index a634c867e3..851477d730 100644 --- a/js/rules.bzl +++ b/js/rules.bzl @@ -3,11 +3,16 @@ load("@aspect_rules_js//npm:defs.bzl", _npm_link_package = "npm_link_package", _ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin") load("//js/copy_to_local:copy_to_local.bzl", _copy_to_local = "copy_to_local") -def js_binary(name, **kwargs): - _js_binary(name = name, **kwargs) +def _apply_env_defaults(d): + return d | {"NODE_PATH": "."} -def js_test(name, **kwargs): - _js_test(name = name, env = {"NODE_PATH": "."}, **kwargs) +def js_binary(name, env = {}, **kwargs): + env = _apply_env_defaults(env) + _js_binary(name = name, env = env, **kwargs) + +def js_test(name, env = {}, **kwargs): + env = _apply_env_defaults(env) + _js_test(name = name, env = env, **kwargs) def js_library(name, **kwargs): _js_library(name = name, **kwargs) @@ -18,8 +23,10 @@ def copy_to_bin(name, **kwargs): def pkg_npm(name, **kwargs): _pkg_npm(name = name, **kwargs) -def js_run_binary(name, **kwargs): - _js_run_binary(name = name, env = {"NODE_PATH": "."}, **kwargs) +def js_run_binary(name, env = {}, **kwargs): + env = _apply_env_defaults(env) + + _js_run_binary(name = name, env = env, **kwargs) def npm_link_package(name, **kwargs): _npm_link_package(name = name, **kwargs)