Skip to content

Commit c1663c5

Browse files
devversiongregmagolan
authored andcommitted
fix(builtin): generated nodejs repository for windows references non-existent file
The generated NodeJS repository for windows. e.g. `@nodejs_windows_amd64` references a non-existent file that is supposed to be the Yarn script. The `yarn.cmd` file is located under `bin/` in the extracted Yarn archive, and not at the top-level. This currently breaks integration tests in the Angular framework due to the following error when the following target is referenced: `@nodejs//:yarn_bin`. ``` missing input file 'external/nodejs_windows_amd64/bin/yarnpkg/yarn.cmd', owner: '@nodejs_windows_amd64//:bin/yarnpkg/yarn.cmd' ```
1 parent 5de145e commit c1663c5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

internal/node/node_repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ def _prepare_node(repository_ctx):
430430
npx_bin_label = ("%s/lib/node_modules/npm/bin/npx-cli.js" % node_package) if not is_windows else ("%s/npx.cmd" % node_package)
431431

432432
# Use the yarn.js script as the bin for oxs & linux so there are no symlink issues with `%s/bin/npm`
433-
yarn_bin = ("%s/bin/yarn.js" % yarn_path) if not is_windows else ("%s/yarn.cmd" % yarn_path)
434-
yarn_bin_label = ("%s/bin/yarn.js" % yarn_package) if not is_windows else ("%s/yarn.cmd" % yarn_package)
433+
yarn_bin = ("%s/bin/yarn.js" % yarn_path) if not is_windows else ("%s/bin/yarn.cmd" % yarn_path)
434+
yarn_bin_label = ("%s/bin/yarn.js" % yarn_package) if not is_windows else ("%s/bin/yarn.cmd" % yarn_package)
435435
yarn_script = "%s/bin/yarn.js" % yarn_path
436436

437437
# Ensure that the "vendored" binaries are resolved

0 commit comments

Comments
 (0)