From a2883e22ad692d28eb831b449f7e6b6bae462302 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 3 May 2022 12:51:12 -0700 Subject: [PATCH] fix: set correct linking location for yarn_install using package.json from external repository --- internal/npm_install/npm_install.bzl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/npm_install/npm_install.bzl b/internal/npm_install/npm_install.bzl index 13f02b10a9..d7804b7e10 100644 --- a/internal/npm_install/npm_install.bzl +++ b/internal/npm_install/npm_install.bzl @@ -449,11 +449,14 @@ def _create_build_files(repository_ctx, rule_type, node, lock_file, generate_loc fail("link target must be label of form '@wksp//path/to:target', '@//path/to:target' or '//path/to:target'") validated_links[k] = v - package_json_dir = paths.dirname(paths.normalize(paths.join(repository_ctx.attr.package_json.package, repository_ctx.attr.package_json.name))) + package_json_dir = paths.dirname(paths.normalize(paths.join( + repository_ctx.attr.package_json.package, + repository_ctx.attr.package_json.name, + ))) package_path = repository_ctx.attr.package_path if not package_path: # By default the package_path is the directory of the package.json file - package_path = package_json_dir + package_path = paths.join(repository_ctx.attr.package_json.workspace_root, package_json_dir) elif package_path == "/": # User specified root path package_path = ""