From 13d66472bb7511c93725c80e1daa5ee7b5c2215c Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Fri, 13 Jan 2023 13:47:26 -0800 Subject: [PATCH] build: remove workaround for fixed pnpm issue See https://github.com/pnpm/pnpm/issues/5493 --- WORKSPACE | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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..4e52528a1 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "// 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" } } }