chore(deps): upgrade

Author: sonofmagic

packages/monorepo/.changeset/quoted-workspace-globs.md

@@ -0,0 +1,5 @@
+---
+'@icebreakers/monorepo': patch
+---
+
+Ensure pnpm-workspace.yaml merges dedupe quoted globs and stringify with single quotes to avoid churn.

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

@@ -123,7 +123,7 @@ export async function upgradeMonorepo(opts: CliOpts) {
         const mergedManifest = exists
           ? mergeWorkspaceManifest(sourceManifest, targetManifest)
           : sourceManifest
-        const data = YAML.stringify(mergedManifest)
+        const data = YAML.stringify(mergedManifest, { singleQuote: true })
         const intent = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data })
         const action = async () => {
           await fs.outputFile(targetPath, data, 'utf8')

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

@@ -6,6 +6,15 @@ function isPlainObject(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
 
+function normalizeQuotedString(value: string) {
+  const trimmed = value.trim()
+  const first = trimmed[0]
+  if ((first === '\'' || first === '"') && trimmed.endsWith(first)) {
+    return trimmed.slice(1, -1)
+  }
+  return trimmed
+}
+
 export function normalizeWorkspaceManifest(manifest: unknown): WorkspaceManifestLike {
   if (isPlainObject(manifest)) {
     return { ...manifest }
@@ -14,9 +23,14 @@ export function normalizeWorkspaceManifest(manifest: unknown): WorkspaceManifest
 }
 
 function mergeUniqueArray<T>(target: T[], source: T[]) {
+  const seen = new Set(target.map((item) => {
+    return typeof item === 'string' ? normalizeQuotedString(item) : item
+  }))
   const result = [...target]
   for (const item of source) {
-    if (!result.includes(item)) {
+    const key = typeof item === 'string' ? normalizeQuotedString(item) : item
+    if (!seen.has(key)) {
+      seen.add(key)
       result.push(item)
     }
   }

packages/monorepo/test/commands/upgrade.index.coverage.test.ts

@@ -108,7 +108,7 @@ describe('upgrade command coverage', () => {
         mergeTargets: false,
       })
 
-    getAssetTargetsMock.mockReturnValue(['README.md', 'package.json', '.github'])
+    getAssetTargetsMock.mockReturnValue(['README.md', 'package.json', '.github', 'pnpm-workspace.yaml'])
 
     const initialFeed = [
       { path: '/assets/folder', isFile: false },
@@ -119,6 +119,7 @@ describe('upgrade command coverage', () => {
       { path: '/assets/LICENSE', isFile: true },
       { path: '/assets/.github/ISSUE_TEMPLATE/config.yml', isFile: true },
       { path: '/assets/README.md', isFile: true },
+      { path: '/assets/pnpm-workspace.yaml', isFile: true },
       { path: '/assets/error.txt', isFile: true },
     ]
     klawFeeds.push(initialFeed)
@@ -135,6 +136,20 @@ describe('upgrade command coverage', () => {
       '    about: Suggest new features for consideration',
       '',
     ].join('\n'))
+    fileContents.set('/assets/pnpm-workspace.yaml', [
+      'packages:',
+      '  - apps/*',
+      '  - packages/*',
+      '  - \'!**/test/**\'',
+      '',
+    ].join('\n'))
+    fileContents.set('/workspace/pnpm-workspace.yaml', [
+      'packages:',
+      '  - apps/*',
+      '  - packages/*',
+      '  - \"!**/test/**\"',
+      '',
+    ].join('\n'))
 
     jsonContents.set('/assets/package.json', {
       dependencies: {
@@ -209,6 +224,8 @@ describe('upgrade command coverage', () => {
     const issueTemplateCall = outputFileMock.mock.calls.find(args => args[0] === '/workspace/.github/ISSUE_TEMPLATE/config.yml')
     expect(issueTemplateCall?.[1]).toBeDefined()
     expect(issueTemplateCall?.[1] as string).toContain('https://github.com/ice/awesome/discussions')
+    const workspaceCall = outputFileMock.mock.calls.find(args => args[0] === '/workspace/pnpm-workspace.yaml')
+    expect(workspaceCall?.[1]).toContain('- \'!**/test/**\'')
 
     evaluateWriteIntentMock.mockResolvedValueOnce({ type: 'write', reason: 'missing' })
     readFileMock.mockImplementation(async () => {

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

@@ -42,6 +42,15 @@ describe('mergeWorkspaceManifest', () => {
     })
   })
 
+  it('dedupes workspace globs regardless of wrapping quotes', () => {
+    const merged = mergeWorkspaceManifest(
+      normalizeWorkspaceManifest({ packages: ['apps/*', '!**/test/**'] }),
+      normalizeWorkspaceManifest({ packages: [`'apps/*'`, `"!**/test/**"`] }),
+    )
+
+    expect(merged.packages).toEqual([`'apps/*'`, `"!**/test/**"`])
+  })
+
   it('keeps target shapes when source types differ', () => {
     const merged = mergeWorkspaceManifest(
       normalizeWorkspaceManifest({ packages: ['apps/*'], hoist: true }),