Skip to content

Commit

Permalink
refactor: maintain backward compat with include_npm_linked_packages
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Apr 9, 2024
1 parent d46d77f commit ec6e3bd
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
26 changes: 26 additions & 0 deletions js/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,43 @@ load(
_js_image_layer = "js_image_layer",
)

# buildifier: disable=function-docstring
def js_binary(**kwargs):
include_npm_deps = kwargs.pop("include_npm_deps", True)

# For backward compat
# TODO(3.0): remove backward compat handling
include_npm_linked_packages = kwargs.pop("include_npm_linked_packages", None)
if include_npm_linked_packages != None:
# buildifier: disable=print
print("""
WARNING: js_binary 'include_npm_linked_packages' is deprecated. Use 'include_npm_deps' instead.""")
include_npm_deps = include_npm_linked_packages

_js_binary(
include_npm_deps = include_npm_deps,
enable_runfiles = select({
Label("@aspect_bazel_lib//lib:enable_runfiles"): True,
"//conditions:default": False,
}),
**kwargs
)

# buildifier: disable=function-docstring
def js_test(**kwargs):
include_npm_deps = kwargs.pop("include_npm_deps", True)

# For backward compat
# TODO(3.0): remove backward compat handling
include_npm_linked_packages = kwargs.pop("include_npm_linked_packages", None)
if include_npm_linked_packages != None:
# buildifier: disable=print
print("""
WARNING: js_test 'include_npm_linked_packages' is deprecated. Use 'include_npm_deps' instead.""")
include_npm_deps = include_npm_linked_packages

_js_test(
include_npm_deps = include_npm_deps,
enable_runfiles = select({
Label("@aspect_bazel_lib//lib:enable_runfiles"): True,
"//conditions:default": False,
Expand Down
9 changes: 9 additions & 0 deletions js/private/js_run_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,15 @@ def js_run_binary(
if "deps" in kwargs.keys():
fail("Use srcs instead of deps in js_run_binary: https://docs.aspect.build/rules/aspect_rules_js/docs/js_run_binary#srcs")

# For backward compat
# TODO(3.0): remove backward compat handling
include_npm_linked_packages = kwargs.pop("include_npm_linked_packages", None)
if include_npm_linked_packages != None:
# buildifier: disable=print
print("""
WARNING: js_run_binary 'include_npm_linked_packages' is deprecated. Use 'include_npm_deps' instead.""")
include_npm_deps = include_npm_linked_packages

extra_srcs = []

# Hoist js provider files to DefaultInfo
Expand Down

0 comments on commit ec6e3bd

Please sign in to comment.