Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple lockfiles error #1228

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Conversation

colincasey
Copy link
Contributor

These changes build on top of existing pnpm support and modify the failure message shown when multiple lockfiles are detected to now include pnpm.

@colincasey colincasey added the skip changelog Changelog entry is not required - Skips changelog check label Mar 26, 2024
@colincasey colincasey self-assigned this Mar 26, 2024
@colincasey colincasey mentioned this pull request Mar 26, 2024
Copy link
Member

@joshwlewis joshwlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor suggestion, not blocking.

lib/failure.sh Outdated Show resolved Hide resolved
@colincasey colincasey force-pushed the pnpm_support branch 2 times, most recently from 26f9b42 to c0f18d0 Compare April 4, 2024 16:01
These changes build on top of [existing pnpm support](#1224) and modify the failure message shown when multiple lockfiles are detected to now include pnpm.
@colincasey colincasey marked this pull request as ready for review April 4, 2024 16:25
@colincasey colincasey requested a review from a team as a code owner April 4, 2024 16:25
@colincasey colincasey merged commit 23c04ca into pnpm_support Apr 4, 2024
9 checks passed
@colincasey colincasey deleted the multiple_lockfiles_failure branch April 4, 2024 16:50
@edmorley edmorley removed the request for review from a team April 8, 2024 09:27
colincasey added a commit that referenced this pull request Apr 29, 2024
These changes build on top of [existing pnpm support](#1224) and modify the failure message shown when multiple lockfiles are detected to now include pnpm.
colincasey added a commit that referenced this pull request Apr 29, 2024
* pnpm support

These changes build on top of [existing corepack support](#1222) to allow `pnpm` to be installed via [Corepack](https://nodejs.org/docs/latest/api/corepack.html).

The build process has also been modified use the `pnpm` binary at the following stages:
- installing dependencies
- running build scripts:
  - `heroku-prebuild`
  - `build` (or `heroku-postbuild`)
  - `heroku-cleanup`
- pruning dev dependencies

* Prune the pnpm store periodically (#1231)

* Multiple lockfiles error (#1228)

These changes build on top of [existing pnpm support](#1224) and modify the failure message shown when multiple lockfiles are detected to now include pnpm.

* Add pnpm caching (#1225)

These changes build on top of [existing pnpm support](#1224) to allow `pnpm` dependencies to be saved and restored between builds.

* pnpm support (default version) (#1226)

These changes build on top of [existing pnpm support](#1224) to default to the `latest` version when it appears that pnpm should be used but there is no `engines.pnpm` or `packageManager` specified in `package.json`.

* pnpm support engines (#1227)

These changes build on top of [existing pnpm support](#1224) to use the version specified by the `engines.pnpm` field in `package.json`.

* Only prune when it's safe to do so (#1238)

* Update CHANGELOG.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip changelog Changelog entry is not required - Skips changelog check
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants