Skip to content

Commit df18c61

Browse files
authored
fix(builtin): don't set --preserve-symlinks-main by default (#2176)
1 parent f7819fc commit df18c61

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

internal/node/node_repositories.bzl

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ See https://docs.bazel.build/versions/master/skylark/repository_rules.html
1919
"""
2020

2121
load("//internal/common:check_bazel_version.bzl", "check_bazel_version")
22-
load("//internal/common:check_version.bzl", "check_version")
2322
load("//internal/common:os_name.bzl", "OS_ARCH_NAMES", "os_name")
2423
load("//internal/node:node_versions.bzl", "NODE_VERSIONS")
2524
load("//third_party/github.com/bazelbuild/bazel-skylib:lib/paths.bzl", "paths")
@@ -189,9 +188,7 @@ a stronger guarantee of hermeticity which is required for remote execution.""",
189188
allow_single_file = True,
190189
doc = """the local path to a pre-installed NodeJS runtime.
191190
192-
If set then also set node_version to the version that of node that is vendored.
193-
Bazel will automatically turn on features such as --preserve-symlinks-main if they
194-
are supported by the node version being used.""",
191+
If set then also set node_version to the version that of node that is vendored.""",
195192
),
196193
"vendored_yarn": attr.label(
197194
allow_single_file = True,
@@ -413,13 +410,7 @@ def _prepare_node(repository_ctx):
413410
yarn_script_relative = yarn_script if repository_ctx.attr.vendored_yarn else paths.relativize(yarn_script, "bin")
414411

415412
if repository_ctx.attr.preserve_symlinks:
416-
# --preserve-symlinks-main flag added in node 10.2.0
417-
# See https://nodejs.org/api/cli.html#cli_preserve_symlinks_main
418-
preserve_symlinks_main_support = check_version(repository_ctx.attr.node_version, "10.2.0")
419-
if preserve_symlinks_main_support:
420-
node_args = "--preserve-symlinks --preserve-symlinks-main"
421-
else:
422-
node_args = "--preserve-symlinks"
413+
node_args = "--preserve-symlinks"
423414
else:
424415
node_args = ""
425416

0 commit comments

Comments
 (0)