Skip to content

Commit

Permalink
feat: add lifecycle_hooks_use_default_shell_env to npm lifecycle hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
jbedard committed Feb 22, 2024
1 parent 6aa86cf commit 219849d
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 18 deletions.
10 changes: 6 additions & 4 deletions docs/npm_import.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions docs/npm_translate_lock.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions e2e/gyp_no_install_script/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bazel_dep(name = "aspect_bazel_lib", version = "2.4.2")
bazel_dep(name = "aspect_rules_js", version = "0.0.0")
local_path_override(
module_name = "aspect_rules_js",
Expand All @@ -8,6 +9,9 @@ npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
npm.npm_translate_lock(
name = "npm",
data = ["//:package.json"],
lifecycle_hooks_use_default_shell_env = {
"segfault-handler": "true",
},
npmrc = "//:.npmrc",
pnpm_lock = "//:pnpm-lock.yaml",
update_pnpm_lock = True,
Expand Down
7 changes: 6 additions & 1 deletion npm/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def _extension_impl(module_ctx):
lifecycle_hooks_execution_requirements = attr.lifecycle_hooks_execution_requirements,
lifecycle_hooks_exclude = attr.lifecycle_hooks_exclude,
lifecycle_hooks_no_sandbox = attr.lifecycle_hooks_no_sandbox,
lifecycle_hooks_use_default_shell_env = attr.lifecycle_hooks_use_default_shell_env,
link_workspace = attr.link_workspace,
no_optional = attr.no_optional,
npmrc = attr.npmrc,
Expand Down Expand Up @@ -116,12 +117,13 @@ def _extension_impl(module_ctx):
WARNING: Cannot determine home directory in order to load home `.npmrc` file in module extension `npm_translate_lock(name = "{attr_name}")`.
""".format(attr_name = attr.name))

lifecycle_hooks, lifecycle_hooks_execution_requirements = macro_helpers.macro_lifecycle_args_to_rule_attrs(
lifecycle_hooks, lifecycle_hooks_execution_requirements, lifecycle_hooks_use_default_shell_env = macro_helpers.macro_lifecycle_args_to_rule_attrs(
lifecycle_hooks = attr.lifecycle_hooks,
lifecycle_hooks_exclude = attr.lifecycle_hooks_exclude,
run_lifecycle_hooks = attr.run_lifecycle_hooks,
lifecycle_hooks_no_sandbox = attr.lifecycle_hooks_no_sandbox,
lifecycle_hooks_execution_requirements = attr.lifecycle_hooks_execution_requirements,
lifecycle_hooks_use_default_shell_env = attr.lifecycle_hooks_use_default_shell_env,
)
imports = npm_translate_lock_helpers.get_npm_imports(
importers = importers,
Expand All @@ -132,6 +134,7 @@ WARNING: Cannot determine home directory in order to load home `.npmrc` file in
attr = attr,
all_lifecycle_hooks = lifecycle_hooks,
all_lifecycle_hooks_execution_requirements = lifecycle_hooks_execution_requirements,
all_lifecycle_hooks_use_default_shell_env = lifecycle_hooks_use_default_shell_env,
registries = registries,
default_registry = utils.default_registry(),
npm_auth = npm_auth,
Expand All @@ -150,6 +153,7 @@ WARNING: Cannot determine home directory in order to load home `.npmrc` file in
lifecycle_hooks = i.run_lifecycle_hooks if i.run_lifecycle_hooks and i.lifecycle_hooks else [],
lifecycle_hooks_env = i.lifecycle_hooks_env if i.run_lifecycle_hooks and i.lifecycle_hooks_env else {},
lifecycle_hooks_execution_requirements = i.lifecycle_hooks_execution_requirements if i.run_lifecycle_hooks else [],
lifecycle_hooks_use_default_shell_env = i.lifecycle_hooks_use_default_shell_env,
link_packages = i.link_packages,
link_workspace = attr.link_workspace if attr.link_workspace else attr.pnpm_lock.workspace_name,
npm_auth = i.npm_auth,
Expand Down Expand Up @@ -182,6 +186,7 @@ WARNING: Cannot determine home directory in order to load home `.npmrc` file in
lifecycle_hooks_env = i.lifecycle_hooks_env,
lifecycle_hooks_execution_requirements = i.lifecycle_hooks_execution_requirements,
lifecycle_hooks_no_sandbox = i.lifecycle_hooks_no_sandbox,
lifecycle_hooks_use_default_shell_env = i.lifecycle_hooks_use_default_shell_env,
link_packages = i.link_packages,
link_workspace = i.link_workspace,
npm_auth = i.npm_auth,
Expand Down
Loading

0 comments on commit 219849d

Please sign in to comment.