create-turbo-kit 1.3.1 → 1.3.2

package/README.MD

@@ -28,4 +28,7 @@ To run the script (manually):
 **Do not run in this directory!**
 ```bash
 node <path-to-cli>/dist/cli.js
-```
+```
+
+## Package manager support
+Currently turbo-kit works with only pnpm. There is an issue with the template repo that breaks the conversion to other package managers that is typically handled by create-turbo.

package/dist/{chunk-6ZFG4OIY.js → chunk-Q43WSJ4J.js}

@@ -39,6 +39,19 @@ var DOCKER_CONTAINERS = {
     dependsOn: []
   }
 };
+function sortPackageJsonDependencies(pkg) {
+  const depTypes = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
+  for (const depType of depTypes) {
+    const deps = pkg[depType];
+    if (deps && typeof deps === "object") {
+      const sorted = Object.keys(deps).sort().reduce((acc, key) => {
+        acc[key] = deps[key];
+        return acc;
+      }, {});
+      pkg[depType] = sorted;
+    }
+  }
+}
 async function replaceScope(projectDir, newScope) {
   const s = spinner();
   s.start(`Replacing scope with ${color.cyan(newScope)}...`);
@@ -70,7 +83,23 @@ async function replaceScope(projectDir, newScope) {
         }
       })
     );
-    s.stop(`Replaced scope with ${color.cyan(newScope)}`);
+    s.message("Sorting dependencies alphabetically...");
+    const packageJsonFiles = await fg("**/package.json", {
+      cwd: projectDir,
+      ignore: ["**/node_modules/**"],
+      absolute: true
+    });
+    await Promise.all(
+      packageJsonFiles.map(async (file) => {
+        try {
+          const pkg = await fs.readJson(file);
+          sortPackageJsonDependencies(pkg);
+          await fs.writeJson(file, pkg, { spaces: 2 });
+        } catch (e) {
+        }
+      })
+    );
+    s.stop(`Replaced scope with ${color.cyan(newScope)} and sorted dependencies`);
   } catch (error) {
     s.stop("Failed to replace scope");
     throw error;
@@ -310,4 +339,4 @@ export {
   removeReactEmail,
   resolveCatalogVersions
 };
-//# sourceMappingURL=chunk-6ZFG4OIY.js.map
+//# sourceMappingURL=chunk-Q43WSJ4J.js.map

package/dist/chunk-Q43WSJ4J.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/helpers/transform.ts"],"sourcesContent":["import fg from 'fast-glob';\r\nimport fs from 'fs-extra';\r\nimport path from 'path';\r\nimport { spinner } from '@clack/prompts';\r\nimport color from 'picocolors';\r\nimport YAML from 'yaml';\r\nimport type { PackageManager } from '../utils/package-manager.js';\r\n\r\nconst DOCKER_CONTAINERS = {\r\n  postgres: {\r\n    label: 'PostgreSQL 16 (Database)',\r\n    services: ['postgres'],\r\n    volumes: ['postgres_data'],\r\n    dependsOn: [], \r\n  },\r\n  pgadmin: {\r\n    label: `pgAdmin 4.9 (Database management) [Depends on PostgreSQL]`,\r\n    services: ['pgadmin'],\r\n    volumes: [],\r\n    dependsOn: ['postgres'],\r\n  },\r\n  redis: {\r\n    label: 'Redis (Caching)',\r\n    services: ['redis'],\r\n    volumes: [],\r\n    dependsOn: [],\r\n  },\r\n  mailpit: {\r\n    label: 'Mailpit (Email testing)',\r\n    services: ['mailpit'],\r\n    volumes: [],\r\n    dependsOn: [],\r\n  },\r\n  minio: {\r\n    label: 'MinIO (S3-compatible storage)',\r\n    services: ['minio', 'minio-create-bucket'],\r\n    volumes: ['minio_data'],\r\n    dependsOn: [],\r\n  },\r\n} as const;\r\n\r\nexport type DockerContainer = keyof typeof DOCKER_CONTAINERS;\r\n\r\n/**\r\n * Sort dependencies alphabetically in a package.json object\r\n */\r\nfunction sortPackageJsonDependencies(pkg: PackageJson): void {\r\n  const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;\r\n  \r\n  for (const depType of depTypes) {\r\n    const deps = pkg[depType];\r\n    if (deps && typeof deps === 'object') {\r\n      const sorted = Object.keys(deps)\r\n        .sort()\r\n        .reduce((acc, key) => {\r\n          acc[key] = deps[key]!;\r\n          return acc;\r\n        }, {} as Record<string, string>);\r\n      pkg[depType] = sorted;\r\n    }\r\n  }\r\n}\r\n\r\nexport async function replaceScope(projectDir: string, newScope: string) {\r\n  const s = spinner();\r\n  s.start(`Replacing scope with ${color.cyan(newScope)}...`);\r\n\r\n  try {\r\n    const files = await fg('**/*', {\r\n      cwd: projectDir,\r\n      ignore: [\r\n        '**/.git/**',\r\n        '**/node_modules/**',\r\n        '**/.turbo/**',\r\n        '**/dist/**',\r\n        '**/.next/**',\r\n        '**/pnpm-lock.yaml',\r\n        '**/yarn.lock',\r\n        '**/package-lock.json',\r\n        '**/bun.lockb',\r\n      ],\r\n      absolute: true,\r\n    });\r\n\r\n    await Promise.all(\r\n      files.map(async (file) => {\r\n        try {\r\n          const content = await fs.readFile(file, 'utf8');\r\n          if (content.includes('@acme')) {\r\n            const newContent = content.replace(/@acme/g, newScope);\r\n            await fs.writeFile(file, newContent);\r\n          }\r\n        } catch (e) {\r\n        }\r\n      })\r\n    );\r\n    \r\n    // Sort dependencies in all package.json files after replacing scope\r\n    s.message('Sorting dependencies alphabetically...');\r\n    const packageJsonFiles = await fg('**/package.json', {\r\n      cwd: projectDir,\r\n      ignore: ['**/node_modules/**'],\r\n      absolute: true,\r\n    });\r\n\r\n    await Promise.all(\r\n      packageJsonFiles.map(async (file) => {\r\n        try {\r\n          const pkg: PackageJson = await fs.readJson(file);\r\n          sortPackageJsonDependencies(pkg);\r\n          await fs.writeJson(file, pkg, { spaces: 2 });\r\n        } catch (e) {\r\n          // Ignore errors for malformed package.json files\r\n        }\r\n      })\r\n    );\r\n    \r\n    s.stop(`Replaced scope with ${color.cyan(newScope)} and sorted dependencies`);\r\n  } catch (error) {\r\n    s.stop('Failed to replace scope');\r\n    throw error;\r\n  }\r\n}\r\n\r\nexport async function setupEnv(projectDir: string) {\r\n  const envExample = path.join(projectDir, '.env.example');\r\n  const envDest = path.join(projectDir, '.env');\r\n\r\n  if (await fs.pathExists(envExample)) {\r\n    await fs.copy(envExample, envDest);\r\n  }\r\n}\r\n\r\nexport function getDockerContainers() {\r\n  return Object.entries(DOCKER_CONTAINERS).map(([value, config]) => ({\r\n    value,\r\n    label: config.label,\r\n  }));\r\n}\r\n\r\nexport async function deleteDockerCompose(projectDir: string) {\r\n  const s = spinner();\r\n  s.start('Removing Docker Compose setup...');\r\n\r\n  try {\r\n    const dockerComposePath = path.join(projectDir, 'docker-compose.yml');\r\n    if (await fs.pathExists(dockerComposePath)) {\r\n      await fs.remove(dockerComposePath);\r\n      s.message(`Removed ${color.cyan(dockerComposePath)}`);\r\n    }\r\n    const dockerDir = path.join(projectDir, 'docker');\r\n    if (await fs.pathExists(dockerDir)) {\r\n      await fs.remove(dockerDir);\r\n      s.message(`Removed ${color.cyan(dockerDir)}`);\r\n    }\r\n    s.stop('Removed Docker Compose setup');\r\n  } catch (error) {\r\n    s.stop('Failed to remove Docker Compose setup');\r\n    throw error;\r\n  }\r\n}\r\n\r\nfunction resolveContainerDependencies(selectedContainers: string[]): string[] {\r\n  const resolved = new Set<string>(selectedContainers);\r\n  const queue = [...selectedContainers];\r\n\r\n  while (queue.length > 0) {\r\n    const current = queue.shift()!;\r\n    const config = DOCKER_CONTAINERS[current as DockerContainer];\r\n    \r\n    if (config && config.dependsOn) {\r\n      for (const dep of config.dependsOn) {\r\n        if (!resolved.has(dep)) {\r\n          resolved.add(dep);\r\n          queue.push(dep);\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  return Array.from(resolved);\r\n}\r\n\r\nexport async function configureDockerCompose(projectDir: string, selectedContainers: string[]) {\r\n  const s = spinner();\r\n  s.start('Configuring Docker Compose...');\r\n\r\n  try {\r\n    const dockerComposePath = path.join(projectDir, 'docker-compose.yml');\r\n    \r\n    if (!(await fs.pathExists(dockerComposePath))) {\r\n      s.stop('Docker Compose file not found');\r\n      return;\r\n    }\r\n\r\n    const resolvedContainers = resolveContainerDependencies(selectedContainers);\r\n    const addedDependencies = resolvedContainers.filter(c => !selectedContainers.includes(c));\r\n    \r\n    if (addedDependencies.length > 0) {\r\n      s.message(`Auto-including dependencies: ${color.cyan(addedDependencies.join(', '))}`);\r\n    }\r\n\r\n    let content = await fs.readFile(dockerComposePath, 'utf8');\r\n\r\n    const allContainers = Object.keys(DOCKER_CONTAINERS) as DockerContainer[];\r\n    const containersToRemove = allContainers.filter(c => !resolvedContainers.includes(c));\r\n\r\n    for (const container of containersToRemove) {\r\n      const containerRegex = new RegExp(\r\n        `  # -- ${container} --\\\\n[\\\\s\\\\S]*?  # // ${container} //\\\\n`,\r\n        'g'\r\n      );\r\n      content = content.replace(containerRegex, '');\r\n\r\n      // delete `./docker/<container>/`\r\n      const dockerDirPath = path.join(projectDir, 'docker', container);\r\n      if (await fs.pathExists(dockerDirPath)) {\r\n        await fs.remove(dockerDirPath);\r\n        s.message(`Removed ${color.cyan(dockerDirPath)}`);\r\n      }\r\n    }\r\n\r\n    content = content.replace(/  # -- \\w+ --\\n/g, '');\r\n    content = content.replace(/  # \\/\\/ \\w+ \\/\\/\\n/g, '');\r\n\r\n    await fs.writeFile(dockerComposePath, content);\r\n\r\n    // check if `./docker/` is empty\r\n    const dockerDir = path.join(projectDir, 'docker');\r\n    if (await fs.pathExists(dockerDir) && (await fs.readdir(dockerDir)).length === 0) {\r\n      await fs.remove(dockerDir);\r\n      s.message(`Removed ${color.cyan(dockerDir)} ${color.gray('(because it was empty)')}`);\r\n    }\r\n    \r\n    s.stop(`Configured Docker Compose with ${color.cyan(resolvedContainers.length)} container(s)`);\r\n  } catch (error) {\r\n    s.stop('Failed to configure Docker Compose');\r\n    throw error;\r\n  }\r\n}\r\n\r\nexport async function removePackages(\r\n  packages: string[],\r\n  packagePath: string,\r\n  projectDir: string,\r\n  s?: ReturnType<typeof spinner>\r\n) {\r\n  const packageJsonPath = path.join(projectDir, packagePath, 'package.json');\r\n  if (await fs.pathExists(packageJsonPath)) {\r\n    const packageJson = await fs.readJson(packageJsonPath);\r\n    let hasChanges = false;\r\n\r\n    for (const dep of packages) {\r\n      if (packageJson.dependencies && packageJson.dependencies[dep]) {\r\n        delete packageJson.dependencies[dep];\r\n        hasChanges = true;\r\n        if (s) {\r\n          s.message(`Removed ${color.cyan(dep)} from ${packagePath}/package.json`);\r\n        }\r\n      }\r\n    }\r\n\r\n    if (hasChanges) {\r\n      await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });\r\n    }\r\n  }\r\n}\r\n\r\nexport async function removeReactEmail(projectDir: string) {\r\n  const s = spinner();\r\n  s.start('Removing react-email...');\r\n\r\n  try {\r\n    // remove email package\r\n    const emailPackagePath = path.join(projectDir, 'packages', 'email');\r\n    if (await fs.pathExists(emailPackagePath)) {\r\n      await fs.remove(emailPackagePath);\r\n      s.message(`Removed ${color.cyan(emailPackagePath)}`);\r\n    }\r\n\r\n    // remove @react-email/components from packages/api/package.json\r\n    await removePackages(['@react-email/components', '@acme/email'], 'packages/api', projectDir, s);\r\n\r\n    s.stop('Removed react-email');\r\n  } catch (error) {\r\n    s.stop('Failed to remove react-email');\r\n    throw error;\r\n  }\r\n}\r\n\r\ninterface PnpmWorkspace {\r\n  packages?: string[];\r\n  catalog?: Record<string, string>;\r\n  catalogs?: Record<string, Record<string, string>>;\r\n  overrides?: Record<string, string>;\r\n}\r\n\r\ninterface PackageJson {\r\n  name?: string;\r\n  packageManager?: string;\r\n  dependencies?: Record<string, string>;\r\n  devDependencies?: Record<string, string>;\r\n  peerDependencies?: Record<string, string>;\r\n  optionalDependencies?: Record<string, string>;\r\n  pnpm?: {\r\n    overrides?: Record<string, string>;\r\n    [key: string]: unknown;\r\n  };\r\n  overrides?: Record<string, string>;\r\n  resolutions?: Record<string, string>;\r\n  [key: string]: unknown;\r\n}\r\n\r\n/**\r\n * Resolves a version string that may contain catalog: or workspace: protocols\r\n */\r\nfunction resolveVersion(\r\n  packageName: string,\r\n  version: string,\r\n  defaultCatalog: Record<string, string>,\r\n  namedCatalogs: Record<string, Record<string, string>>\r\n): string {\r\n  // Handle catalog: (default catalog)\r\n  if (version === 'catalog:') {\r\n    const resolved = defaultCatalog[packageName];\r\n    if (resolved) {\r\n      return resolved;\r\n    }\r\n    // If not found in catalog, keep original (will likely fail at install)\r\n    return version;\r\n  }\r\n\r\n  // Handle catalog:catalogName (named catalog)\r\n  if (version.startsWith('catalog:')) {\r\n    const catalogName = version.slice('catalog:'.length);\r\n    const catalog = namedCatalogs[catalogName];\r\n    if (catalog && catalog[packageName]) {\r\n      return catalog[packageName];\r\n    }\r\n    // If not found in named catalog, keep original\r\n    return version;\r\n  }\r\n\r\n  // Handle workspace:* or workspace:^ etc.\r\n  if (version.startsWith('workspace:')) {\r\n    return '*';\r\n  }\r\n\r\n  return version;\r\n}\r\n\r\n/**\r\n * Resolves catalog versions in an overrides/resolutions object\r\n */\r\nfunction resolveOverrides(\r\n  overrides: Record<string, string>,\r\n  defaultCatalog: Record<string, string>,\r\n  namedCatalogs: Record<string, Record<string, string>>\r\n): Record<string, string> {\r\n  const resolved: Record<string, string> = {};\r\n  \r\n  for (const [pkg, version] of Object.entries(overrides)) {\r\n    resolved[pkg] = resolveVersion(pkg, version, defaultCatalog, namedCatalogs);\r\n  }\r\n  \r\n  return resolved;\r\n}\r\n\r\n/**\r\n * Resolves pnpm catalog versions in all package.json files when using a non-pnpm package manager.\r\n * \r\n * This transform:\r\n * 1. Parses pnpm-workspace.yaml to extract catalog version mappings\r\n * 2. Replaces catalog: and catalog:name versions with actual versions in all package.json files\r\n * 3. Replaces workspace:* references with *\r\n * 4. Converts pnpm.overrides to overrides (npm/bun) or resolutions (yarn)\r\n * 5. Removes the packageManager field from root package.json\r\n * 6. Deletes pnpm-workspace.yaml\r\n */\r\nexport async function resolveCatalogVersions(\r\n  projectDir: string,\r\n  packageManager: PackageManager\r\n) {\r\n  const s = spinner();\r\n  s.start('Resolving pnpm catalog versions...');\r\n\r\n  try {\r\n    // 1. Parse pnpm-workspace.yaml\r\n    const workspaceYamlPath = path.join(projectDir, 'pnpm-workspace.yaml');\r\n    \r\n    if (!(await fs.pathExists(workspaceYamlPath))) {\r\n      s.stop('No pnpm-workspace.yaml found, skipping catalog resolution');\r\n      return;\r\n    }\r\n\r\n    const workspaceContent = await fs.readFile(workspaceYamlPath, 'utf8');\r\n    const workspace: PnpmWorkspace = YAML.parse(workspaceContent);\r\n\r\n    const defaultCatalog = workspace.catalog ?? {};\r\n    const namedCatalogs = workspace.catalogs ?? {};\r\n\r\n    // 2. Find all package.json files\r\n    const packageJsonFiles = await fg('**/package.json', {\r\n      cwd: projectDir,\r\n      ignore: ['**/node_modules/**'],\r\n      absolute: true,\r\n    });\r\n\r\n    let totalResolved = 0;\r\n\r\n    // 3. Process each package.json\r\n    for (const filePath of packageJsonFiles) {\r\n      const pkg: PackageJson = await fs.readJson(filePath);\r\n      let modified = false;\r\n      const relativePath = path.relative(projectDir, filePath);\r\n\r\n      // Process all dependency types\r\n      const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;\r\n      \r\n      for (const depType of depTypes) {\r\n        const deps = pkg[depType];\r\n        if (deps) {\r\n          for (const [name, version] of Object.entries(deps)) {\r\n            const resolved = resolveVersion(name, version, defaultCatalog, namedCatalogs);\r\n            if (resolved !== version) {\r\n              deps[name] = resolved;\r\n              modified = true;\r\n              totalResolved++;\r\n            }\r\n          }\r\n        }\r\n      }\r\n\r\n      // 4. Handle pnpm.overrides\r\n      if (pkg.pnpm?.overrides) {\r\n        const resolvedOverrides = resolveOverrides(\r\n          pkg.pnpm.overrides,\r\n          defaultCatalog,\r\n          namedCatalogs\r\n        );\r\n\r\n        if (packageManager === 'yarn') {\r\n          // Yarn uses 'resolutions'\r\n          pkg.resolutions = { ...(pkg.resolutions ?? {}), ...resolvedOverrides };\r\n        } else {\r\n          // npm and bun use 'overrides'\r\n          pkg.overrides = { ...(pkg.overrides ?? {}), ...resolvedOverrides };\r\n        }\r\n\r\n        // Remove pnpm-specific field\r\n        delete pkg.pnpm;\r\n        modified = true;\r\n        s.message(`Converted pnpm.overrides in ${color.cyan(relativePath)}`);\r\n      }\r\n\r\n      // 5. Remove packageManager field from root package.json\r\n      if (relativePath === 'package.json' && pkg.packageManager) {\r\n        delete pkg.packageManager;\r\n        modified = true;\r\n      }\r\n\r\n      if (modified) {\r\n        await fs.writeJson(filePath, pkg, { spaces: 2 });\r\n      }\r\n    }\r\n\r\n    // 6. Delete pnpm-workspace.yaml\r\n    await fs.remove(workspaceYamlPath);\r\n\r\n    s.stop(`Resolved ${color.cyan(totalResolved.toString())} catalog versions`);\r\n  } catch (error) {\r\n    s.stop('Failed to resolve catalog versions');\r\n    throw error;\r\n  }\r\n}\r\n\r\n"],"mappings":"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","names":[]}

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
   replaceScope,
   resolveCatalogVersions,
   setupEnv
