Skip to content

Commit

Permalink
build: remove workaround for pnpm override issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jbedard committed Jan 13, 2023
1 parent c88f26a commit cd90f63
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -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"
}
}
}
4 changes: 2 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cd90f63

Please sign in to comment.