Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
jbedard committed May 26, 2024
1 parent 50e006d commit b435d45
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion e2e/pnpm_lockfiles/lockfile-test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def lockfile_test(name = None):
":node_modules/@scoped/d",

# http:
# ":node_modules/debug",
":node_modules/debug",
# TODO: differs across lockfile versions
":.aspect_rules_js/node_modules/{}".format("[email protected]+ngokevin+debug+tar.gz+9742c5f383a6f8046241920156236ade8ec30d53" if lock_version == "v90" else "[email protected]+ngokevin+debug+9742c5f383a6f8046241920156236ade8ec30d53"),

Expand Down
2 changes: 2 additions & 0 deletions npm/private/npm_translate_lock_helpers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ def _get_npm_imports(importers, packages, patched_dependencies, only_built_depen
links["packages"] = linked_packages
importer_links[import_path] = links

print("importer_links: ", importer_links)

patches_used = []
result = {}
for package_key, package_info in packages.items():
Expand Down
1 change: 1 addition & 0 deletions npm/private/utils.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ def _friendly_name(name, version):
def _package_store_name(name, version):
"Make a package store name for a given package and version"
if version.startswith("@"):
# TODO: must be done for v9 as well?
# 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("/", "+")
Expand Down

0 comments on commit b435d45

Please sign in to comment.