@@ -780,6 +780,8 @@ async function initMonorepo(rootProjectDir: string, packageManager: string) {
780780 editFile ( path . join ( rootProjectDir , 'package.json' ) , ( content ) => {
781781 const pkg = JSON . parse ( content ) ;
782782 pkg . workspaces = undefined ;
783+ // remove resolutions field
784+ pkg . resolutions = undefined ;
783785 return JSON . stringify ( pkg , null , 2 ) + '\n' ;
784786 } ) ;
785787 fs . unlinkSync ( path . join ( rootProjectDir , '.yarnrc.yml' ) ) ;
@@ -823,7 +825,15 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana
823825 const pkg = JSON . parse ( content ) ;
824826
825827 // force to use the latest vite-plus instead of vite
826- if ( ! isMonorepo ) {
828+ if ( isMonorepo ) {
829+ // change deps version to catalog
830+ const names = [ '@types/node' , 'bumpp' , 'happy-dom' , 'vitest' , 'typescript' , 'tsdown' , 'vite' ] ;
831+ for ( const name of names ) {
832+ if ( pkg . devDependencies ?. [ name ] ) {
833+ pkg . devDependencies [ name ] = `catalog:` ;
834+ }
835+ }
836+ } else {
827837 const viteVersion = 'npm:@voidzero-dev/vite-plus@latest' ;
828838 pkg . devDependencies [ 'vite' ] = viteVersion ;
829839 if ( selectedPackageManager === 'pnpm' ) {
@@ -847,14 +857,6 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana
847857 vite : viteVersion ,
848858 } ;
849859 }
850- } else {
851- // change deps version to catalog
852- const names = [ '@types/node' , 'bumpp' , 'happy-dom' , 'vitest' , 'typescript' , 'tsdown' , 'vite' ] ;
853- for ( const name of names ) {
854- if ( pkg . devDependencies ?. [ name ] ) {
855- pkg . devDependencies [ name ] = `catalog:` ;
856- }
857- }
858860 }
859861 // fix vite dev command
860862 if ( pkg . scripts ?. dev === 'vite' ) {
@@ -886,9 +888,9 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana
886888 await setPackageManager ( projectDir , selectedPackageManager ) ;
887889 // copy .npmrc file to install vite-plus
888890 if ( selectedPackageManager === 'yarn' ) {
889- copy ( path . join ( pkgRoot , 'templates/config/.yarnrc .yml' ) , path . join ( projectDir , '.yarnrc.yml' ) ) ;
891+ copy ( path . join ( pkgRoot , 'templates/config/_yarnrc .yml' ) , path . join ( projectDir , '.yarnrc.yml' ) ) ;
890892 } else {
891- copy ( path . join ( pkgRoot , 'templates/config/.npmrc ' ) , path . join ( projectDir , '.npmrc' ) ) ;
893+ copy ( path . join ( pkgRoot , 'templates/config/_npmrc ' ) , path . join ( projectDir , '.npmrc' ) ) ;
892894 }
893895 }
894896
0 commit comments