wip

Author: jbedard

docs/js_run_binary.md

@@ -401,6 +401,8 @@ def _bash_launcher(ctx, nodeinfo, entry_point_path, log_prefix_rule_set, log_pre
     if ctx.attr.patch_node_fs:
         # Set patch node fs API env if not already set to allow js_run_binary to override
         envs.append(_ENV_SET_IFF_NOT_SET.format(var = "JS_BINARY__PATCH_NODE_FS", value = "1"))
+        if ctx.attr.patch_node_esm_loader:
+            envs.append(_ENV_SET_IFF_NOT_SET.format(var = "JS_BINARY__PATCH_NODE_ESM_LOADER", value = "1"))
 
     if ctx.attr.expected_exit_code:
         envs.append(_ENV_SET.format(
@@ -576,18 +578,11 @@ def _create_launcher(ctx, log_prefix_rule_set, log_prefix_rule, fixed_args = [],
     )
 
 def _js_binary_impl(ctx):
-    # Only apply lstat patch if it's requested
-    JS_BINARY__PATCH_NODE_ESM_LOADER = "1" if ctx.attr.patch_node_esm_loader else "0"
-    fixed_env = {
-        "JS_BINARY__PATCH_NODE_ESM_LOADER": JS_BINARY__PATCH_NODE_ESM_LOADER,
-    }
-
     launcher = _create_launcher(
         ctx,
         log_prefix_rule_set = "aspect_rules_js",
         log_prefix_rule = "js_test" if ctx.attr.testonly else "js_binary",
         fixed_args = ctx.attr.fixed_args,
-        fixed_env = fixed_env,
     )
     runfiles = launcher.runfiles
 

js/private/js_binary.bzl

@@ -43,6 +43,7 @@ def js_run_binary(
         execution_requirements = None,
         stamp = 0,
         patch_node_fs = True,
+        patch_node_esm_loader = False,
         allow_execroot_entry_point_with_no_copy_data_to_bin = False,
         use_default_shell_env = None,
         **kwargs):
@@ -224,6 +225,8 @@ def js_run_binary(
             When disabled, node programs can leave the execroot, runfiles and sandbox by following symlinks
             which can lead to non-hermetic behavior.
 
+        patch_node_esm_loader: additionally patch the Node.js ESM loader
+
         allow_execroot_entry_point_with_no_copy_data_to_bin: Turn off validation that the `js_binary` tool
             has `copy_data_to_bin` set to True when `use_execroot_entry_point` is set to True.
 
@@ -337,6 +340,11 @@ WARNING: js_library 'include_declarations' is deprecated. Use 'include_types' in
     # Disable node patches if requested
     if patch_node_fs:
         fixed_env["JS_BINARY__PATCH_NODE_FS"] = "1"
+
+        if patch_node_esm_loader:
+            fixed_env["JS_BINARY__PATCH_NODE_ESM_LOADER"] = "1"
+        else:
+            fixed_env["JS_BINARY__PATCH_NODE_ESM_LOADER"] = "0"
     else:
         # Set explicitly to "0" so disable overrides any enable in the js_binary
         fixed_env["JS_BINARY__PATCH_NODE_FS"] = "0"