Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions packages/global/snap-tests/new-monorepo/snap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ vite.config.ts
]
}
},
"resolutions": {
"vite": "catalog:",
"tsdown": "catalog:"
},
"packageManager": "pnpm@<semver>"
}

Expand Down
24 changes: 13 additions & 11 deletions packages/global/src/new.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -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:`;
Comment thread
fengmk2 marked this conversation as resolved.
}
}
} else {
const viteVersion = 'npm:@voidzero-dev/vite-plus@latest';
pkg.devDependencies['vite'] = viteVersion;
if (selectedPackageManager === 'pnpm') {
Expand All @@ -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') {
Expand Down Expand Up @@ -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'));
}
}

Expand Down
5 changes: 0 additions & 5 deletions packages/global/templates/config/.yarnrc.yml

This file was deleted.

5 changes: 5 additions & 0 deletions packages/global/templates/config/_yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# used for install vite-plus
npmScopes:
voidzero-dev:
npmRegistryServer: 'https://npm.pkg.github.com'
npmAuthToken: '${GITHUB_TOKEN}'
Loading