File size: 2,827 Bytes
b2cad4f | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | diff --git a/packages/next-codemod/lib/handle-package.ts b/packages/next-codemod/lib/handle-package.ts
index dc97b6aef2..627facde6e 100644
--- a/packages/next-codemod/lib/handle-package.ts
+++ b/packages/next-codemod/lib/handle-package.ts
@@ -54,20 +54,30 @@ export function getPnpmMajorVersion(): number | null {
export function getPkgManager(baseDir: string): PackageManager {
try {
+ const userAgent = process.env.npm_config_user_agent
+ if (userAgent) {
+ if (userAgent.startsWith('yarn')) {
+ return 'yarn'
+ } else if (userAgent.startsWith('pnpm')) {
+ return 'pnpm'
+ } else if (userAgent.startsWith('bun')) {
+ return 'bun'
+ } else if (userAgent.startsWith('npm')) {
+ return 'npm'
+ }
+ }
const lockFile = findUp.sync(
[
- 'package-lock.json',
'yarn.lock',
'pnpm-lock.yaml',
'bun.lock',
'bun.lockb',
+ 'package-lock.json',
],
{ cwd: baseDir }
)
if (lockFile) {
switch (basename(lockFile)) {
- case 'package-lock.json':
- return 'npm'
case 'yarn.lock':
return 'yarn'
case 'pnpm-lock.yaml':
@@ -75,6 +85,8 @@ export function getPkgManager(baseDir: string): PackageManager {
case 'bun.lock':
case 'bun.lockb':
return 'bun'
+ case 'package-lock.json':
+ return 'npm'
default:
return 'npm'
}
diff --git a/packages/next/src/lib/helpers/get-pkg-manager.ts b/packages/next/src/lib/helpers/get-pkg-manager.ts
index 7d05594b7e..831eecc8b9 100644
--- a/packages/next/src/lib/helpers/get-pkg-manager.ts
+++ b/packages/next/src/lib/helpers/get-pkg-manager.ts
@@ -6,6 +6,16 @@ export type PackageManager = 'npm' | 'pnpm' | 'yarn'
export function getPkgManager(baseDir: string): PackageManager {
try {
+ const userAgent = process.env.npm_config_user_agent
+ if (userAgent) {
+ if (userAgent.startsWith('yarn')) {
+ return 'yarn'
+ } else if (userAgent.startsWith('pnpm')) {
+ return 'pnpm'
+ } else if (userAgent.startsWith('npm')) {
+ return 'npm'
+ }
+ }
for (const { lockFile, packageManager } of [
{ lockFile: 'yarn.lock', packageManager: 'yarn' },
{ lockFile: 'pnpm-lock.yaml', packageManager: 'pnpm' },
@@ -15,14 +25,6 @@ export function getPkgManager(baseDir: string): PackageManager {
return packageManager as PackageManager
}
}
- const userAgent = process.env.npm_config_user_agent
- if (userAgent) {
- if (userAgent.startsWith('yarn')) {
- return 'yarn'
- } else if (userAgent.startsWith('pnpm')) {
- return 'pnpm'
- }
- }
try {
execSync('yarn --version', { stdio: 'ignore' })
return 'yarn'
|