Skip to content

Commit 06f8882

Browse files
authored
fix(create-app): get package manager from lock correctly (#532)
* fix: get package manager from lock correctly * check for .yarn * changeset
1 parent 3d3e988 commit 06f8882

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

.changeset/angry-donkeys-feel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-rock': patch
3+
---
4+
5+
fix(create-app): get package manager from lock correctly

packages/create-app/src/lib/utils/getPkgManager.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ export function getPkgManager() {
99
if (fromUserAgent) {
1010
return fromUserAgent.name;
1111
}
12+
return getPkgManagerFromLockFile();
13+
}
14+
15+
export function getPkgManagerFromLockFile() {
1216
if (fs.existsSync(path.join(process.cwd(), 'pnpm-lock.yaml'))) {
1317
return 'pnpm';
1418
}
15-
if (fs.existsSync(path.join(process.cwd(), 'yarn.lock'))) {
19+
if (
20+
fs.existsSync(path.join(process.cwd(), 'yarn.lock')) ||
21+
fs.existsSync(path.join(process.cwd(), '.yarn'))
22+
) {
1623
return 'yarn';
1724
}
1825
if (

packages/create-app/src/lib/utils/initInExistingProject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import {
1111
spawn,
1212
spinner,
1313
} from '@rock-js/tools';
14-
import { getPkgManager } from './getPkgManager.js';
14+
import { getPkgManagerFromLockFile } from './getPkgManager.js';
1515

1616
export async function initInExistingProject(projectRoot: string) {
17-
const pkgManager = getPkgManager();
17+
const pkgManager = getPkgManagerFromLockFile();
1818

1919
const loader = spinner();
2020

packages/create-app/src/lib/utils/migrateRnefProject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import fs from 'node:fs';
22
import path from 'node:path';
33
import type { SubprocessError } from '@rock-js/tools';
44
import { color, logger, note, outro, spawn, spinner } from '@rock-js/tools';
5-
import { getPkgManager } from './getPkgManager.js';
5+
import { getPkgManagerFromLockFile } from './getPkgManager.js';
66

77
async function migrateRnefProject(projectRoot: string): Promise<void> {
8-
const pkgManager = getPkgManager();
8+
const pkgManager = getPkgManagerFromLockFile();
99
const loader = spinner();
1010

1111
const packagesMap: Record<string, string> = {

0 commit comments

Comments
 (0)