-} from "./chunk-6ZFG4OIY.js";
+} from "./chunk-Q43WSJ4J.js";
 import "./chunk-WQABKQSK.js";
 
 // src/cli.ts

package/dist/helpers/transform.js

@@ -8,7 +8,7 @@ import {
   replaceScope,
   resolveCatalogVersions,
   setupEnv
-} from "../chunk-6ZFG4OIY.js";
+} from "../chunk-Q43WSJ4J.js";
 export {
   configureDockerCompose,
   deleteDockerCompose,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-turbo-kit",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "description": "",
   "main": "dist/cli.js",

package/src/helpers/transform.ts

@@ -1,10 +1,10 @@
-import fg from 'fast-glob';
-import fs from 'fs-extra';
-import path from 'path';
-import { spinner } from '@clack/prompts';
-import color from 'picocolors';
-import YAML from 'yaml';
-import type { PackageManager } from '../utils/package-manager.js';
+import fg from 'fast-glob';
+import fs from 'fs-extra';
+import path from 'path';
+import { spinner } from '@clack/prompts';
+import color from 'picocolors';
+import YAML from 'yaml';
+import type { PackageManager } from '../utils/package-manager.js';
 
 const DOCKER_CONTAINERS = {
   postgres: {
@@ -41,6 +41,26 @@ const DOCKER_CONTAINERS = {
 
 export type DockerContainer = keyof typeof DOCKER_CONTAINERS;
 
+/**
+ * Sort dependencies alphabetically in a package.json object
+ */
+function sortPackageJsonDependencies(pkg: PackageJson): void {
+  const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;
+  
+  for (const depType of depTypes) {
+    const deps = pkg[depType];
+    if (deps && typeof deps === 'object') {
+      const sorted = Object.keys(deps)
+        .sort()
+        .reduce((acc, key) => {
+          acc[key] = deps[key]!;
+          return acc;
+        }, {} as Record<string, string>);
+      pkg[depType] = sorted;
+    }
+  }
+}
+
 export async function replaceScope(projectDir: string, newScope: string) {
   const s = spinner();
   s.start(`Replacing scope with ${color.cyan(newScope)}...`);
@@ -75,7 +95,27 @@ export async function replaceScope(projectDir: string, newScope: string) {
       })
     );
     
-    s.stop(`Replaced scope with ${color.cyan(newScope)}`);
+    // Sort dependencies in all package.json files after replacing scope
+    s.message('Sorting dependencies alphabetically...');
+    const packageJsonFiles = await fg('**/package.json', {
+      cwd: projectDir,
+      ignore: ['**/node_modules/**'],
+      absolute: true,
+    });
+
+    await Promise.all(
+      packageJsonFiles.map(async (file) => {
+        try {
+          const pkg: PackageJson = await fs.readJson(file);
+          sortPackageJsonDependencies(pkg);
+          await fs.writeJson(file, pkg, { spaces: 2 });
+        } catch (e) {
+          // Ignore errors for malformed package.json files
+        }
+      })
+    );
+    
+    s.stop(`Replaced scope with ${color.cyan(newScope)} and sorted dependencies`);
   } catch (error) {
     s.stop('Failed to replace scope');
     throw error;
@@ -226,211 +266,211 @@ export async function removePackages(
   }
 }
 
-export async function removeReactEmail(projectDir: string) {
-  const s = spinner();
-  s.start('Removing react-email...');
-
-  try {
-    // remove email package
-    const emailPackagePath = path.join(projectDir, 'packages', 'email');
-    if (await fs.pathExists(emailPackagePath)) {
-      await fs.remove(emailPackagePath);
-      s.message(`Removed ${color.cyan(emailPackagePath)}`);
-    }
-
-    // remove @react-email/components from packages/api/package.json
-    await removePackages(['@react-email/components', '@acme/email'], 'packages/api', projectDir, s);
-
-    s.stop('Removed react-email');
-  } catch (error) {
-    s.stop('Failed to remove react-email');
-    throw error;
-  }
-}
-
-interface PnpmWorkspace {
-  packages?: string[];
-  catalog?: Record<string, string>;
-  catalogs?: Record<string, Record<string, string>>;
-  overrides?: Record<string, string>;
-}
-
-interface PackageJson {
-  name?: string;
-  packageManager?: string;
-  dependencies?: Record<string, string>;
-  devDependencies?: Record<string, string>;
-  peerDependencies?: Record<string, string>;
-  optionalDependencies?: Record<string, string>;
-  pnpm?: {
-    overrides?: Record<string, string>;
-    [key: string]: unknown;
-  };
-  overrides?: Record<string, string>;
-  resolutions?: Record<string, string>;
-  [key: string]: unknown;
-}
-
-/**
- * Resolves a version string that may contain catalog: or workspace: protocols
- */
-function resolveVersion(
-  packageName: string,
-  version: string,
-  defaultCatalog: Record<string, string>,
-  namedCatalogs: Record<string, Record<string, string>>
-): string {
-  // Handle catalog: (default catalog)
-  if (version === 'catalog:') {
-    const resolved = defaultCatalog[packageName];
-    if (resolved) {
-      return resolved;
-    }
-    // If not found in catalog, keep original (will likely fail at install)
-    return version;
-  }
-
-  // Handle catalog:catalogName (named catalog)
-  if (version.startsWith('catalog:')) {
-    const catalogName = version.slice('catalog:'.length);
-    const catalog = namedCatalogs[catalogName];
-    if (catalog && catalog[packageName]) {
-      return catalog[packageName];
-    }
-    // If not found in named catalog, keep original
-    return version;
-  }
-
-  // Handle workspace:* or workspace:^ etc.
-  if (version.startsWith('workspace:')) {
-    return '*';
-  }
-
-  return version;
-}
-
-/**
- * Resolves catalog versions in an overrides/resolutions object
- */
-function resolveOverrides(
-  overrides: Record<string, string>,
-  defaultCatalog: Record<string, string>,
-  namedCatalogs: Record<string, Record<string, string>>
-): Record<string, string> {
-  const resolved: Record<string, string> = {};
-  
-  for (const [pkg, version] of Object.entries(overrides)) {
-    resolved[pkg] = resolveVersion(pkg, version, defaultCatalog, namedCatalogs);
-  }
-  
-  return resolved;
-}
-
-/**
- * Resolves pnpm catalog versions in all package.json files when using a non-pnpm package manager.
- * 
- * This transform:
- * 1. Parses pnpm-workspace.yaml to extract catalog version mappings
- * 2. Replaces catalog: and catalog:name versions with actual versions in all package.json files
- * 3. Replaces workspace:* references with *
- * 4. Converts pnpm.overrides to overrides (npm/bun) or resolutions (yarn)
- * 5. Removes the packageManager field from root package.json
- * 6. Deletes pnpm-workspace.yaml
- */
-export async function resolveCatalogVersions(
-  projectDir: string,
-  packageManager: PackageManager
-) {
-  const s = spinner();
-  s.start('Resolving pnpm catalog versions...');
-
-  try {
-    // 1. Parse pnpm-workspace.yaml
-    const workspaceYamlPath = path.join(projectDir, 'pnpm-workspace.yaml');
-    
-    if (!(await fs.pathExists(workspaceYamlPath))) {
-      s.stop('No pnpm-workspace.yaml found, skipping catalog resolution');
-      return;
-    }
-
-    const workspaceContent = await fs.readFile(workspaceYamlPath, 'utf8');
-    const workspace: PnpmWorkspace = YAML.parse(workspaceContent);
-
-    const defaultCatalog = workspace.catalog ?? {};
-    const namedCatalogs = workspace.catalogs ?? {};
-
-    // 2. Find all package.json files
-    const packageJsonFiles = await fg('**/package.json', {
-      cwd: projectDir,
-      ignore: ['**/node_modules/**'],
-      absolute: true,
-    });
-
-    let totalResolved = 0;
-
-    // 3. Process each package.json
-    for (const filePath of packageJsonFiles) {
-      const pkg: PackageJson = await fs.readJson(filePath);
-      let modified = false;
-      const relativePath = path.relative(projectDir, filePath);
-
-      // Process all dependency types
-      const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;
-      
-      for (const depType of depTypes) {
-        const deps = pkg[depType];
-        if (deps) {
-          for (const [name, version] of Object.entries(deps)) {
-            const resolved = resolveVersion(name, version, defaultCatalog, namedCatalogs);
-            if (resolved !== version) {
-              deps[name] = resolved;
-              modified = true;
-              totalResolved++;
-            }
-          }
-        }
-      }
-
-      // 4. Handle pnpm.overrides
-      if (pkg.pnpm?.overrides) {
-        const resolvedOverrides = resolveOverrides(
-          pkg.pnpm.overrides,
-          defaultCatalog,
-          namedCatalogs
-        );
-
-        if (packageManager === 'yarn') {
-          // Yarn uses 'resolutions'
-          pkg.resolutions = { ...(pkg.resolutions ?? {}), ...resolvedOverrides };
-        } else {
-          // npm and bun use 'overrides'
-          pkg.overrides = { ...(pkg.overrides ?? {}), ...resolvedOverrides };
-        }
-
-        // Remove pnpm-specific field
-        delete pkg.pnpm;
-        modified = true;
-        s.message(`Converted pnpm.overrides in ${color.cyan(relativePath)}`);
-      }
-
-      // 5. Remove packageManager field from root package.json
-      if (relativePath === 'package.json' && pkg.packageManager) {
-        delete pkg.packageManager;
-        modified = true;
-      }
-
-      if (modified) {
-        await fs.writeJson(filePath, pkg, { spaces: 2 });
-      }
-    }
-
-    // 6. Delete pnpm-workspace.yaml
-    await fs.remove(workspaceYamlPath);
-
-    s.stop(`Resolved ${color.cyan(totalResolved.toString())} catalog versions`);
-  } catch (error) {
-    s.stop('Failed to resolve catalog versions');
-    throw error;
-  }
-}
+export async function removeReactEmail(projectDir: string) {
+  const s = spinner();
+  s.start('Removing react-email...');
+
+  try {
+    // remove email package
+    const emailPackagePath = path.join(projectDir, 'packages', 'email');
+    if (await fs.pathExists(emailPackagePath)) {
+      await fs.remove(emailPackagePath);
+      s.message(`Removed ${color.cyan(emailPackagePath)}`);
+    }
+
+    // remove @react-email/components from packages/api/package.json
+    await removePackages(['@react-email/components', '@acme/email'], 'packages/api', projectDir, s);
+
+    s.stop('Removed react-email');
+  } catch (error) {
+    s.stop('Failed to remove react-email');
+    throw error;
+  }
+}
+
+interface PnpmWorkspace {
+  packages?: string[];
+  catalog?: Record<string, string>;
+  catalogs?: Record<string, Record<string, string>>;
+  overrides?: Record<string, string>;
+}
+
+interface PackageJson {
+  name?: string;
+  packageManager?: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+  optionalDependencies?: Record<string, string>;
+  pnpm?: {
+    overrides?: Record<string, string>;
+    [key: string]: unknown;
+  };
+  overrides?: Record<string, string>;
+  resolutions?: Record<string, string>;
+  [key: string]: unknown;
+}
+
+/**
+ * Resolves a version string that may contain catalog: or workspace: protocols
+ */
+function resolveVersion(
+  packageName: string,
+  version: string,
+  defaultCatalog: Record<string, string>,
+  namedCatalogs: Record<string, Record<string, string>>
+): string {
+  // Handle catalog: (default catalog)
+  if (version === 'catalog:') {
+    const resolved = defaultCatalog[packageName];
+    if (resolved) {
+      return resolved;
+    }
+    // If not found in catalog, keep original (will likely fail at install)
+    return version;
+  }
+
+  // Handle catalog:catalogName (named catalog)
+  if (version.startsWith('catalog:')) {
+    const catalogName = version.slice('catalog:'.length);
+    const catalog = namedCatalogs[catalogName];
+    if (catalog && catalog[packageName]) {
+      return catalog[packageName];
+    }
+    // If not found in named catalog, keep original
+    return version;
+  }
+
+  // Handle workspace:* or workspace:^ etc.
+  if (version.startsWith('workspace:')) {
+    return '*';
+  }
+
+  return version;
+}
+
+/**
+ * Resolves catalog versions in an overrides/resolutions object
+ */
+function resolveOverrides(
+  overrides: Record<string, string>,
+  defaultCatalog: Record<string, string>,
+  namedCatalogs: Record<string, Record<string, string>>
+): Record<string, string> {
+  const resolved: Record<string, string> = {};
+  
+  for (const [pkg, version] of Object.entries(overrides)) {
+    resolved[pkg] = resolveVersion(pkg, version, defaultCatalog, namedCatalogs);
+  }
+  
+  return resolved;
+}
+
+/**
+ * Resolves pnpm catalog versions in all package.json files when using a non-pnpm package manager.
+ * 
+ * This transform:
+ * 1. Parses pnpm-workspace.yaml to extract catalog version mappings
+ * 2. Replaces catalog: and catalog:name versions with actual versions in all package.json files
+ * 3. Replaces workspace:* references with *
+ * 4. Converts pnpm.overrides to overrides (npm/bun) or resolutions (yarn)
+ * 5. Removes the packageManager field from root package.json
+ * 6. Deletes pnpm-workspace.yaml
+ */
+export async function resolveCatalogVersions(
+  projectDir: string,
+  packageManager: PackageManager
+) {
+  const s = spinner();
+  s.start('Resolving pnpm catalog versions...');
+
+  try {
+    // 1. Parse pnpm-workspace.yaml
+    const workspaceYamlPath = path.join(projectDir, 'pnpm-workspace.yaml');
+    
+    if (!(await fs.pathExists(workspaceYamlPath))) {
+      s.stop('No pnpm-workspace.yaml found, skipping catalog resolution');
+      return;
+    }
+
+    const workspaceContent = await fs.readFile(workspaceYamlPath, 'utf8');
+    const workspace: PnpmWorkspace = YAML.parse(workspaceContent);
+
+    const defaultCatalog = workspace.catalog ?? {};
+    const namedCatalogs = workspace.catalogs ?? {};
+
+    // 2. Find all package.json files
+    const packageJsonFiles = await fg('**/package.json', {
+      cwd: projectDir,
+      ignore: ['**/node_modules/**'],
+      absolute: true,
+    });
+
+    let totalResolved = 0;
+
+    // 3. Process each package.json
+    for (const filePath of packageJsonFiles) {
+      const pkg: PackageJson = await fs.readJson(filePath);
+      let modified = false;
+      const relativePath = path.relative(projectDir, filePath);
+
+      // Process all dependency types
+      const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;
+      
+      for (const depType of depTypes) {
+        const deps = pkg[depType];
+        if (deps) {
+          for (const [name, version] of Object.entries(deps)) {
+            const resolved = resolveVersion(name, version, defaultCatalog, namedCatalogs);
+            if (resolved !== version) {
+              deps[name] = resolved;
+              modified = true;
+              totalResolved++;
+            }
+          }
+        }
+      }
+
+      // 4. Handle pnpm.overrides
+      if (pkg.pnpm?.overrides) {
+        const resolvedOverrides = resolveOverrides(
+          pkg.pnpm.overrides,
+          defaultCatalog,
+          namedCatalogs
+        );
+
+        if (packageManager === 'yarn') {
+          // Yarn uses 'resolutions'
+          pkg.resolutions = { ...(pkg.resolutions ?? {}), ...resolvedOverrides };
+        } else {
+          // npm and bun use 'overrides'
+          pkg.overrides = { ...(pkg.overrides ?? {}), ...resolvedOverrides };
+        }
+
+        // Remove pnpm-specific field
+        delete pkg.pnpm;
+        modified = true;
+        s.message(`Converted pnpm.overrides in ${color.cyan(relativePath)}`);
+      }
+
+      // 5. Remove packageManager field from root package.json
+      if (relativePath === 'package.json' && pkg.packageManager) {
+        delete pkg.packageManager;
+        modified = true;
+      }
+
+      if (modified) {
+        await fs.writeJson(filePath, pkg, { spaces: 2 });
+      }
+    }
+
+    // 6. Delete pnpm-workspace.yaml
+    await fs.remove(workspaceYamlPath);
+
+    s.stop(`Resolved ${color.cyan(totalResolved.toString())} catalog versions`);
+  } catch (error) {
+    s.stop('Failed to resolve catalog versions');
+    throw error;
+  }
+}
 

package/dist/chunk-6ZFG4OIY.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/helpers/transform.ts"],"sourcesContent":["import fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport path from 'path';\nimport { spinner } from '@clack/prompts';\nimport color from 'picocolors';\nimport YAML from 'yaml';\nimport type { PackageManager } from '../utils/package-manager.js';\n\r\nconst DOCKER_CONTAINERS = {\r\n  postgres: {\r\n    label: 'PostgreSQL 16 (Database)',\r\n    services: ['postgres'],\r\n    volumes: ['postgres_data'],\r\n    dependsOn: [], \r\n  },\r\n  pgadmin: {\r\n    label: `pgAdmin 4.9 (Database management) [Depends on PostgreSQL]`,\r\n    services: ['pgadmin'],\r\n    volumes: [],\r\n    dependsOn: ['postgres'],\r\n  },\r\n  redis: {\r\n    label: 'Redis (Caching)',\r\n    services: ['redis'],\r\n    volumes: [],\r\n    dependsOn: [],\r\n  },\r\n  mailpit: {\r\n    label: 'Mailpit (Email testing)',\r\n    services: ['mailpit'],\r\n    volumes: [],\r\n    dependsOn: [],\r\n  },\r\n  minio: {\r\n    label: 'MinIO (S3-compatible storage)',\r\n    services: ['minio', 'minio-create-bucket'],\r\n    volumes: ['minio_data'],\r\n    dependsOn: [],\r\n  },\r\n} as const;\r\n\r\nexport type DockerContainer = keyof typeof DOCKER_CONTAINERS;\r\n\r\nexport async function replaceScope(projectDir: string, newScope: string) {\r\n  const s = spinner();\r\n  s.start(`Replacing scope with ${color.cyan(newScope)}...`);\r\n\r\n  try {\r\n    const files = await fg('**/*', {\r\n      cwd: projectDir,\r\n      ignore: [\r\n        '**/.git/**',\r\n        '**/node_modules/**',\r\n        '**/.turbo/**',\r\n        '**/dist/**',\r\n        '**/.next/**',\r\n        '**/pnpm-lock.yaml',\r\n        '**/yarn.lock',\r\n        '**/package-lock.json',\r\n        '**/bun.lockb',\r\n      ],\r\n      absolute: true,\r\n    });\r\n\r\n    await Promise.all(\r\n      files.map(async (file) => {\r\n        try {\r\n          const content = await fs.readFile(file, 'utf8');\r\n          if (content.includes('@acme')) {\r\n            const newContent = content.replace(/@acme/g, newScope);\r\n            await fs.writeFile(file, newContent);\r\n          }\r\n        } catch (e) {\r\n        }\r\n      })\r\n    );\r\n    \r\n    s.stop(`Replaced scope with ${color.cyan(newScope)}`);\r\n  } catch (error) {\r\n    s.stop('Failed to replace scope');\r\n    throw error;\r\n  }\r\n}\r\n\r\nexport async function setupEnv(projectDir: string) {\r\n  const envExample = path.join(projectDir, '.env.example');\r\n  const envDest = path.join(projectDir, '.env');\r\n\r\n  if (await fs.pathExists(envExample)) {\r\n    await fs.copy(envExample, envDest);\r\n  }\r\n}\r\n\r\nexport function getDockerContainers() {\r\n  return Object.entries(DOCKER_CONTAINERS).map(([value, config]) => ({\r\n    value,\r\n    label: config.label,\r\n  }));\r\n}\r\n\r\nexport async function deleteDockerCompose(projectDir: string) {\r\n  const s = spinner();\r\n  s.start('Removing Docker Compose setup...');\r\n\r\n  try {\r\n    const dockerComposePath = path.join(projectDir, 'docker-compose.yml');\r\n    if (await fs.pathExists(dockerComposePath)) {\r\n      await fs.remove(dockerComposePath);\r\n      s.message(`Removed ${color.cyan(dockerComposePath)}`);\r\n    }\r\n    const dockerDir = path.join(projectDir, 'docker');\r\n    if (await fs.pathExists(dockerDir)) {\r\n      await fs.remove(dockerDir);\r\n      s.message(`Removed ${color.cyan(dockerDir)}`);\r\n    }\r\n    s.stop('Removed Docker Compose setup');\r\n  } catch (error) {\r\n    s.stop('Failed to remove Docker Compose setup');\r\n    throw error;\r\n  }\r\n}\r\n\r\nfunction resolveContainerDependencies(selectedContainers: string[]): string[] {\r\n  const resolved = new Set<string>(selectedContainers);\r\n  const queue = [...selectedContainers];\r\n\r\n  while (queue.length > 0) {\r\n    const current = queue.shift()!;\r\n    const config = DOCKER_CONTAINERS[current as DockerContainer];\r\n    \r\n    if (config && config.dependsOn) {\r\n      for (const dep of config.dependsOn) {\r\n        if (!resolved.has(dep)) {\r\n          resolved.add(dep);\r\n          queue.push(dep);\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  return Array.from(resolved);\r\n}\r\n\r\nexport async function configureDockerCompose(projectDir: string, selectedContainers: string[]) {\r\n  const s = spinner();\r\n  s.start('Configuring Docker Compose...');\r\n\r\n  try {\r\n    const dockerComposePath = path.join(projectDir, 'docker-compose.yml');\r\n    \r\n    if (!(await fs.pathExists(dockerComposePath))) {\r\n      s.stop('Docker Compose file not found');\r\n      return;\r\n    }\r\n\r\n    const resolvedContainers = resolveContainerDependencies(selectedContainers);\r\n    const addedDependencies = resolvedContainers.filter(c => !selectedContainers.includes(c));\r\n    \r\n    if (addedDependencies.length > 0) {\r\n      s.message(`Auto-including dependencies: ${color.cyan(addedDependencies.join(', '))}`);\r\n    }\r\n\r\n    let content = await fs.readFile(dockerComposePath, 'utf8');\r\n\r\n    const allContainers = Object.keys(DOCKER_CONTAINERS) as DockerContainer[];\r\n    const containersToRemove = allContainers.filter(c => !resolvedContainers.includes(c));\r\n\r\n    for (const container of containersToRemove) {\r\n      const containerRegex = new RegExp(\r\n        `  # -- ${container} --\\\\n[\\\\s\\\\S]*?  # // ${container} //\\\\n`,\r\n        'g'\r\n      );\r\n      content = content.replace(containerRegex, '');\r\n\r\n      // delete `./docker/<container>/`\r\n      const dockerDirPath = path.join(projectDir, 'docker', container);\r\n      if (await fs.pathExists(dockerDirPath)) {\r\n        await fs.remove(dockerDirPath);\r\n        s.message(`Removed ${color.cyan(dockerDirPath)}`);\r\n      }\r\n    }\r\n\r\n    content = content.replace(/  # -- \\w+ --\\n/g, '');\r\n    content = content.replace(/  # \\/\\/ \\w+ \\/\\/\\n/g, '');\r\n\r\n    await fs.writeFile(dockerComposePath, content);\r\n\r\n    // check if `./docker/` is empty\r\n    const dockerDir = path.join(projectDir, 'docker');\r\n    if (await fs.pathExists(dockerDir) && (await fs.readdir(dockerDir)).length === 0) {\r\n      await fs.remove(dockerDir);\r\n      s.message(`Removed ${color.cyan(dockerDir)} ${color.gray('(because it was empty)')}`);\r\n    }\r\n    \r\n    s.stop(`Configured Docker Compose with ${color.cyan(resolvedContainers.length)} container(s)`);\r\n  } catch (error) {\r\n    s.stop('Failed to configure Docker Compose');\r\n    throw error;\r\n  }\r\n}\r\n\r\nexport async function removePackages(\r\n  packages: string[],\r\n  packagePath: string,\r\n  projectDir: string,\r\n  s?: ReturnType<typeof spinner>\r\n) {\r\n  const packageJsonPath = path.join(projectDir, packagePath, 'package.json');\r\n  if (await fs.pathExists(packageJsonPath)) {\r\n    const packageJson = await fs.readJson(packageJsonPath);\r\n    let hasChanges = false;\r\n\r\n    for (const dep of packages) {\r\n      if (packageJson.dependencies && packageJson.dependencies[dep]) {\r\n        delete packageJson.dependencies[dep];\r\n        hasChanges = true;\r\n        if (s) {\r\n          s.message(`Removed ${color.cyan(dep)} from ${packagePath}/package.json`);\r\n        }\r\n      }\r\n    }\r\n\r\n    if (hasChanges) {\r\n      await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });\r\n    }\r\n  }\r\n}\r\n\r\nexport async function removeReactEmail(projectDir: string) {\n  const s = spinner();\n  s.start('Removing react-email...');\n\n  try {\n    // remove email package\n    const emailPackagePath = path.join(projectDir, 'packages', 'email');\n    if (await fs.pathExists(emailPackagePath)) {\n      await fs.remove(emailPackagePath);\n      s.message(`Removed ${color.cyan(emailPackagePath)}`);\n    }\n\n    // remove @react-email/components from packages/api/package.json\n    await removePackages(['@react-email/components', '@acme/email'], 'packages/api', projectDir, s);\n\n    s.stop('Removed react-email');\n  } catch (error) {\n    s.stop('Failed to remove react-email');\n    throw error;\n  }\n}\n\ninterface PnpmWorkspace {\n  packages?: string[];\n  catalog?: Record<string, string>;\n  catalogs?: Record<string, Record<string, string>>;\n  overrides?: Record<string, string>;\n}\n\ninterface PackageJson {\n  name?: string;\n  packageManager?: string;\n  dependencies?: Record<string, string>;\n  devDependencies?: Record<string, string>;\n  peerDependencies?: Record<string, string>;\n  optionalDependencies?: Record<string, string>;\n  pnpm?: {\n    overrides?: Record<string, string>;\n    [key: string]: unknown;\n  };\n  overrides?: Record<string, string>;\n  resolutions?: Record<string, string>;\n  [key: string]: unknown;\n}\n\n/**\n * Resolves a version string that may contain catalog: or workspace: protocols\n */\nfunction resolveVersion(\n  packageName: string,\n  version: string,\n  defaultCatalog: Record<string, string>,\n  namedCatalogs: Record<string, Record<string, string>>\n): string {\n  // Handle catalog: (default catalog)\n  if (version === 'catalog:') {\n    const resolved = defaultCatalog[packageName];\n    if (resolved) {\n      return resolved;\n    }\n    // If not found in catalog, keep original (will likely fail at install)\n    return version;\n  }\n\n  // Handle catalog:catalogName (named catalog)\n  if (version.startsWith('catalog:')) {\n    const catalogName = version.slice('catalog:'.length);\n    const catalog = namedCatalogs[catalogName];\n    if (catalog && catalog[packageName]) {\n      return catalog[packageName];\n    }\n    // If not found in named catalog, keep original\n    return version;\n  }\n\n  // Handle workspace:* or workspace:^ etc.\n  if (version.startsWith('workspace:')) {\n    return '*';\n  }\n\n  return version;\n}\n\n/**\n * Resolves catalog versions in an overrides/resolutions object\n */\nfunction resolveOverrides(\n  overrides: Record<string, string>,\n  defaultCatalog: Record<string, string>,\n  namedCatalogs: Record<string, Record<string, string>>\n): Record<string, string> {\n  const resolved: Record<string, string> = {};\n  \n  for (const [pkg, version] of Object.entries(overrides)) {\n    resolved[pkg] = resolveVersion(pkg, version, defaultCatalog, namedCatalogs);\n  }\n  \n  return resolved;\n}\n\n/**\n * Resolves pnpm catalog versions in all package.json files when using a non-pnpm package manager.\n * \n * This transform:\n * 1. Parses pnpm-workspace.yaml to extract catalog version mappings\n * 2. Replaces catalog: and catalog:name versions with actual versions in all package.json files\n * 3. Replaces workspace:* references with *\n * 4. Converts pnpm.overrides to overrides (npm/bun) or resolutions (yarn)\n * 5. Removes the packageManager field from root package.json\n * 6. Deletes pnpm-workspace.yaml\n */\nexport async function resolveCatalogVersions(\n  projectDir: string,\n  packageManager: PackageManager\n) {\n  const s = spinner();\n  s.start('Resolving pnpm catalog versions...');\n\n  try {\n    // 1. Parse pnpm-workspace.yaml\n    const workspaceYamlPath = path.join(projectDir, 'pnpm-workspace.yaml');\n    \n    if (!(await fs.pathExists(workspaceYamlPath))) {\n      s.stop('No pnpm-workspace.yaml found, skipping catalog resolution');\n      return;\n    }\n\n    const workspaceContent = await fs.readFile(workspaceYamlPath, 'utf8');\n    const workspace: PnpmWorkspace = YAML.parse(workspaceContent);\n\n    const defaultCatalog = workspace.catalog ?? {};\n    const namedCatalogs = workspace.catalogs ?? {};\n\n    // 2. Find all package.json files\n    const packageJsonFiles = await fg('**/package.json', {\n      cwd: projectDir,\n      ignore: ['**/node_modules/**'],\n      absolute: true,\n    });\n\n    let totalResolved = 0;\n\n    // 3. Process each package.json\n    for (const filePath of packageJsonFiles) {\n      const pkg: PackageJson = await fs.readJson(filePath);\n      let modified = false;\n      const relativePath = path.relative(projectDir, filePath);\n\n      // Process all dependency types\n      const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'] as const;\n      \n      for (const depType of depTypes) {\n        const deps = pkg[depType];\n        if (deps) {\n          for (const [name, version] of Object.entries(deps)) {\n            const resolved = resolveVersion(name, version, defaultCatalog, namedCatalogs);\n            if (resolved !== version) {\n              deps[name] = resolved;\n              modified = true;\n              totalResolved++;\n            }\n          }\n        }\n      }\n\n      // 4. Handle pnpm.overrides\n      if (pkg.pnpm?.overrides) {\n        const resolvedOverrides = resolveOverrides(\n          pkg.pnpm.overrides,\n          defaultCatalog,\n          namedCatalogs\n        );\n\n        if (packageManager === 'yarn') {\n          // Yarn uses 'resolutions'\n          pkg.resolutions = { ...(pkg.resolutions ?? {}), ...resolvedOverrides };\n        } else {\n          // npm and bun use 'overrides'\n          pkg.overrides = { ...(pkg.overrides ?? {}), ...resolvedOverrides };\n        }\n\n        // Remove pnpm-specific field\n        delete pkg.pnpm;\n        modified = true;\n        s.message(`Converted pnpm.overrides in ${color.cyan(relativePath)}`);\n      }\n\n      // 5. Remove packageManager field from root package.json\n      if (relativePath === 'package.json' && pkg.packageManager) {\n        delete pkg.packageManager;\n        modified = true;\n      }\n\n      if (modified) {\n        await fs.writeJson(filePath, pkg, { spaces: 2 });\n      }\n    }\n\n    // 6. Delete pnpm-workspace.yaml\n    await fs.remove(workspaceYamlPath);\n\n    s.stop(`Resolved ${color.cyan(totalResolved.toString())} catalog versions`);\n  } catch (error) {\n    s.stop('Failed to resolve catalog versions');\n    throw error;\n  }\n}\n\r\n"],"mappings":"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","names":[]}