fix(builtin): when running vendored yarn, prefix command with path to…

… node (#3255)

Otherwise we fall through to the system node on the PATH which may not be set, or may be skewed

examples/BUILD.bazel

@@ -216,10 +216,7 @@ example_integration_test(
     npm_packages = {
         "//packages/jasmine:npm_package": "@bazel/jasmine",
     },
-    # Needs some thought about how to invoke "node.exe path/to/yarn.js on windows to avoid
-    # Error in fail: yarn --version failed:  (java.io.IOException: ERROR: src/main/native/windows/process.cc(202):
-    # CreateProcessW("C:\users\b\_bazel_b\ag3rxjdr\external\vendored_yarn_1_10_0\yarn-v1.10.0\bin\yarn.js" --version):
-    # %1 is not a valid Win32 application.
+    # TODO: make it find node.exe rather than rely on us writing a .cmd wrapper
     tags = ["no-bazelci-windows"],
 )
 

examples/vendored_node_and_yarn/WORKSPACE

@@ -53,8 +53,9 @@ http_archive(
 
 http_archive(
     name = "vendored_yarn_1_10_0",
-    build_file_content = """exports_files(["vendored_yarn_1_10_0/yarn-v1.10.0/bin/yarn.js"])""",
+    build_file_content = """exports_files(["bin/yarn.js"])""",
     sha256 = "83277bd505c7f4009c13077266020c97298727de7edf67af5ca66eccae9d4632",
+    strip_prefix = "yarn-v1.10.0",
     urls = ["https://github.com/yarnpkg/yarn/releases/download/v1.10.0/yarn-v1.10.0.tar.gz"],
 )
 
@@ -67,6 +68,6 @@ yarn_install(
     exports_directories_only = False,
     node_repository = "vendored_node",
     package_json = "//:package.json",
-    yarn = "@vendored_yarn_1_10_0//:yarn-v1.10.0/bin/yarn.js",
+    yarn = "@vendored_yarn_1_10_0//:bin/yarn.js",
     yarn_lock = "//:yarn.lock",
 )

internal/npm_install/npm_install.bzl

@@ -811,7 +811,7 @@ check if yarn is being run by the `npm_install` repository rule.""",
 )
 
 def _detect_yarn_version(rctx, yarn):
-    result = rctx.execute([yarn, "--version"])
+    result = rctx.execute(yarn + ["--version"])
     if result.return_code:
         fail("yarn --version failed: %s (%s)" % (result.stdout, result.stderr))
     if result.stdout.startswith("1."):
@@ -828,8 +828,17 @@ def _yarn_install_impl(repository_ctx):
     # A custom yarn won't have our special wrapper batch script
     if is_windows_host and _repository_contains_file(repository_ctx, yarn_label.workspace_name, "bin/yarn.cmd"):
         yarn_label = yarn_label.relative(":bin/yarn.cmd")
-    yarn = repository_ctx.path(yarn_label)
-    yarn_version = _detect_yarn_version(repository_ctx, yarn)
+
+    if yarn_label.name.endswith(".js"):
+        yarn_cmd = [node, yarn_label]
+    else:
+        # Our wrapper scripts include the "node" executable
+        yarn_cmd = [yarn_label]
+
+    yarn_version = _detect_yarn_version(repository_ctx, yarn_cmd)
+
+    # Quoted command line for use in scripts
+    yarn = " ".join(["\"%s\"" % repository_ctx.path(s) for s in yarn_cmd])
     yarn_args = []
 
     # CLI arguments changed in yarn 2+
@@ -898,7 +907,7 @@ set -e
 unset YARN_IGNORE_PATH
 unset INIT_CWD
 unset npm_config_registry
-(cd "{root}"; "{yarn}" {yarn_args})
+(cd "{root}"; {yarn} {yarn_args})
 """.format(
                 root = root,
                 yarn = yarn,
@@ -913,7 +922,7 @@ unset npm_config_registry
 set "YARN_IGNORE_PATH="
 set “INIT_CWD=”
 set “npm_config_registry=”
-cd /D "{root}" && "{yarn}" {yarn_args}
+cd /D "{root}" && {yarn} {yarn_args}
 """.format(
                 root = root,
                 yarn = yarn,