Skip to content

Commit f562909

Browse files
committed
Revert "Handle multiple lockfiles including Bun"
This reverts commit d1d25b6.
1 parent 7482db9 commit f562909

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ team.
159159

160160
- `--use-yarn`
161161

162-
By default, patch-package checks whether you use npm, yarn or bun based on
163-
which lockfile you have. If you have multiple lockfiles, it uses npm by
164-
default. Set this option to override that default and always use yarn.
162+
By default, patch-package checks whether you use npm or yarn based on which
163+
lockfile you have. If you have both, it uses npm by default. Set this option
164+
to override that default and always use yarn.
165165

166166
- `--exclude <regexp>`
167167

src/detectPackageManager.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function printSelectingDefaultMessage() {
2929
console.info(
3030
`${chalk.bold(
3131
"patch-package",
32-
)}: you have multiple lockfiles, e.g. yarn.lock and package-lock.json
32+
)}: you have both yarn.lock and package-lock.json
3333
Defaulting to using ${chalk.bold("npm")}
3434
You can override this setting by passing --use-yarn or deleting
3535
package-lock.json if you don't need it
@@ -54,13 +54,7 @@ export const detectPackageManager = (
5454
const bunLockbExists = fs.existsSync(
5555
join(findWorkspaceRoot() ?? appRootPath, "bun.lockb"),
5656
)
57-
if (
58-
[
59-
packageLockExists || shrinkWrapExists,
60-
yarnLockExists,
61-
bunLockbExists,
62-
].filter(Boolean).length > 1
63-
) {
57+
if ((packageLockExists || shrinkWrapExists) && yarnLockExists) {
6458
if (overridePackageManager) {
6559
return overridePackageManager
6660
} else {

0 commit comments

Comments
 (0)