chore: bump version

Author: sonofmagic

.changeset/merge-pnpm-workspace.yaml.md

@@ -0,0 +1,5 @@
+---
+'@icebreakers/monorepo': patch
+---
+
+Add merge-on-upgrade for `pnpm-workspace.yaml` so missing defaults are filled without overwriting existing workspace settings.

apps/client/package.json

@@ -44,7 +44,7 @@
     "vite": "^7.2.6",
     "vite-plugin-vue-devtools": "^8.0.5",
     "vite-tsconfig-paths": "^5.1.4",
-    "vue-tsc": "3.1.5",
+    "vue-tsc": "3.1.6",
     "wrangler": "^4.53.0",
     "zod": "^4.1.13"
   }

package.json

@@ -44,7 +44,7 @@
     "@changesets/cli": "^2.29.8",
     "@commitlint/cli": "^20.2.0",
     "@icebreakers/commitlint-config": "^1.2.3",
-    "@icebreakers/eslint-config": "^1.6.3",
+    "@icebreakers/eslint-config": "^1.6.4",
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^1.2.3",
     "@types/fs-extra": "^11.0.4",

packages/monorepo/package.json

@@ -92,7 +92,8 @@
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "semver": "^7.7.3",
-    "simple-git": "^3.30.0"
+    "simple-git": "^3.30.0",
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
     "@types/klaw": "^3.0.7",

packages/monorepo/src/commands/upgrade/index.ts

@@ -6,6 +6,7 @@ import fs from 'fs-extra'
 import klaw from 'klaw'
 import path from 'pathe'
 import set from 'set-value'
+import YAML from 'yaml'
 import { assetsDir } from '../../constants'
 import { resolveCommandConfig } from '../../core/config'
 import { GitClient } from '../../core/git'
@@ -14,6 +15,7 @@ import { escapeStringRegexp, isIgnorableFsError, isMatch, toWorkspaceGitignorePa
 import { evaluateWriteIntent, flushPendingOverwrites, scheduleOverwrite } from './overwrite'
 import { setPkgJson } from './pkg-json'
 import { getAssetTargets } from './targets'
+import { mergeWorkspaceManifest, normalizeWorkspaceManifest } from './workspace'
 
 export { setPkgJson }
 
@@ -110,6 +112,32 @@ export async function upgradeMonorepo(opts: CliOpts) {
         continue
       }
 
+      if (relPath === 'pnpm-workspace.yaml') {
+        const sourceManifest = normalizeWorkspaceManifest(
+          YAML.parse(await fs.readFile(file.path, 'utf8')),
+        )
+        const exists = await fs.pathExists(targetPath)
+        const targetManifest = exists
+          ? normalizeWorkspaceManifest(YAML.parse(await fs.readFile(targetPath, 'utf8')))
+          : normalizeWorkspaceManifest({})
+        const mergedManifest = exists
+          ? mergeWorkspaceManifest(sourceManifest, targetManifest)
+          : sourceManifest
+        const data = YAML.stringify(mergedManifest)
+        const intent = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data })
+        const action = async () => {
+          await fs.outputFile(targetPath, data, 'utf8')
+          logger.success(targetPath)
+        }
+        await scheduleOverwrite(intent, {
+          relPath,
+          targetPath,
+          action,
+          pending: pendingOverwrites,
+        })
+        continue
+      }
+
       if (relPath === '.changeset/config.json' && repoName) {
         const changesetJson = await fs.readJson(file.path)
         set(changesetJson, 'changelog.1.repo', repoName)

packages/monorepo/src/commands/upgrade/workspace.ts

@@ -0,0 +1,59 @@
+import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest'
+
+export type WorkspaceManifestLike = Partial<WorkspaceManifest> & Record<string, unknown>
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+export function normalizeWorkspaceManifest(manifest: unknown): WorkspaceManifestLike {
+  if (isPlainObject(manifest)) {
+    return { ...manifest }
+  }
+  return {}
+}
+
+function mergeUniqueArray<T>(target: T[], source: T[]) {
+  const result = [...target]
+  for (const item of source) {
+    if (!result.includes(item)) {
+      result.push(item)
+    }
+  }
+  return result
+}
+
+/**
+ * Merge pnpm workspace manifests by filling missing fields only.
+ * Existing values take precedence; arrays are deduped while keeping target order.
+ */
+export function mergeWorkspaceManifest(source: WorkspaceManifestLike, target: WorkspaceManifestLike): WorkspaceManifestLike {
+  const normalizedSource = normalizeWorkspaceManifest(source)
+  const normalizedTarget = normalizeWorkspaceManifest(target)
+  const result: WorkspaceManifestLike = { ...normalizedTarget }
+
+  for (const [key, value] of Object.entries(normalizedSource)) {
+    const current = (normalizedTarget as Record<string, unknown>)[key]
+    if (current === undefined) {
+      (result as Record<string, unknown>)[key] = value
+      continue
+    }
+
+    if (Array.isArray(current) && Array.isArray(value)) {
+      (result as Record<string, unknown>)[key] = mergeUniqueArray(current, value)
+      continue
+    }
+
+    if (isPlainObject(current) && isPlainObject(value)) {
+      (result as Record<string, unknown>)[key] = mergeWorkspaceManifest(
+        value as WorkspaceManifestLike,
+        current as WorkspaceManifestLike,
+      )
+      continue
+    }
+
+    (result as Record<string, unknown>)[key] = current
+  }
+
+  return result
+}

packages/monorepo/test/commands/upgrade.workspace.test.ts

@@ -0,0 +1,54 @@
+import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest'
+import { describe, expect, it } from 'vitest'
+import { mergeWorkspaceManifest, normalizeWorkspaceManifest } from '@/commands/upgrade/workspace'
+
+describe('mergeWorkspaceManifest', () => {
+  it('adds missing workspace config without overriding existing values', () => {
+    const source: WorkspaceManifest = normalizeWorkspaceManifest({
+      packages: ['apps/*', 'packages/*', '!**/test/**'],
+      onlyBuiltDependencies: ['esbuild', 'sharp'],
+      catalogs: {
+        default: {
+          typescript: '5.5.0',
+          vitest: '2.0.0',
+        },
+      },
+    })
+    const target: WorkspaceManifest = normalizeWorkspaceManifest({
+      packages: ['apps/*'],
+      onlyBuiltDependencies: ['sharp'],
+      catalogs: {
+        default: {
+          typescript: '5.4.0',
+        },
+        custom: {
+          eslint: '9.0.0',
+        },
+      },
+    })
+
+    const merged = mergeWorkspaceManifest(source, target)
+
+    expect(merged.packages).toEqual(['apps/*', 'packages/*', '!**/test/**'])
+    expect(merged.onlyBuiltDependencies).toEqual(['sharp', 'esbuild'])
+    expect(merged.catalogs).toEqual({
+      default: {
+        typescript: '5.4.0',
+        vitest: '2.0.0',
+      },
+      custom: {
+        eslint: '9.0.0',
+      },
+    })
+  })
+
+  it('keeps target shapes when source types differ', () => {
+    const merged = mergeWorkspaceManifest(
+      normalizeWorkspaceManifest({ packages: ['apps/*'], hoist: true }),
+      normalizeWorkspaceManifest({ packages: 'string-value', hoist: false }),
+    )
+
+    expect(merged.packages).toBe('string-value')
+    expect(merged.hoist).toBe(false)
+  })
+})

packages/vue-lib-template/package.json

@@ -56,6 +56,6 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.25",
     "vue-router": "^4.6.3",
-    "vue-tsc": "^3.1.5"
+    "vue-tsc": "^3.1.6"
   }
 }