tailwindcss 3.4.11 → 3.4.13

package/CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.4.13] - 2024-09-23
+
+### Fixed
+
+- Improve source glob verification performance ([#14481](https://github.com/tailwindlabs/tailwindcss/pull/14481))
+
+## [3.4.12] - 2024-09-17
+
+### Fixed
+
+- Ensure using `@apply` with utilities that use `@defaults` works with rules defined in the base layer when using `optimizeUniversalDefaults` ([#14427](https://github.com/tailwindlabs/tailwindcss/pull/14427))
+
 ## [3.4.11] - 2024-09-11
 
 ### Fixed
@@ -2437,7 +2449,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.11...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.13...HEAD
+[3.4.13]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.12...v3.4.13
+[3.4.12]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.11...v3.4.12
 [3.4.11]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.10...v3.4.11
 [3.4.10]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.9...v3.4.10
 [3.4.9]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.8...v3.4.9

package/lib/lib/content.js

@@ -173,9 +173,19 @@ function createBroadPatternCheck(paths) {
     if (!maybeBroadPattern) {
         return ()=>{};
     }
-    // All globs that explicitly contain any of the known large directories (e.g.:
-    // node_modules).
-    let explicitGlobs = paths.filter((path)=>LARGE_DIRECTORIES_REGEX.test(path));
+    // All glob matchers
+    let matchers = [];
+    // All glob matchers that explicitly contain any of the known large
+    // directories (e.g.: node_modules).
+    let explicitMatchers = [];
+    // Create matchers for all paths
+    for (let path of paths){
+        let matcher = _micromatch.default.matcher(path);
+        if (LARGE_DIRECTORIES_REGEX.test(path)) {
+            explicitMatchers.push(matcher);
+        }
+        matchers.push(matcher);
+    }
     // Keep track of whether we already warned about the broad pattern issue or
     // not. The `log.warn` function already does something similar where we only
     // output the log once. However, with this we can also skip the other checks
@@ -185,11 +195,12 @@ function createBroadPatternCheck(paths) {
    * @param {string} file
    */ return (file)=>{
         if (warned) return; // Already warned about the broad pattern
-        if (_micromatch.default.isMatch(file, explicitGlobs)) return; // Explicitly included, so we can skip further checks
+        if (explicitMatchers.some((matcher)=>matcher(file))) return; // Explicitly included, so we can skip further checks
         // When a broad pattern is used, we have to double check that the file was
         // not explicitly included in the globs.
-        let matchingGlob = paths.find((path)=>_micromatch.default.isMatch(file, path));
-        if (!matchingGlob) return; // This should never happen
+        let matchingGlobIndex = matchers.findIndex((matcher)=>matcher(file));
+        if (matchingGlobIndex === -1) return; // This should never happen
+        let matchingGlob = paths[matchingGlobIndex];
         // Create relative paths to make the output a bit more readable.
         let relativeMatchingGlob = _path.default.relative(process.cwd(), matchingGlob);
         if (relativeMatchingGlob[0] !== ".") relativeMatchingGlob = `./${relativeMatchingGlob}`;

package/lib/lib/expandTailwindAtRules.js

@@ -203,8 +203,8 @@ function expandTailwindAtRules(context) {
         // Replace any Tailwind directives with generated CSS
         if (layerNodes.base) {
             layerNodes.base.before((0, _cloneNodes.default)([
-                ...baseNodes,
-                ...defaultNodes
+                ...defaultNodes,
+                ...baseNodes
             ], layerNodes.base.source, {
                 layer: "base"
             }));

package/lib/lib/resolveDefaultsAtRules.js

@@ -120,21 +120,19 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                         selectors.add(selector);
                     }
                 }
-                if ((0, _featureFlags.flagEnabled)(tailwindConfig, "optimizeUniversalDefaults")) {
-                    if (selectorGroups.size === 0) {
-                        universal.remove();
-                        continue;
-                    }
-                    for (let [, selectors] of selectorGroups){
-                        let universalRule = _postcss.default.rule({
-                            source: universal.source
-                        });
-                        universalRule.selectors = [
-                            ...selectors
-                        ];
-                        universalRule.append(universal.nodes.map((node)=>node.clone()));
-                        universal.before(universalRule);
-                    }
+                if (selectorGroups.size === 0) {
+                    universal.remove();
+                    continue;
+                }
+                for (let [, selectors] of selectorGroups){
+                    let universalRule = _postcss.default.rule({
+                        source: universal.source
+                    });
+                    universalRule.selectors = [
+                        ...selectors
+                    ];
+                    universalRule.append(universal.nodes.map((node)=>node.clone()));
+                    universal.before(universalRule);
                 }
                 universal.remove();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.4.11",
+  "version": "3.4.13",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",

package/src/lib/content.js

@@ -210,9 +210,22 @@ export function createBroadPatternCheck(paths) {
     return () => {}
   }
 
-  // All globs that explicitly contain any of the known large directories (e.g.:
-  // node_modules).
-  let explicitGlobs = paths.filter((path) => LARGE_DIRECTORIES_REGEX.test(path))
+  // All glob matchers
+  let matchers = []
+
+  // All glob matchers that explicitly contain any of the known large
+  // directories (e.g.: node_modules).
+  let explicitMatchers = []
+
+  // Create matchers for all paths
+  for (let path of paths) {
+    let matcher = micromatch.matcher(path)
+    if (LARGE_DIRECTORIES_REGEX.test(path)) {
+      explicitMatchers.push(matcher)
+    }
+
+    matchers.push(matcher)
+  }
 
   // Keep track of whether we already warned about the broad pattern issue or
   // not. The `log.warn` function already does something similar where we only
@@ -225,12 +238,13 @@ export function createBroadPatternCheck(paths) {
    */
   return (file) => {
     if (warned) return // Already warned about the broad pattern
-    if (micromatch.isMatch(file, explicitGlobs)) return // Explicitly included, so we can skip further checks
+    if (explicitMatchers.some((matcher) => matcher(file))) return // Explicitly included, so we can skip further checks
 
     // When a broad pattern is used, we have to double check that the file was
     // not explicitly included in the globs.
-    let matchingGlob = paths.find((path) => micromatch.isMatch(file, path))
-    if (!matchingGlob) return // This should never happen
+    let matchingGlobIndex = matchers.findIndex((matcher) => matcher(file))
+    if (matchingGlobIndex === -1) return // This should never happen
+    let matchingGlob = paths[matchingGlobIndex]
 
     // Create relative paths to make the output a bit more readable.
     let relativeMatchingGlob = path.relative(process.cwd(), matchingGlob)

package/src/lib/expandTailwindAtRules.js

@@ -192,7 +192,7 @@ export default function expandTailwindAtRules(context) {
 
     if (layerNodes.base) {
       layerNodes.base.before(
-        cloneNodes([...baseNodes, ...defaultNodes], layerNodes.base.source, {
+        cloneNodes([...defaultNodes, ...baseNodes], layerNodes.base.source, {
           layer: 'base',
         })
       )

package/src/lib/resolveDefaultsAtRules.js

@@ -118,22 +118,20 @@ export default function resolveDefaultsAtRules({ tailwindConfig }) {
           }
         }
 
-        if (flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
-          if (selectorGroups.size === 0) {
-            universal.remove()
-            continue
-          }
+        if (selectorGroups.size === 0) {
+          universal.remove()
+          continue
+        }
 
-          for (let [, selectors] of selectorGroups) {
-            let universalRule = postcss.rule({
-              source: universal.source,
-            })
+        for (let [, selectors] of selectorGroups) {
+          let universalRule = postcss.rule({
+            source: universal.source,
+          })
 
-            universalRule.selectors = [...selectors]
+          universalRule.selectors = [...selectors]
 
-            universalRule.append(universal.nodes.map((node) => node.clone()))
-            universal.before(universalRule)
-          }
+          universalRule.append(universal.nodes.map((node) => node.clone()))
+          universal.before(universalRule)
         }
 
         universal.remove()