Merge branch 'next' into fix/issue-15501

Author: RobinMalfait

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Don’t detect arbitrary properties when preceded by an escape ([#15456](https://github.com/tailwindlabs/tailwindcss/pull/15456))
 - Fix incorrectly named `bg-round` and `bg-space` utilities to `bg-repeat-round` to `bg-repeat-space` ([#15462](https://github.com/tailwindlabs/tailwindcss/pull/15462))
 - Fix `inset-shadow-*` suggestions in IntelliSense ([#15471](https://github.com/tailwindlabs/tailwindcss/pull/15471))
+- Only compile arbitrary values ending in `]` ([#15503](https://github.com/tailwindlabs/tailwindcss/pull/15503))
 - Ensure `@utility` is fully processed before it's used ([#15542](https://github.com/tailwindlabs/tailwindcss/pull/15542))
 
 ### Changed

crates/oxide/src/cursor.rs

@@ -67,7 +67,7 @@ impl<'a> Cursor<'a> {
     }
 }
 
-impl<'a> Display for Cursor<'a> {
+impl Display for Cursor<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let len = self.input.len().to_string();
 

crates/oxide/src/parser.rs

@@ -204,7 +204,7 @@ impl<'a> Extractor<'a> {
     }
 
     #[inline(always)]
-    fn split_candidate(candidate: &'a [u8]) -> SplitCandidate {
+    fn split_candidate(candidate: &'a [u8]) -> SplitCandidate<'a> {
         let mut brackets = 0;
         let mut idx_end = 0;
 

crates/oxide/src/scanner/detect_sources.rs

@@ -95,13 +95,8 @@ impl DetectSources {
             )
             .into_iter();
 
-        loop {
-            // We are only interested in valid entries
-            let entry = match it.next() {
-                Some(Ok(entry)) => entry,
-                _ => break,
-            };
-
+        // We are only interested in valid entries
+        while let Some(Ok(entry)) = it.next() {
             // Ignore known directories that we don't want to traverse into.
             if entry.file_type().is_dir() && entry.file_name() == ".git" {
                 it.skip_current_dir();

packages/@tailwindcss-node/package.json

@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "enhanced-resolve": "^5.17.1",
-    "jiti": "^2.4.0",
+    "jiti": "^2.4.2",
     "tailwindcss": "workspace:*"
   }
 }

packages/tailwindcss/src/candidate.test.ts

@@ -540,6 +540,13 @@ it('should parse a utility with an arbitrary value', () => {
   `)
 })
 
+it('should not parse a utility with an incomplete arbitrary value', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  expect(run('bg-[#0088cc', { utilities })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a utility with an arbitrary value with parens', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])

packages/tailwindcss/src/candidate.ts

@@ -438,6 +438,9 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
       let valueIsArbitrary = startArbitraryIdx !== -1
 
       if (valueIsArbitrary) {
+        // Arbitrary values must end with a `]`.
+        if (value[value.length - 1] !== ']') return
+
         let arbitraryValue = decodeArbitraryValue(value.slice(startArbitraryIdx + 1, -1))
 
         // Extract an explicit typehint if present, e.g. `bg-[color:var(--my-var)])`

playgrounds/nextjs/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@tailwindcss/postcss": "workspace:^",
     "fast-glob": "^3.3.2",
-    "next": "15.0.3",
+    "next": "15.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tailwindcss": "workspace:^"
@@ -21,7 +21,7 @@
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "eslint": "^9.15.0",
-    "eslint-config-next": "^15.0.3",
+    "eslint-config-next": "^15.1.3",
     "typescript": "^5.5.4"
   }
 }

playgrounds/v3/package.json

@@ -9,7 +9,7 @@
     "upgrade": "node scripts/upgrade.mjs"
   },
   "dependencies": {
-    "next": "15.0.3",
+    "next": "15.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tailwindcss": "^3"
@@ -20,7 +20,7 @@
     "@types/react-dom": "^18.3.1",
     "autoprefixer": "^10.4.20",
     "eslint": "^9.15.0",
-    "eslint-config-next": "^15.0.3",
+    "eslint-config-next": "^15.1.3",
     "typescript": "^5.5.4"
   }
 }