diff --git a/packages/global/snap-tests/new-monorepo/snap.txt b/packages/global/snap-tests/new-monorepo/snap.txt index 371dcc3fd8..22d05e8868 100644 --- a/packages/global/snap-tests/new-monorepo/snap.txt +++ b/packages/global/snap-tests/new-monorepo/snap.txt @@ -87,10 +87,6 @@ vite.config.ts ] } }, - "resolutions": { - "vite": "catalog:", - "tsdown": "catalog:" - }, "packageManager": "pnpm@" } diff --git a/packages/global/src/new.ts b/packages/global/src/new.ts index 5fea59023c..e7eaee1d46 100644 --- a/packages/global/src/new.ts +++ b/packages/global/src/new.ts @@ -780,6 +780,8 @@ async function initMonorepo(rootProjectDir: string, packageManager: string) { editFile(path.join(rootProjectDir, 'package.json'), (content) => { const pkg = JSON.parse(content); pkg.workspaces = undefined; + // remove resolutions field + pkg.resolutions = undefined; return JSON.stringify(pkg, null, 2) + '\n'; }); fs.unlinkSync(path.join(rootProjectDir, '.yarnrc.yml')); @@ -823,7 +825,15 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana const pkg = JSON.parse(content); // force to use the latest vite-plus instead of vite - if (!isMonorepo) { + if (isMonorepo) { + // change deps version to catalog + const names = ['@types/node', 'bumpp', 'happy-dom', 'vitest', 'typescript', 'tsdown', 'vite']; + for (const name of names) { + if (pkg.devDependencies?.[name]) { + pkg.devDependencies[name] = `catalog:`; + } + } + } else { const viteVersion = 'npm:@voidzero-dev/vite-plus@latest'; pkg.devDependencies['vite'] = viteVersion; if (selectedPackageManager === 'pnpm') { @@ -847,14 +857,6 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana vite: viteVersion, }; } - } else { - // change deps version to catalog - const names = ['@types/node', 'bumpp', 'happy-dom', 'vitest', 'typescript', 'tsdown', 'vite']; - for (const name of names) { - if (pkg.devDependencies?.[name]) { - pkg.devDependencies[name] = `catalog:`; - } - } } // fix vite dev command if (pkg.scripts?.dev === 'vite') { @@ -886,9 +888,9 @@ async function fixPackageJsonForVitePlus(projectDir: string, selectedPackageMana await setPackageManager(projectDir, selectedPackageManager); // copy .npmrc file to install vite-plus if (selectedPackageManager === 'yarn') { - copy(path.join(pkgRoot, 'templates/config/.yarnrc.yml'), path.join(projectDir, '.yarnrc.yml')); + copy(path.join(pkgRoot, 'templates/config/_yarnrc.yml'), path.join(projectDir, '.yarnrc.yml')); } else { - copy(path.join(pkgRoot, 'templates/config/.npmrc'), path.join(projectDir, '.npmrc')); + copy(path.join(pkgRoot, 'templates/config/_npmrc'), path.join(projectDir, '.npmrc')); } } diff --git a/packages/global/templates/config/.yarnrc.yml b/packages/global/templates/config/.yarnrc.yml deleted file mode 100644 index 393f22fc24..0000000000 --- a/packages/global/templates/config/.yarnrc.yml +++ /dev/null @@ -1,5 +0,0 @@ -# used for install vite-plus -npmScopes: - voidzero-dev: - npmRegistryServer: "https://npm.pkg.github.com" - npmAuthToken: "${GITHUB_TOKEN}" diff --git a/packages/global/templates/config/.npmrc b/packages/global/templates/config/_npmrc similarity index 100% rename from packages/global/templates/config/.npmrc rename to packages/global/templates/config/_npmrc diff --git a/packages/global/templates/config/_yarnrc.yml b/packages/global/templates/config/_yarnrc.yml new file mode 100644 index 0000000000..f9a9a44413 --- /dev/null +++ b/packages/global/templates/config/_yarnrc.yml @@ -0,0 +1,5 @@ +# used for install vite-plus +npmScopes: + voidzero-dev: + npmRegistryServer: 'https://npm.pkg.github.com' + npmAuthToken: '${GITHUB_TOKEN}'