diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index c73aee405..528f963a8 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -305,13 +305,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+c@0.0.0", + package_store_name = "@scoped+c@file++..+projects+c_at_scoped_b_projects_b", src = "//projects/c:pkg", package = "@scoped/c", - version = "0.0.0", + version = "file:../projects/c_at_scoped_b_projects_b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", - "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name): "@scoped/b", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -321,7 +321,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/c".format(name), - src = "//:.aspect_rules_js/{}/@scoped+c@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+c@file++..+projects+c_at_scoped_b_projects_b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -344,10 +344,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "is-number@0.0.0", + package_store_name = "is-number@0.0.1", src = "//vendored/is-number:pkg", package = "is-number", - version = "0.0.0", + version = "0.0.1", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -356,10 +356,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+a@0.0.0", + package_store_name = "@scoped+a@link++..+projects+a", src = "//projects/a:pkg", package = "@scoped/a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -369,7 +369,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/a".format(name), - src = "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -392,12 +392,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+b@0.0.0", + package_store_name = "@scoped+b@link++..+projects+b", src = "//projects/b:pkg", package = "@scoped/b", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -407,7 +407,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/b".format(name), - src = "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -430,12 +430,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+d@0.0.0", + package_store_name = "@scoped+d@link++..+projects+d", src = "//projects/d:pkg", package = "@scoped/d", - version = "0.0.0", + version = "link:../projects/d", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -445,7 +445,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/d".format(name), - src = "//:.aspect_rules_js/{}/@scoped+d@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -468,10 +468,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "alias-project-a@0.0.0", + package_store_name = "alias-project-a@link++..+projects+a", src = "//projects/a:pkg", package = "alias-project-a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -481,7 +481,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/alias-project-a".format(name), - src = "//:.aspect_rules_js/{}/alias-project-a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/alias-project-a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -500,12 +500,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "scoped+bad@0.0.0", + package_store_name = "scoped+bad@link++..+projects+b", src = "//projects/b:pkg", package = "scoped/bad", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -515,7 +515,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/scoped/bad".format(name), - src = "//:.aspect_rules_js/{}/scoped+bad@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -534,10 +534,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "test-c200-d200@0.0.0", + package_store_name = "test-c200-d200@link++..+projects+peers-combo-2", src = "//projects/peers-combo-2:pkg", package = "test-c200-d200", - version = "0.0.0", + version = "link:../projects/peers-combo-2", deps = { "//:.aspect_rules_js/{}/@aspect-test+c@2.0.0".format(name): "@aspect-test/c", "//:.aspect_rules_js/{}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.0".format(name): "@aspect-test/d", @@ -550,7 +550,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/test-c200-d200".format(name), - src = "//:.aspect_rules_js/{}/test-c200-d200@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/test-c200-d200@link++..+projects+peers-combo-2".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -569,10 +569,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "test-c201-d200@0.0.0", + package_store_name = "test-c201-d200@link++..+projects+peers-combo-1", src = "//projects/peers-combo-1:pkg", package = "test-c201-d200", - version = "0.0.0", + version = "link:../projects/peers-combo-1", deps = { "//:.aspect_rules_js/{}/@aspect-test+c@2.0.1".format(name): "@aspect-test/c", "//:.aspect_rules_js/{}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.1".format(name): "@aspect-test/d", @@ -585,7 +585,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/test-c201-d200".format(name), - src = "//:.aspect_rules_js/{}/test-c201-d200@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/test-c201-d200@link++..+projects+peers-combo-1".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -604,10 +604,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "a-types@0.0.0", + package_store_name = "a-types@link++..+projects+a-types", src = "//projects/a-types:pkg", package = "a-types", - version = "0.0.0", + version = "link:../projects/a-types", deps = { "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", }, @@ -619,7 +619,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/a-types".format(name), - src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/a-types@link++..+projects+a-types".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index dd3ef8632..354f97092 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -311,15 +311,24 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+c@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+c@file++..+projects+c".format(name), +>>>>>>> 12992fab (wip) src = "//projects/c:pkg", package = "@scoped/c", - version = "0.0.0", + version = "file:../projects/c", deps = { +<<<<<<< HEAD "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", +======= + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", +>>>>>>> 12992fab (wip) }, visibility = ["//visibility:public"], tags = ["manual"], @@ -329,7 +338,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/c".format(name), - src = "//:.aspect_rules_js/{}/@scoped+c@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+c@file++..+projects+c".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -350,24 +359,34 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "is-number@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/is-number@0.0.1".format(name), +>>>>>>> 12992fab (wip) src = "//vendored/is-number:pkg", package = "is-number", - version = "0.0.0", + version = "0.0.1", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], ) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+a@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), +>>>>>>> 12992fab (wip) src = "//projects/a:pkg", package = "@scoped/a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -377,7 +396,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/a".format(name), - src = "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -398,14 +417,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+b@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), +>>>>>>> 12992fab (wip) src = "//projects/b:pkg", package = "@scoped/b", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -415,7 +439,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/b".format(name), - src = "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -436,15 +460,24 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+d@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), +>>>>>>> 12992fab (wip) src = "//projects/d:pkg", package = "@scoped/d", - version = "0.0.0", + version = "link:../projects/d", deps = { +<<<<<<< HEAD "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", +======= + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", +>>>>>>> 12992fab (wip) }, visibility = ["//visibility:public"], tags = ["manual"], @@ -454,7 +487,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/d".format(name), - src = "//:.aspect_rules_js/{}/@scoped+d@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -475,6 +508,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "alias-project-a@0.0.0", @@ -510,11 +544,15 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): _npm_local_package_store( link_root_name = name, package_store_name = "scoped+bad@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), +>>>>>>> 12992fab (wip) src = "//projects/b:pkg", package = "scoped/bad", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -524,7 +562,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/scoped/bad".format(name), - src = "//:.aspect_rules_js/{}/scoped+bad@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -541,6 +579,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/scoped/bad".format(name)) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "test-c200-d200@0.0.0", @@ -614,9 +653,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): _npm_local_package_store( link_root_name = name, package_store_name = "a-types@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@link++..+a-types".format(name), +>>>>>>> 12992fab (wip) src = "//projects/a-types:pkg", package = "a-types", - version = "0.0.0", + version = "link:../a-types", deps = { "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", }, @@ -628,7 +671,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/a-types".format(name), - src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/a-types@link++..+a-types".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index dd3ef8632..354f97092 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -311,15 +311,24 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@types"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+c@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+c@file++..+projects+c".format(name), +>>>>>>> 12992fab (wip) src = "//projects/c:pkg", package = "@scoped/c", - version = "0.0.0", + version = "file:../projects/c", deps = { +<<<<<<< HEAD "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", +======= + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", +>>>>>>> 12992fab (wip) }, visibility = ["//visibility:public"], tags = ["manual"], @@ -329,7 +338,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/c".format(name), - src = "//:.aspect_rules_js/{}/@scoped+c@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+c@file++..+projects+c".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -350,24 +359,34 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "is-number@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/is-number@0.0.1".format(name), +>>>>>>> 12992fab (wip) src = "//vendored/is-number:pkg", package = "is-number", - version = "0.0.0", + version = "0.0.1", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], ) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+a@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), +>>>>>>> 12992fab (wip) src = "//projects/a:pkg", package = "@scoped/a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -377,7 +396,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/a".format(name), - src = "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -398,14 +417,19 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+b@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), +>>>>>>> 12992fab (wip) src = "//projects/b:pkg", package = "@scoped/b", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -415,7 +439,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/b".format(name), - src = "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -436,15 +460,24 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "@scoped+d@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), +>>>>>>> 12992fab (wip) src = "//projects/d:pkg", package = "@scoped/d", - version = "0.0.0", + version = "link:../projects/d", deps = { +<<<<<<< HEAD "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", +======= + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", +>>>>>>> 12992fab (wip) }, visibility = ["//visibility:public"], tags = ["manual"], @@ -454,7 +487,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/d".format(name), - src = "//:.aspect_rules_js/{}/@scoped+d@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -475,6 +508,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): scope_targets["@scoped"].append(link_targets[-1]) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "alias-project-a@0.0.0", @@ -510,11 +544,15 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): _npm_local_package_store( link_root_name = name, package_store_name = "scoped+bad@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), +>>>>>>> 12992fab (wip) src = "//projects/b:pkg", package = "scoped/bad", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -524,7 +562,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/scoped/bad".format(name), - src = "//:.aspect_rules_js/{}/scoped+bad@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -541,6 +579,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append(":{}/scoped/bad".format(name)) if is_root: +<<<<<<< HEAD _npm_local_package_store( link_root_name = name, package_store_name = "test-c200-d200@0.0.0", @@ -614,9 +653,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): _npm_local_package_store( link_root_name = name, package_store_name = "a-types@0.0.0", +======= + _npm_package_store( + name = ".aspect_rules_js/{}/a-types@link++..+a-types".format(name), +>>>>>>> 12992fab (wip) src = "//projects/a-types:pkg", package = "a-types", - version = "0.0.0", + version = "link:../a-types", deps = { "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", }, @@ -628,7 +671,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/a-types".format(name), - src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/a-types@link++..+a-types".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index cb7e73392..1224b2aeb 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -313,13 +313,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+c@0.0.0", + package_store_name = "@scoped+c@file++..+projects+c", src = "//projects/c:pkg", package = "@scoped/c", - version = "0.0.0", + version = "file:../projects/c", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", - "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", + "//:.aspect_rules_js/{}/@scoped+a@link++..+a".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name): "@scoped/b", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -329,7 +329,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/c".format(name), - src = "//:.aspect_rules_js/{}/@scoped+c@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+c@file++..+projects+c".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -352,10 +352,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "is-number@0.0.0", + package_store_name = "is-number@file++..+vendored+is-number", src = "//vendored/is-number:pkg", package = "is-number", - version = "0.0.0", + version = "file:../vendored/is-number", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -364,10 +364,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+a@0.0.0", + package_store_name = "@scoped+a@link++..+projects+a", src = "//projects/a:pkg", package = "@scoped/a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -377,7 +377,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/a".format(name), - src = "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -400,12 +400,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+b@0.0.0", + package_store_name = "@scoped+b@link++..+projects+b", src = "//projects/b:pkg", package = "@scoped/b", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -415,7 +415,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/b".format(name), - src = "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -438,13 +438,13 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@scoped+d@0.0.0", + package_store_name = "@scoped+d@link++..+projects+d", src = "//projects/d:pkg", package = "@scoped/d", - version = "0.0.0", + version = "link:../projects/d", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", - "//:.aspect_rules_js/{}/@scoped+b@0.0.0".format(name): "@scoped/b", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+b@link++..+projects+b".format(name): "@scoped/b", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -454,7 +454,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@scoped/d".format(name), - src = "//:.aspect_rules_js/{}/@scoped+d@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@scoped+d@link++..+projects+d".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -477,10 +477,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "alias-project-a@0.0.0", + package_store_name = "alias-project-a@link++..+projects+a", src = "//projects/a:pkg", package = "alias-project-a", - version = "0.0.0", + version = "link:../projects/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -490,7 +490,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/alias-project-a".format(name), - src = "//:.aspect_rules_js/{}/alias-project-a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/alias-project-a@link++..+projects+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -509,12 +509,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "scoped+bad@0.0.0", + package_store_name = "scoped+bad@link++..+projects+b", src = "//projects/b:pkg", package = "scoped/bad", - version = "0.0.0", + version = "link:../projects/b", deps = { - "//:.aspect_rules_js/{}/@scoped+a@0.0.0".format(name): "@scoped/a", + "//:.aspect_rules_js/{}/@scoped+a@link++..+projects+a".format(name): "@scoped/a", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -524,7 +524,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/scoped/bad".format(name), - src = "//:.aspect_rules_js/{}/scoped+bad@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/scoped+bad@link++..+projects+b".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -543,10 +543,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "test-c200-d200@0.0.0", + package_store_name = "test-c200-d200@link++..+projects+peers-combo-2", src = "//projects/peers-combo-2:pkg", package = "test-c200-d200", - version = "0.0.0", + version = "link:../projects/peers-combo-2", deps = { "//:.aspect_rules_js/{}/@aspect-test+c@2.0.0".format(name): "@aspect-test/c", "//:.aspect_rules_js/{}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.0".format(name): "@aspect-test/d", @@ -559,7 +559,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/test-c200-d200".format(name), - src = "//:.aspect_rules_js/{}/test-c200-d200@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/test-c200-d200@link++..+projects+peers-combo-2".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -578,10 +578,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "test-c201-d200@0.0.0", + package_store_name = "test-c201-d200@link++..+projects+peers-combo-1", src = "//projects/peers-combo-1:pkg", package = "test-c201-d200", - version = "0.0.0", + version = "link:../projects/peers-combo-1", deps = { "//:.aspect_rules_js/{}/@aspect-test+c@2.0.1".format(name): "@aspect-test/c", "//:.aspect_rules_js/{}/@aspect-test+d@2.0.0_at_aspect-test_c_2.0.1".format(name): "@aspect-test/d", @@ -594,7 +594,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/test-c201-d200".format(name), - src = "//:.aspect_rules_js/{}/test-c201-d200@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/test-c201-d200@link++..+projects+peers-combo-1".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -613,10 +613,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "a-types@0.0.0", + package_store_name = "a-types@link++..+projects+a-types", src = "//projects/a-types:pkg", package = "a-types", - version = "0.0.0", + version = "link:../projects/a-types", deps = { "//:.aspect_rules_js/{}/@types+node@16.18.11".format(name): "@types/node", }, @@ -628,7 +628,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/a-types".format(name), - src = "//:.aspect_rules_js/{}/a-types@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/a-types@link++..+projects+a-types".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) diff --git a/js/private/test/image/checksum_test.expected b/js/private/test/image/checksum_test.expected index dd3b6e78e..e473e1f95 100644 --- a/js/private/test/image/checksum_test.expected +++ b/js/private/test/image/checksum_test.expected @@ -1,4 +1,4 @@ 6c14634e7447def7aa7ccb850f76c2569be186a806d478a8449368276e3bd94c js/private/test/image/cksum_node -52836a988c8ac815b4a3b70fa3a3acec67b851699fa989694cef4cc1fa53de96 js/private/test/image/cksum_package_store_3p -642b308a0561fb51dfd96d08d74a4ec419c9d2ca501cfa1002a49c8e25fbe4c2 js/private/test/image/cksum_package_store_1p -5d45f32dacf0b83e26c33d4e1017c694e79eaff29b8ecc336f9ea8fdee870d45 js/private/test/image/cksum_node_modules +1da9cc8178e71d498c602561b7972698463a163c3b7df15930d4b686cb23730c js/private/test/image/cksum_package_store_3p +5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef js/private/test/image/cksum_package_store_1p +262150a7fc582de717fc24a5297c7f4e7525fd1a3dbe1df06a3f648d0c9bb05b js/private/test/image/cksum_node_modules diff --git a/js/private/test/image/custom_layers_nomatch_test_node_modules.listing b/js/private/test/image/custom_layers_nomatch_test_node_modules.listing index 722582df2..dea09ee03 100644 --- a/js/private/test/image/custom_layers_nomatch_test_node_modules.listing +++ b/js/private/test/image/custom_layers_nomatch_test_node_modules.listing @@ -18,5 +18,5 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin. drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn diff --git a/js/private/test/image/custom_layers_nomatch_test_package_store_1p.listing b/js/private/test/image/custom_layers_nomatch_test_package_store_1p.listing index ab8371224..e69de29bb 100644 --- a/js/private/test/image/custom_layers_nomatch_test_package_store_1p.listing +++ b/js/private/test/image/custom_layers_nomatch_test_package_store_1p.listing @@ -1,13 +0,0 @@ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d diff --git a/js/private/test/image/custom_layers_nomatch_test_package_store_3p.listing b/js/private/test/image/custom_layers_nomatch_test_package_store_3p.listing index 4e474dc56..5c739c24d 100644 --- a/js/private/test/image/custom_layers_nomatch_test_package_store_3p.listing +++ b/js/private/test/image/custom_layers_nomatch_test_package_store_3p.listing @@ -7,6 +7,10 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin. drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/ +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn/ diff --git a/js/private/test/image/custom_owner_test_node_modules.listing b/js/private/test/image/custom_owner_test_node_modules.listing index ba4667dd6..213981249 100644 --- a/js/private/test/image/custom_owner_test_node_modules.listing +++ b/js/private/test/image/custom_owner_test_node_modules.listing @@ -17,5 +17,5 @@ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runf drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/ -lrwxrwxr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d +lrwxrwxr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d lrwxrwxr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn diff --git a/js/private/test/image/custom_owner_test_package_store_1p.listing b/js/private/test/image/custom_owner_test_package_store_1p.listing index 78c8bff67..e69de29bb 100644 --- a/js/private/test/image/custom_owner_test_package_store_1p.listing +++ b/js/private/test/image/custom_owner_test_package_store_1p.listing @@ -1,12 +0,0 @@ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/ -drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/ -lrwxrwxr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d diff --git a/js/private/test/image/custom_owner_test_package_store_3p.listing b/js/private/test/image/custom_owner_test_package_store_3p.listing index 2cc15dbaf..b0c31a0ee 100644 --- a/js/private/test/image/custom_owner_test_package_store_3p.listing +++ b/js/private/test/image/custom_owner_test_package_store_3p.listing @@ -6,6 +6,10 @@ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runf drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ +drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/ +drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/ +drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/ +lrwxrwxr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn/ diff --git a/js/private/test/image/default_test_node_modules.listing b/js/private/test/image/default_test_node_modules.listing index 8399bf36d..6e9abcd04 100644 --- a/js/private/test/image/default_test_node_modules.listing +++ b/js/private/test/image/default_test_node_modules.listing @@ -17,5 +17,5 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runf drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn diff --git a/js/private/test/image/default_test_package_store_1p.listing b/js/private/test/image/default_test_package_store_1p.listing index 4473f9a17..e69de29bb 100644 --- a/js/private/test/image/default_test_package_store_1p.listing +++ b/js/private/test/image/default_test_package_store_1p.listing @@ -1,12 +0,0 @@ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d diff --git a/js/private/test/image/default_test_package_store_3p.listing b/js/private/test/image/default_test_package_store_3p.listing index 76979382a..312480e53 100644 --- a/js/private/test/image/default_test_package_store_3p.listing +++ b/js/private/test/image/default_test_package_store_3p.listing @@ -6,6 +6,10 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runf drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/ +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn/ diff --git a/js/private/test/image/regex_edge_cases_test_node_modules.listing b/js/private/test/image/regex_edge_cases_test_node_modules.listing index 722582df2..dea09ee03 100644 --- a/js/private/test/image/regex_edge_cases_test_node_modules.listing +++ b/js/private/test/image/regex_edge_cases_test_node_modules.listing @@ -18,5 +18,5 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin. drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/@mycorp/pkg-d -> ../../../../../../node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/js/private/test/image/node_modules/acorn -> ../../../../../node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn diff --git a/js/private/test/image/regex_edge_cases_test_package_store_1p.listing b/js/private/test/image/regex_edge_cases_test_package_store_1p.listing index ab8371224..e69de29bb 100644 --- a/js/private/test/image/regex_edge_cases_test_package_store_1p.listing +++ b/js/private/test/image/regex_edge_cases_test_package_store_1p.listing @@ -1,13 +0,0 @@ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/ -drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/ -lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@0.0.0/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d diff --git a/js/private/test/image/regex_edge_cases_test_package_store_3p.listing b/js/private/test/image/regex_edge_cases_test_package_store_3p.listing index 4e474dc56..5c739c24d 100644 --- a/js/private/test/image/regex_edge_cases_test_package_store_3p.listing +++ b/js/private/test/image/regex_edge_cases_test_package_store_3p.listing @@ -7,6 +7,10 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin. drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/ +drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/ +lrwxrwxr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d/node_modules/@mycorp/pkg-d -> ../../../../../examples/npm_package/packages/pkg_d drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/_main/node_modules/.aspect_rules_js/acorn@8.12.1/node_modules/acorn/ diff --git a/npm/private/npm_package_store.bzl b/npm/private/npm_package_store.bzl index 249c35870..03e4e40f6 100644 --- a/npm/private/npm_package_store.bzl +++ b/npm/private/npm_package_store.bzl @@ -163,11 +163,11 @@ def _npm_package_store_impl(ctx): package = ctx.attr.package if ctx.attr.package else ctx.attr.src[NpmPackageInfo].package version = ctx.attr.version if ctx.attr.version else ctx.attr.src[NpmPackageInfo].version elif JsInfo in ctx.attr.src: - if not ctx.attr.package: - msg = "Expected package to be specified in '{}' when src '{}' provides a JsInfo".format(ctx.label, ctx.attr.src[JsInfo].target) + if not ctx.attr.package or not ctx.attr.version: + msg = "Expected package+version to be specified in '{}' when src '{}' provides a JsInfo".format(ctx.label, ctx.attr.src[JsInfo].target) fail(msg) package = ctx.attr.package - version = ctx.attr.version if ctx.attr.version else "0.0.0" + version = ctx.attr.version else: msg = "Expected src of '{}' to provide either NpmPackageInfo or JsInfo".format(ctx.label) fail(msg) diff --git a/npm/private/npm_translate_lock_generate.bzl b/npm/private/npm_translate_lock_generate.bzl index 190a30895..7ec5aa3e0 100644 --- a/npm/private/npm_translate_lock_generate.bzl +++ b/npm/private/npm_translate_lock_generate.bzl @@ -36,7 +36,7 @@ _FP_STORE_TMPL = \ package_store_name = "{package_store_name}", src = "{npm_package_target}", package = "{package}", - version = "0.0.0", + version = "{version}", deps = {deps}, visibility = ["//visibility:public"], tags = ["manual"], @@ -147,11 +147,16 @@ sh_binary( # collapse link aliases lists into to acomma separated strings for dep_store_target in transitive_deps.keys(): transitive_deps[dep_store_target] = ",".join(transitive_deps[dep_store_target]) + + # Some file links may have a version specified + friendly_version = package_info.get("friendly_version", version) + fp_links[dep_key] = { "package": name, "path": dep_path, "link_packages": {}, "deps": transitive_deps, + "version": friendly_version, } # Look for first-party links in importers @@ -196,6 +201,7 @@ sh_binary( transitive_deps[dep_store_target] = ",".join(transitive_deps[dep_store_target]) fp_links[dep_key] = { "package": dep_package, + "version": dep_version, "path": dep_path, "link_packages": {link_package: True}, "deps": transitive_deps, @@ -367,6 +373,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): for fp_link in fp_links.values(): fp_package = fp_link.get("package") + fp_version = fp_link.get("version") fp_path = fp_link.get("path") fp_link_packages = fp_link.get("link_packages").keys() fp_deps = fp_link.get("deps") @@ -379,7 +386,8 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): deps = starlark_codegen_utils.to_dict_attr(fp_deps, 3, quote_key = False), npm_package_target = fp_target, package = fp_package, - package_store_name = utils.package_store_name(fp_package, "0.0.0"), + version = fp_version, + package_store_name = utils.package_store_name(fp_package, fp_version), package_store_root = utils.package_store_root, )) @@ -394,7 +402,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): pkg = fp_package, package_directory_output_group = utils.package_directory_output_group, root_package = root_package, - package_store_name = utils.package_store_name(fp_package, "0.0.0"), + package_store_name = utils.package_store_name(fp_package, fp_version), package_store_root = utils.package_store_root, )) diff --git a/npm/private/test/snapshots/npm_defs.bzl b/npm/private/test/snapshots/npm_defs.bzl index 064ad6e23..c4bd4e8c1 100644 --- a/npm/private/test/snapshots/npm_defs.bzl +++ b/npm/private/test/snapshots/npm_defs.bzl @@ -2566,10 +2566,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "is-odd@0.0.0", + package_store_name = "is-odd@file++npm+private+test+vendored+is-odd", src = "//npm/private/test/vendored/is-odd:pkg", package = "is-odd", - version = "0.0.0", + version = "file:npm/private/test/vendored/is-odd", deps = { "//:.aspect_rules_js/{}/is-number@6.0.0".format(name): "is-number", }, @@ -2580,12 +2580,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "semver-max@0.0.0", + package_store_name = "semver-max@file++npm+private+test+vendored+semver-max", src = "//npm/private/test/vendored/semver-max:pkg", package = "semver-max", - version = "0.0.0", + version = "file:npm/private/test/vendored/semver-max", deps = { - "//:.aspect_rules_js/{}/is-odd@0.0.0".format(name): "is-odd", + "//:.aspect_rules_js/{}/is-odd@file++npm+private+test+vendored+is-odd".format(name): "is-odd", "//:.aspect_rules_js/{}/semver@5.7.1".format(name): "semver", }, visibility = ["//visibility:public"], @@ -2595,10 +2595,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@mycorp+pkg-a@0.0.0", + package_store_name = "@mycorp+pkg-a@link++examples+npm_package+packages+pkg_a", src = "//examples/npm_package/packages/pkg_a:pkg", package = "@mycorp/pkg-a", - version = "0.0.0", + version = "link:examples/npm_package/packages/pkg_a", deps = { "//:.aspect_rules_js/{}/acorn@8.7.1".format(name): "acorn", "//:.aspect_rules_js/{}/uuid@8.3.2".format(name): "uuid", @@ -2611,7 +2611,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@mycorp/pkg-a".format(name), - src = "//:.aspect_rules_js/{}/@mycorp+pkg-a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@mycorp+pkg-a@link++examples+npm_package+packages+pkg_a".format(name), visibility = ["//examples:__subpackages__"], tags = ["manual"], ) @@ -2629,10 +2629,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "js_lib_pkg_a@0.0.0", + package_store_name = "js_lib_pkg_a@link++examples+js_lib_pkg+a", src = "//examples/js_lib_pkg/a:pkg", package = "js_lib_pkg_a", - version = "0.0.0", + version = "link:examples/js_lib_pkg/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -2642,7 +2642,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/js_lib_pkg_a".format(name), - src = "//:.aspect_rules_js/{}/js_lib_pkg_a@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/js_lib_pkg_a@link++examples+js_lib_pkg+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2661,10 +2661,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "js_lib_pkg_a-alias@0.0.0", + package_store_name = "js_lib_pkg_a-alias@link++examples+js_lib_pkg+a", src = "//examples/js_lib_pkg/a:pkg", package = "js_lib_pkg_a-alias", - version = "0.0.0", + version = "link:examples/js_lib_pkg/a", deps = {}, visibility = ["//visibility:public"], tags = ["manual"], @@ -2674,7 +2674,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/js_lib_pkg_a-alias".format(name), - src = "//:.aspect_rules_js/{}/js_lib_pkg_a-alias@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/js_lib_pkg_a-alias@link++examples+js_lib_pkg+a".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2693,10 +2693,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@lib+test@0.0.0", + package_store_name = "@lib+test@link++examples+linked_pkg", src = "//examples/linked_pkg:pkg", package = "@lib/test", - version = "0.0.0", + version = "link:examples/linked_pkg", deps = { "//:.aspect_rules_js/{}/@aspect-test+e@1.0.0".format(name): "@aspect-test/e,alias-e", }, @@ -2708,7 +2708,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@lib/test".format(name), - src = "//:.aspect_rules_js/{}/@lib+test@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@lib+test@link++examples+linked_pkg".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2731,10 +2731,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@lib+test2@0.0.0", + package_store_name = "@lib+test2@link++examples+linked_lib", src = "//examples/linked_lib:pkg", package = "@lib/test2", - version = "0.0.0", + version = "link:examples/linked_lib", deps = { "//:.aspect_rules_js/{}/@aspect-test+e@1.0.0".format(name): "@aspect-test/e,alias-e", }, @@ -2746,7 +2746,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@lib/test2".format(name), - src = "//:.aspect_rules_js/{}/@lib+test2@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@lib+test2@link++examples+linked_lib".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2769,10 +2769,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@mycorp+pkg-d@0.0.0", + package_store_name = "@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d", src = "//examples/npm_package/packages/pkg_d:pkg", package = "@mycorp/pkg-d", - version = "0.0.0", + version = "link:examples/npm_package/packages/pkg_d", deps = { "//:.aspect_rules_js/{}/acorn@8.7.1".format(name): "acorn", "//:.aspect_rules_js/{}/uuid@8.3.2".format(name): "uuid", @@ -2785,7 +2785,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@mycorp/pkg-d".format(name), - src = "//:.aspect_rules_js/{}/@mycorp+pkg-d@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2808,12 +2808,12 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "@mycorp+pkg-e@0.0.0", + package_store_name = "@mycorp+pkg-e@link++examples+npm_package+packages+pkg_e", src = "//examples/npm_package/packages/pkg_e:pkg", package = "@mycorp/pkg-e", - version = "0.0.0", + version = "link:examples/npm_package/packages/pkg_e", deps = { - "//:.aspect_rules_js/{}/@mycorp+pkg-d@0.0.0".format(name): "@mycorp/pkg-d", + "//:.aspect_rules_js/{}/@mycorp+pkg-d@link++examples+npm_package+packages+pkg_d".format(name): "@mycorp/pkg-d", }, visibility = ["//visibility:public"], tags = ["manual"], @@ -2823,7 +2823,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/@mycorp/pkg-e".format(name), - src = "//:.aspect_rules_js/{}/@mycorp+pkg-e@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/@mycorp+pkg-e@link++examples+npm_package+packages+pkg_e".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) @@ -2846,10 +2846,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if is_root: _npm_local_package_store( link_root_name = name, - package_store_name = "test-npm_package@0.0.0", + package_store_name = "test-npm_package@link++npm+private+test+npm_package", src = "//npm/private/test/npm_package:pkg", package = "test-npm_package", - version = "0.0.0", + version = "link:npm/private/test/npm_package", deps = { "//:.aspect_rules_js/{}/chalk@5.0.1".format(name): "chalk", "//:.aspect_rules_js/{}/chalk@5.1.1".format(name): "chalk-alt", @@ -2862,7 +2862,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): # terminal target for direct dependencies _npm_link_package_store( name = "{}/test-npm_package".format(name), - src = "//:.aspect_rules_js/{}/test-npm_package@0.0.0".format(name), + src = "//:.aspect_rules_js/{}/test-npm_package@link++npm+private+test+npm_package".format(name), visibility = ["//visibility:public"], tags = ["manual"], ) diff --git a/npm/private/test/utils_tests.bzl b/npm/private/test/utils_tests.bzl index 19960ecd0..eea50ef08 100644 --- a/npm/private/test/utils_tests.bzl +++ b/npm/private/test/utils_tests.bzl @@ -31,9 +31,9 @@ def test_pnpm_name(ctx): # buildifier: disable=function-docstring def test_link_version(ctx): env = unittest.begin(ctx) - asserts.equals(env, "@scope+y@0.0.0", utils.package_store_name("@scope/y", "link:foo")) - asserts.equals(env, "@scope+y@0.0.0", utils.package_store_name("@scope/y", "file:bar")) - asserts.equals(env, "@scope+y@0.0.0", utils.package_store_name("@scope/y", "file:@foo/bar")) + asserts.equals(env, "@scope+y@link++foo", utils.package_store_name("@scope/y", "link:foo")) + asserts.equals(env, "@scope+y@file++bar", utils.package_store_name("@scope/y", "file:bar")) + asserts.equals(env, "@scope+y@file++@foo+bar", utils.package_store_name("@scope/y", "file:@foo/bar")) return unittest.end(env) def test_friendly_name(ctx): diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl index c836940df..69db5f1e3 100644 --- a/npm/private/utils.bzl +++ b/npm/private/utils.bzl @@ -50,20 +50,21 @@ def _package_store_name(pnpm_name, pnpm_version): if pnpm_version.startswith("link:") or pnpm_version.startswith("file:"): name = pnpm_name - version = "0.0.0" + version = pnpm_version elif pnpm_version.startswith("npm:"): name, version = pnpm_version[4:].rsplit("@", 1) else: name = pnpm_name version = pnpm_version + escaped_name = name.replace("/", "+") + escaped_version = version.replace("://", "/").replace(":", "//").replace("/", "+") + if version.startswith("@"): # Special case where the package name should _not_ be included in the package store name. # See https://github.com/aspect-build/rules_js/issues/423 for more context. - return version.replace("/", "+") + return escaped_version else: - escaped_name = name.replace("/", "+") - escaped_version = version.replace("://", "/").replace("/", "+") return "%s@%s" % (escaped_name, escaped_version) def _make_symlink(ctx, symlink_path, target_path):