Merge branch 'main' into fix/windows-statically-link-clib

CHANGELOG.md

@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Export backwards compatible config and plugin types from `tailwindcss/plugin` ([#16505](https://github.com/tailwindlabs/tailwindcss/pull/16505))
 - Ensure JavaScript plugins that emit nested rules referencing to the utility name work as expected ([#16539](https://github.com/tailwindlabs/tailwindcss/pull/16539))
 - Statically link Visual Studio redistributables on Windows builds ([#16602](https://github.com/tailwindlabs/tailwindcss/pull/16602))
+- Ensure that Next.js splat routes are automatically scanned for classes ([#16457](https://github.com/tailwindlabs/tailwindcss/pull/16457))
+- Pin exact versions of `tailwindcss` and `@tailwindcss/*` ([#16623](https://github.com/tailwindlabs/tailwindcss/pull/16623))
 - Upgrade: Report errors when updating dependencies ([#16504](https://github.com/tailwindlabs/tailwindcss/pull/16504))
 - Upgrade: Ensure a `darkMode` JS config setting with block syntax converts to use `@slot` ([#16507](https://github.com/tailwindlabs/tailwindcss/pull/16507))
 

crates/oxide/Cargo.toml

@@ -16,7 +16,7 @@ walkdir = "2.5.0"
 ignore = "0.4.23"
 dunce = "1.0.5"
 bexpand = "1.2.0"
-glob-match = "0.2.1"
+fast-glob = "0.4.3"
 
 [dev-dependencies]
 tempfile = "3.13.0"

crates/oxide/src/glob.rs

@@ -1,5 +1,5 @@
+use fast_glob::glob_match;
 use fxhash::{FxHashMap, FxHashSet};
-use glob_match::glob_match;
 use std::path::{Path, PathBuf};
 use tracing::event;
 
@@ -173,7 +173,7 @@ pub fn path_matches_globs(path: &Path, globs: &[GlobEntry]) -> bool {
 
     globs
         .iter()
-        .any(|g| glob_match(&format!("{}/{}", g.base, g.pattern), &path))
+        .any(|g| glob_match(&format!("{}/{}", g.base, g.pattern), path.as_bytes()))
 }
 
 #[cfg(test)]

crates/oxide/src/lib.rs

@@ -4,9 +4,9 @@ use crate::scanner::allowed_paths::resolve_paths;
 use crate::scanner::detect_sources::DetectSources;
 use bexpand::Expression;
 use bstr::ByteSlice;
+use fast_glob::glob_match;
 use fxhash::{FxHashMap, FxHashSet};
 use glob::optimize_patterns;
-use glob_match::glob_match;
 use paths::Path;
 use rayon::prelude::*;
 use scanner::allowed_paths::read_dir;

crates/oxide/tests/scanner.rs

@@ -415,6 +415,32 @@ mod scanner {
         assert_eq!(candidates, vec!["content-['foo.styl']"]);
     }
 
+    #[test]
+    fn it_should_scan_next_dynamic_folders() {
+        let candidates = scan_with_globs(
+            &[
+                // We know that `.styl` extensions are ignored, so they are not covered by auto content
+                // detection.
+                ("app/[slug]/page.styl", "content-['[slug]']"),
+                ("app/[...slug]/page.styl", "content-['[...slug]']"),
+                ("app/[[...slug]]/page.styl", "content-['[[...slug]]']"),
+                ("app/(theme)/page.styl", "content-['(theme)']"),
+            ],
+            vec!["./**/*.{styl}"],
+        )
+        .1;
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['(theme)']",
+                "content-['[...slug]']",
+                "content-['[[...slug]]']",
+                "content-['[slug]']",
+            ],
+        );
+    }
+
     #[test]
     fn it_should_scan_absolute_paths() {
         // Create a temporary working directory

integrations/postcss/next.test.ts

@@ -162,3 +162,89 @@ describe.each(['turbo', 'webpack'])('%s', (bundler) => {
     },
   )
 })
+
+test(
+  'should scan dynamic route segments',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "react": "^18",
+            "react-dom": "^18",
+            "next": "^14"
+          },
+          "devDependencies": {
+            "@tailwindcss/postcss": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.mjs': js`
+        /** @type {import('postcss-load-config').Config} */
+        const config = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+
+        export default config
+      `,
+      'next.config.mjs': js`
+        /** @type {import('next').NextConfig} */
+        const nextConfig = {}
+
+        export default nextConfig
+      `,
+      'app/a/[slug]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[slug]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/b/[...slug]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[...slug]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/c/[[...slug]]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[[...slug]]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/d/(theme)/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['(theme)']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/layout.js': js`
+        import './globals.css'
+
+        export default function RootLayout({ children }) {
+          return (
+            <html>
+              <body>{children}</body>
+            </html>
+          )
+        }
+      `,
+      'app/globals.css': css`
+        @import 'tailwindcss/utilities' source(none);
+        @source './**/*.{js,ts,jsx,tsx,mdx}';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm next build')
+
+    let files = await fs.glob('.next/static/css/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [
+      candidate`content-['[slug]']`,
+      candidate`content-['[...slug]']`,
+      candidate`content-['[[...slug]]']`,
+      candidate`content-['(theme)']`,
+    ])
+  },
+)

integrations/utils.ts

@@ -6,6 +6,7 @@ import { platform, tmpdir } from 'node:os'
 import path from 'node:path'
 import { stripVTControlCharacters } from 'node:util'
 import { test as defaultTest, type ExpectStatic } from 'vitest'
+import { escape } from '../packages/tailwindcss/src/utils/escape'
 
 const REPO_ROOT = path.join(__dirname, '..')
 const PUBLIC_PACKAGES = (await fs.readdir(path.join(REPO_ROOT, 'dist'))).map((name) =>
@@ -521,80 +522,6 @@ export function candidate(strings: TemplateStringsArray, ...values: any[]) {
   return `.${escape(output.join('').trim())}`
 }
 
-// https://drafts.csswg.org/cssom/#serialize-an-identifier
-export function escape(value: string) {
-  if (arguments.length == 0) {
-    throw new TypeError('`CSS.escape` requires an argument.')
-  }
-  var string = String(value)
-  var length = string.length
-  var index = -1
-  var codeUnit
-  var result = ''
-  var firstCodeUnit = string.charCodeAt(0)
-
-  if (
-    // If the character is the first character and is a `-` (U+002D), and
-    // there is no second character, […]
-    length == 1 &&
-    firstCodeUnit == 0x002d
-  ) {
-    return '\\' + string
-  }
-
-  while (++index < length) {
-    codeUnit = string.charCodeAt(index)
-    // Note: there’s no need to special-case astral symbols, surrogate
-    // pairs, or lone surrogates.
-
-    // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
-    // (U+FFFD).
-    if (codeUnit == 0x0000) {
-      result += '\uFFFD'
-      continue
-    }
-
-    if (
-      // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
-      // U+007F, […]
-      (codeUnit >= 0x0001 && codeUnit <= 0x001f) ||
-      codeUnit == 0x007f ||
-      // If the character is the first character and is in the range [0-9]
-      // (U+0030 to U+0039), […]
-      (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
-      // If the character is the second character and is in the range [0-9]
-      // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
-      (index == 1 && codeUnit >= 0x0030 && codeUnit <= 0x0039 && firstCodeUnit == 0x002d)
-    ) {
-      // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
-      result += '\\' + codeUnit.toString(16) + ' '
-      continue
-    }
-
-    // If the character is not handled by one of the above rules and is
-    // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
-    // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
-    // U+005A), or [a-z] (U+0061 to U+007A), […]
-    if (
-      codeUnit >= 0x0080 ||
-      codeUnit == 0x002d ||
-      codeUnit == 0x005f ||
-      (codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
-      (codeUnit >= 0x0041 && codeUnit <= 0x005a) ||
-      (codeUnit >= 0x0061 && codeUnit <= 0x007a)
-    ) {
-      // the character itself
-      result += string.charAt(index)
-      continue
-    }
-
-    // Otherwise, the escaped character.
-    // https://drafts.csswg.org/cssom/#escape-a-character
-    result += '\\' + string.charAt(index)
-  }
-  return result
-}
-
 export async function retryAssertion<T>(
   fn: () => Promise<T>,
   { timeout = ASSERTION_TIMEOUT, delay = 5 }: { timeout?: number; delay?: number } = {},

packages/@tailwindcss-cli/package.json

@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.5.1",
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
     "enhanced-resolve": "^5.18.1",
     "lightningcss": "catalog:",
     "mri": "^1.2.0",

packages/@tailwindcss-postcss/package.json

@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@alloc/quick-lru": "^5.2.0",
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
     "lightningcss": "catalog:",
     "postcss": "^8.4.41",
     "tailwindcss": "workspace:*"

packages/@tailwindcss-standalone/package.json

@@ -26,12 +26,12 @@
   ],
   "dependencies": {
     "@tailwindcss/aspect-ratio": "^0.4.2",
-    "@tailwindcss/cli": "workspace:^",
+    "@tailwindcss/cli": "workspace:*",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/typography": "^0.5.16",
     "detect-libc": "1.0.3",
     "enhanced-resolve": "^5.18.1",
-    "tailwindcss": "workspace:^"
+    "tailwindcss": "workspace:*"
   },
   "__notes": "These binary packages must be included so Bun can build the CLI for all supported platforms. We also rely on Lightning CSS and Parcel being patched so Bun can statically analyze the executables.",
   "devDependencies": {

packages/@tailwindcss-upgrade/package.json

@@ -27,8 +27,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
     "braces": "^3.0.3",
     "dedent": "1.5.3",
     "enhanced-resolve": "^5.18.1",

packages/@tailwindcss-vite/package.json

@@ -28,8 +28,8 @@
     }
   },
   "dependencies": {
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
     "lightningcss": "catalog:",
     "tailwindcss": "workspace:*"
   },