diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= index 4ff1a9577..e05b34b42 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= @@ -1,8 +1,8 @@ # Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml"). # This file should be checked into version control along with the pnpm-lock.yaml file. .npmrc=-2065072158 -pnpm-lock.yaml=1025523375 -package.json=889223270 +pnpm-lock.yaml=-59888855 +package.json=301352699 pnpm-workspace.yaml=1306476322 examples/js_binary/package.json=-41174383 examples/macro/package.json=-696073599 diff --git a/WORKSPACE b/WORKSPACE index a6755a702..b688cc3eb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -141,7 +141,7 @@ npm_translate_lock( "@gregmagolan/test-b": ["//examples/npm_deps:patches/test-b.patch"], }, pnpm_lock = "//:pnpm-lock.yaml", - pnpm_version = "7.17.1", + pnpm_version = "7.25.0", public_hoist_packages = { # Instructs the linker to hoist the ms@2.1.3 npm package to `node_modules/ms` in the `examples/npm_deps` package. # Similar to adding `public-hoist-pattern[]=ms` in .npmrc but with control over which version to hoist and where diff --git a/package.json b/package.json index 7d8ac09fb..e311d2507 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,10 @@ } } }, - "// overrides.semver-max&is-odd": "// these are for the npm/private/test/package.json but pnpm has a bug where resolutions need to be specified in the root package.json but the paths are still relative to the package.json where the resolution applies", "overrides": { "jsonify": "https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz", - "semver-max": "file:../../../npm/private/test/vendored/semver-max", - "is-odd": "file:../../../../../npm/private/test/vendored/is-odd" + "semver-max": "file:./npm/private/test/vendored/semver-max", + "is-odd": "file:./npm/private/test/vendored/is-odd" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf93bbd0e..5abca3fa1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,8 +2,8 @@ lockfileVersion: 5.4 overrides: jsonify: https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz - semver-max: file:../../../npm/private/test/vendored/semver-max - is-odd: file:../../../../../npm/private/test/vendored/is-odd + semver-max: file:./npm/private/test/vendored/semver-max + is-odd: file:./npm/private/test/vendored/is-odd packageExtensionsChecksum: fd9f894fe7eb428c9986d2de2ca012c9