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.

Sign up for GitHub

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

Jump to bottom

fix(create-vite): distinguish pnpm pkgManager #4220

Merged
merged 9 commits into from
Jul 30, 2021
Merged

fix(create-vite): distinguish pnpm pkgManager #4220

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
738386e
fix(create-vite): distinguish pnpm pkgManager
1wkk Jul 12, 2021
3e94883
Merge branch 'main' into main
antfu Jul 12, 2021
fea1bfd
fix(create-vite): distinguish pkgManager
1wkk Jul 14, 2021
1a1a95a
Merge branch 'main' of https://github.com/cabbage9/vite
1wkk Jul 14, 2021
2d13600
Merge branch 'vitejs:main' into main
1wkk Jul 14, 2021
67ffa26
Merge branch 'main' into main
Shinigami92 Jul 30, 2021
40823e0
fix(create-vite): distinguish pkgManager
1wkk Jul 30, 2021
9197e12
Merge branch 'main' into main
Shinigami92 Jul 30, 2021
78deec2
chore: missing spacing
patak-dev Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions packages/create-vite/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,17 @@ async function init() {

write('package.json', JSON.stringify(pkg, null, 2))

const pkgManager = /yarn/.test(process.env.npm_execpath) ? 'yarn' : 'npm'
const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent)
const pkgManager = pkgInfo ? pkgInfo.name : 'npm'
Shinigami92 marked this conversation as resolved.
Show resolved Hide resolved

console.log(`\nDone. Now run:\n`)
if (root !== cwd) {
console.log(` cd ${path.relative(cwd, root)}`)
}
console.log(` ${pkgManager === 'yarn' ? `yarn` : `npm install`}`)
console.log(` ${pkgManager === 'yarn' ? `yarn dev` : `npm run dev`}`)
console.log(` ${pkgManager === 'yarn' ? `yarn` : `${pkgManager} install`}`)
console.log(
` ${pkgManager === 'yarn' ? `yarn dev` : `${pkgManager} run dev`}`
)
1wkk marked this conversation as resolved.
Show resolved Hide resolved
console.log()
}

Expand Down Expand Up @@ -318,6 +321,20 @@ function emptyDir(dir) {
}
}

/**
* @param {string | undefined} userAgent process.env.npm_config_user_agent
* @returns object | undefined
*/
function pkgFromUserAgent(userAgent) {
if (!userAgent) return undefined
const pkgSpec = userAgent.split(' ')[0]
const pkgSpecArr = pkgSpec.split('/')
return {
name: pkgSpecArr[0],
version: pkgSpecArr[1]
}
}

init().catch((e) => {
console.error(e)
})