improve output messages

Author: RobinMalfait

integrations/upgrade/index.test.ts

@@ -1702,13 +1702,13 @@ test(
 
       │ No input stylesheets provided. Searching for CSS files in the current directory and its subdirectories…
 
-      │ Found config file: \`./tailwind.config.ts\` for \`./src/root.1.css\`
+      │ Linked \`./tailwind.config.ts\` to \`./src/root.1.css\`
 
-      │ Found config file: \`./tailwind.config.ts\` for \`./src/root.3.css\`
+      │ Linked \`./tailwind.config.ts\` to \`./src/root.3.css\`
 
-      │ Found config file: \`./tailwind.config.ts\` for \`./src/root.4.css\`
+      │ Linked \`./tailwind.config.ts\` to \`./src/root.4.css\`
 
-      │ Found config file: \`./tailwind.config.ts\` for \`./src/root.5/tailwind.css\`
+      │ Linked \`./tailwind.config.ts\` to \`./src/root.5/tailwind.css\`
 
       │ You have multiple stylesheets that do not have an \`@config\`.
       │ Please add a \`@config "…";\` referencing the correct Tailwind config file to:

packages/@tailwindcss-upgrade/src/index.ts

@@ -23,7 +23,7 @@ import { args, type Arg } from './utils/args'
 import { isRepoDirty } from './utils/git'
 import { hoistStaticGlobParts } from './utils/hoist-static-glob-parts'
 import { pkg } from './utils/packages'
-import { eprintln, error, header, highlight, info, success } from './utils/renderer'
+import { eprintln, error, header, highlight, info, relative, success } from './utils/renderer'
 
 const options = {
   '--config': { type: 'string', description: 'Path to the configuration file', alias: '-c' },
@@ -112,7 +112,6 @@ async function run() {
     }
 
     // Migrate js config files, linked to stylesheets
-    info('Migrating JavaScript configuration files using the provided configuration file.')
     let configBySheet = new Map<Stylesheet, Awaited<ReturnType<typeof prepareConfig>>>()
     let jsConfigMigrationBySheet = new Map<
       Stylesheet,
@@ -124,6 +123,7 @@ async function run() {
       let config = await prepareConfig(sheet.linkedConfigPath, { base })
       configBySheet.set(sheet, config)
 
+      info(`Migrating JavaScript configuration file: \`${relative(config.configFilePath, base)}\``)
       let jsConfigMigration = await migrateJsConfig(
         config.designSystem,
         config.configFilePath,
@@ -140,9 +140,10 @@ async function run() {
     // Migrate source files, linked to config files
     {
       // Template migrations
-
-      info('Migrating templates using the provided configuration file.')
       for (let config of configBySheet.values()) {
+        info(
+          `Migrating templates using the provided configuration file: \`${relative(config.configFilePath, base)}\`.`,
+        )
         let set = new Set<string>()
         for (let globEntry of config.globs.flatMap((entry) => hoistStaticGlobParts(entry))) {
           let files = await globby([globEntry.pattern], {
@@ -163,12 +164,13 @@ async function run() {
         await Promise.allSettled(
           files.map((file) => migrateTemplate(config.designSystem, config.userConfig, file)),
         )
-      }
 
-      success('Template migration complete.')
+        success('↳ Template migration complete.')
+      }
     }
 
     // Migrate each CSS file
+    info('Migrating stylesheets')
     let migrateResults = await Promise.allSettled(
       stylesheets.map((sheet) => {
         let config = configBySheet.get(sheet)!
@@ -235,7 +237,7 @@ async function run() {
       await fs.writeFile(sheet.file, sheet.root.toString())
     }
 
-    success('Stylesheet migration complete.')
+    success('↳ Stylesheet migration complete.')
   }
 
   {

packages/@tailwindcss-upgrade/src/migrate-js-config.ts

@@ -19,7 +19,7 @@ import type { DesignSystem } from '../../tailwindcss/src/design-system'
 import { escape } from '../../tailwindcss/src/utils/escape'
 import { isValidSpacingMultiplier } from '../../tailwindcss/src/utils/infer-data-type'
 import { findStaticPlugins, type StaticPluginOptions } from './utils/extract-static-plugins'
-import { info } from './utils/renderer'
+import { info, relative } from './utils/renderer'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -44,7 +44,7 @@ export async function migrateJsConfig(
 
   if (!canMigrateConfig(unresolvedConfig, source)) {
     info(
-      'Your configuration file could not be automatically migrated to the new CSS configuration format, so your CSS has been updated to load your existing configuration file.',
+      `Your configuration file at \`${relative(fullConfigPath, base)}\` could not be automatically migrated to the new CSS configuration format, so your CSS has been updated to load your existing configuration file.`,
     )
     return null
   }

packages/@tailwindcss-upgrade/src/migrate-postcss.ts

@@ -105,7 +105,7 @@ export async function migratePostCSSConfig(base: string) {
     } catch {}
   }
 
-  success(`PostCSS config has been upgraded.`)
+  success(`↳ PostCSS config has been upgraded.`)
 }
 
 async function migratePostCSSJSConfig(

packages/@tailwindcss-upgrade/src/migrate.ts

@@ -350,9 +350,7 @@ export async function linkConfigs(
       localConfigPath = path.resolve(base, localConfigPath)
     }
 
-    info(
-      `Found config file: \`${relative(localConfigPath, base)}\` for \`${relative(sheet.file, base)}\``,
-    )
+    info(`Linked \`${relative(localConfigPath, base)}\` to \`${relative(sheet.file, base)}\``)
     configPathBySheet.set(sheet, localConfigPath)
     sheetByConfigPath.get(localConfigPath).add(sheet)
   }