fix(vue-macros): override catalog

package.json

@@ -63,6 +63,12 @@
     "rimraf": "^5.0.10",
     "simple-git-hooks": "^2.11.1",
     "tsx": "^4.19.1",
-    "typescript": "^5.6.2"
+    "typescript": "^5.6.2",
+    "yaml": "^2.5.1"
+  },
+  "pnpm": {
+    "overrides": {
+      "cookie@<0.7.0": ">=0.7.0"
+    }
   }
 }

tests/vue-macros.ts

@@ -1,13 +1,27 @@
 import { runInRepo } from '../utils.ts'
-import { RunOptions } from '../types.ts'
+import { Overrides, RunOptions } from '../types.ts'
+import YAML from 'yaml'
 
 export async function test(options: RunOptions) {
+	const overrideVueVersion = '@^3'
 	await runInRepo({
 		...options,
 		repo: 'vue-macros/vue-macros',
 		branch: 'main',
 		build: 'build',
 		test: ['test:ecosystem'],
-		overrideVueVersion: '@^3',
+		overrideVueVersion,
+		patchFiles: {
+			'pnpm-workspace.yaml': (content: string, overrides: Overrides) => {
+				const data = YAML.parse(content)
+				Object.keys(overrides).forEach((key) => {
+					const pkgName = key.replace(overrideVueVersion, '')
+					if (data.catalog[pkgName]) {
+						data.catalog[pkgName] = overrides[key]
+					}
+				})
+				return YAML.stringify(data)
+			},
+		},
 	})
 }

types.d.ts

@@ -23,7 +23,7 @@ export interface RunOptions {
 	beforeInstall?: Task | Task[]
 	beforeBuild?: Task | Task[]
 	beforeTest?: Task | Task[]
-	patchFiles?: Record<string, (content: string) => string>
+	patchFiles?: Record<string, (content: string, overrides: Overrides) => string>
 }
 
 type Task = string | { script: string; args?: string[] } | (() => Promise<any>)

utils.ts

@@ -267,12 +267,40 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
 		)
 	}
 
+	const overrides = options.overrides || {}
+	const vuePackages = await getVuePackages()
+
+	if (options.release) {
+		// pkg.pr.new support
+		for (const pkg of vuePackages) {
+			let version = options.release
+			if (options.release.startsWith('@')) {
+				version = `https://pkg.pr.new/${pkg.name}@${options.release.slice(1)}`
+			}
+			if (overrides[pkg.name] && overrides[pkg.name] !== version) {
+				throw new Error(
+					`conflicting overrides[${pkg.name}]=${
+						overrides[pkg.name]
+					} and --release=${
+						options.release
+					} config. Use either one or the other`,
+				)
+			} else {
+				overrides[`${pkg.name}${overrideVueVersion}`] = version
+			}
+		}
+	} else {
+		for (const pkg of vuePackages) {
+			overrides[pkg.name] ||= pkg.hashedVersion
+		}
+	}
+
 	if (patchFiles) {
 		for (const fileName in patchFiles) {
 			const filePath = path.resolve(dir, fileName)
 			const patchFn = patchFiles[fileName]
 			const content = fs.readFileSync(filePath, 'utf-8')
-			fs.writeFileSync(filePath, patchFn(content))
+			fs.writeFileSync(filePath, patchFn(content, overrides))
 			console.log(`patched file: ${fileName}`)
 		}
 	}
@@ -297,36 +325,8 @@ export async function runInRepo(options: RunOptions & RepoOptions) {
 		await beforeTestCommand?.(pkg.scripts)
 		await testCommand?.(pkg.scripts)
 	}
-	const overrides = options.overrides || {}
-
-	const vuePackages = await getVuePackages()
 
-	if (options.release) {
-		// pkg.pr.new support
-		for (const pkg of vuePackages) {
-			let version = options.release
-			if (options.release.startsWith('@')) {
-				version = `https://pkg.pr.new/${pkg.name}@${options.release.slice(1)}`
-			}
-			if (overrides[pkg.name] && overrides[pkg.name] !== version) {
-				throw new Error(
-					`conflicting overrides[${pkg.name}]=${
-						overrides[pkg.name]
-					} and --release=${
-						options.release
-					} config. Use either one or the other`,
-				)
-			} else {
-				overrides[`${pkg.name}${overrideVueVersion}`] = version
-			}
-		}
-	} else {
-		for (const pkg of vuePackages) {
-			overrides[pkg.name] ||= pkg.hashedVersion
-		}
-	}
 	await applyPackageOverrides(dir, pkg, overrides)
-
 	await beforeBuildCommand?.(pkg.scripts)
 	await buildCommand?.(pkg.scripts)
 	if (test) {