fix(init): handle skipped setup steps

Author: danielroe

packages/create-nuxt/src/init.ts

@@ -116,14 +116,15 @@ export function getNextSteps(options: {
 dir: string
 shell: boolean
 installFailure?: unknown
+installSkipped?: boolean
 recoveryCommands: string[]
 packageManager: PackageManagerName
 }): string[]{
-const{ dir, shell, installFailure, recoveryCommands, packageManager }=options
+const{ dir, shell, installFailure,installSkipped,recoveryCommands, packageManager }=options
 construnCmd=packageManager==='deno' ? 'task' : 'run'
 return[
 !shell&&dir!=='.'&&`cd ${dir}`,
-installFailure&&`${packageManager} install`,
+(installFailure||installSkipped)&&`${packageManager} install`,
  ...recoveryCommands,
 `${packageManager}${runCmd} dev`,
 ].filter((step): step is string=>typeofstep==='string')
@@ -459,7 +460,7 @@ export default defineCommand({
 }
 
 constnightlyNuxtPackageJsonVersion=`npm:nuxt-nightly@${nightlyChannelVersion}`
-constpackageJsonPath=resolve(cwd,dir)
+constpackageJsonPath=join(template.dir,'package.json')
 
 constpackageJson=awaitreadPackageJSON(packageJsonPath)
 
@@ -470,7 +471,7 @@ export default defineCommand({
 packageJson.devDependencies.nuxt=nightlyNuxtPackageJsonVersion
 }
 
-awaitwritePackageJSON(join(packageJsonPath,'package.json'),packageJson)
+awaitwritePackageJSON(packageJsonPath,packageJson)
 nightlySpinner.stop(`Updated to nightly version ${styleText('cyan',nightlyChannelVersion)}`)
 }
 
@@ -599,20 +600,6 @@ export default defineCommand({
 
 installLog.finish(result)
 
-if(gitInit){
-constgitSpinner=spinner()
-gitSpinner.start('Initializing git repository')
-
-constgit=awaitx('git',['init',template.dir],{throwOnError: false})
-if(git.exitCode===0){
-gitSpinner.stop('Git repository initialized')
-}
-else{
-gitSpinner.error('Git initialization failed')
-logger.message(git.stderr.trim().split('\n'),{symbol: styleText('gray',S_BAR)})
-}
-}
-
 // `approve-builds` is a pnpm command, so only pnpm gets the offer even if
 // another package manager ever prints the same notice.
 if(ignoredBuilds.length>0&&selectedPackageManager==='pnpm'){
@@ -634,6 +621,23 @@ export default defineCommand({
 }
 }
 
+if(gitInit){
+constgitSpinner=spinner()
+gitSpinner.start('Initializing git repository')
+
+constgit=awaitx('git',['init'],{
+throwOnError: false,
+nodeOptions: {cwd: template.dir},
+})
+if(git.exitCode===0){
+gitSpinner.stop('Git repository initialized')
+}
+else{
+gitSpinner.error('Git initialization failed')
+logger.message(git.stderr.trim().split('\n'),{symbol: styleText('gray',S_BAR)})
+}
+}
+
 constmodulesToAdd: string[]=[]
 // `ctx.args.modules` is `false` when --no-modules is used and `undefined`
 // when the user has not decided either way.
@@ -731,7 +735,7 @@ export default defineCommand({
 if(modulesToAdd.length>0){
 constargs: string[]=[
  ...modulesToAdd,
-`--cwd=${templateDownloadPath}`,
+`--cwd=${template.dir}`,
 installRequested&&!skipInstallOnConflict ? '' : '--skipInstall',
 `--packageManager=${selectedPackageManager}`,
 ctx.args.logLevel ? `--logLevel=${ctx.args.logLevel}` : '',
@@ -777,6 +781,7 @@ export default defineCommand({
 dir: projectDir,
 shell: !!ctx.args.shell,
  installFailure,
+installSkipped: !installRequested&&!skipInstallOnConflict,
  recoveryCommands,
 packageManager: selectedPackageManager,
 })

packages/create-nuxt/test/e2e/init.spec.ts

@@ -37,12 +37,14 @@ describe('non-interactive mode (no TTY)', () => {
 
 awaitrm(installPath,{recursive: true,force: true})
 try{
-awaitx(createNuxt,[installPath,'--template=minimal','--packageManager=pnpm','--gitInit=false','--preferOffline','--install=false'],{
+constresult=awaitx(createNuxt,[installPath,'--template=minimal','--packageManager=pnpm','--gitInit=true','--preferOffline','--install=false'],{
 throwOnError: true,
 nodeOptions: {stdio: 'pipe',cwd: fixtureDir},
 })
 
 expect(existsSync(join(installPath,'package.json'))).toBeTruthy()
+expect(existsSync(join(installPath,'.git'))).toBeTruthy()
+expect(result.stdout+result.stderr).toContain('pnpm install')
 }
 finally{
 awaitrm(installPath,{recursive: true,force: true})

packages/create-nuxt/test/unit/init.spec.ts

@@ -54,6 +54,14 @@ describe('getNextSteps', () => {
 expect(getNextSteps({ ...base,dir: 'my-app',shell: true})).toEqual(['npm run dev'])
 })
 
+it('should include install when dependency installation was skipped',()=>{
+expect(getNextSteps({
+ ...base,
+dir: 'my-app',
+installSkipped: true,
+})).toEqual(['cd my-app','npm install','npm run dev'])
+})
+
 it('should ask for a retried install before recovery commands',()=>{
 expect(getNextSteps({
  ...base,