Merge branch 'main' into fix/issue-17813

Author: RobinMalfait

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Upgrade: Automatically convert candidates with arbitrary values to their utilities ([#17831](https://github.com/tailwindlabs/tailwindcss/pull/17831))
+- Upgrade: Automatically convert candidates with arbitrary values to their utilities ([#17831](https://github.com/tailwindlabs/tailwindcss/pull/17831), [#17854](https://github.com/tailwindlabs/tailwindcss/pull/17854))
 
 ### Fixed
 

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

@@ -283,6 +283,7 @@ async function run() {
         let scanner = new Scanner({ sources })
         let filesToMigrate = []
         for (let file of scanner.files) {
+          if (file.endsWith('.css')) continue
           if (seenFiles.has(file)) continue
           seenFiles.add(file)
           filesToMigrate.push(file)

playgrounds/nextjs/package.json

@@ -20,7 +20,7 @@
     "@types/node": "catalog:",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "eslint": "^9.24.0",
+    "eslint": "^9.25.1",
     "eslint-config-next": "^15.3.1",
     "typescript": "^5.5.4"
   }

playgrounds/v3/package.json

@@ -19,7 +19,7 @@
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
     "autoprefixer": "^10.4.21",
-    "eslint": "^9.24.0",
+    "eslint": "^9.25.1",
     "eslint-config-next": "^15.3.1",
     "typescript": "^5.5.4"
   }