tailwindcss 3.4.17 → 3.4.18

package/CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.4.18] - 2024-10-01
+
+### Fixed
+
+- Improve support for raw `supports-[…]` queries in arbitrary values ([#13605](https://github.com/tailwindlabs/tailwindcss/pull/13605))
+- Fix `require.cache` error when loaded through a TypeScript file in Node 22.18+ ([#18665](https://github.com/tailwindlabs/tailwindcss/pull/18665))
+- Support `import.meta.resolve(…)` in configs for new enough Node.js versions ([#18938](https://github.com/tailwindlabs/tailwindcss/pull/18938))
+- Allow using newer versions of `postcss-load-config` for better ESM and TypeScript PostCSS config support with the CLI ([#18938](https://github.com/tailwindlabs/tailwindcss/pull/18938))
+- Remove irrelevant utility rules when matching important classes ([#19030](https://github.com/tailwindlabs/tailwindcss/pull/19030))
+
 ## [3.4.17] - 2024-12-17
 
 ### Fixed
@@ -2477,7 +2487,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.17...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.18...v3
+[3.4.18]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.17...v3.4.18
 [3.4.17]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.16...v3.4.17
 [3.4.16]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.15...v3.4.16
 [3.4.15]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.14...v3.4.15

package/lib/cli/build/plugin.js

@@ -52,10 +52,13 @@ function _interop_require_default(obj) {
         if (!config.plugins) {
             config.plugins = [];
         }
+        // We have to await these because in v5 and v6 of postcss-load-config
+        // these functions return promises while they don't in v4. Awaiting a
+        // non-promise is basically a no-op so this is safe to do.
         return {
             file,
-            plugins: (0, _plugins.default)(config, file),
-            options: (0, _options.default)(config, file)
+            plugins: await (0, _plugins.default)(config, file),
+            options: await (0, _options.default)(config, file)
         };
     })() : await (0, _postcssloadconfig.default)();
     let configPlugins = config.plugins;

package/lib/corePlugins.js

@@ -441,8 +441,8 @@ let variantPlugins = {
     supportsVariants: ({ matchVariant , theme  })=>{
         var _theme;
         matchVariant("supports", (value = "")=>{
-            let check = (0, _dataTypes.normalize)(value);
-            let isRaw = /^\w*\s*\(/.test(check);
+            let check = value.startsWith("--") ? value : (0, _dataTypes.normalize)(value);
+            let isRaw = /^[\w-]*\s*\(/.test(check);
             // Chrome has a bug where `(condition1)or(condition2)` is not valid
             // But `(condition1) or (condition2)` is supported.
             check = isRaw ? check.replace(/\b(and|or|not)\b/g, " $1 ") : check;

package/lib/lib/generateRules.js

@@ -182,7 +182,12 @@ function applyImportant(matches, classCandidate) {
             ast.each((sel)=>(0, _formatVariantSelector.eliminateIrrelevantSelectors)(sel, classCandidate));
             // Update all instances of the base candidate to include the important marker
             (0, _pluginUtils.updateAllClasses)(ast, (className)=>className === classCandidate ? `!${className}` : className);
-            r.selector = ast.toString();
+            let newSelector = ast.toString();
+            if (newSelector.trim() === "") {
+                r.remove();
+                return;
+            }
+            r.selector = newSelector;
             r.walkDecls((d)=>d.important = true);
         });
         result.push([

package/lib/lib/load-config.js

@@ -47,15 +47,8 @@ function lazyJiti() {
 function loadConfig(path) {
     let config = function() {
         if (!path) return {};
-        // Always use jiti for now. There is a a bug that occurs in Node v22.12+
-        // where imported files return invalid results
-        return lazyJiti()(path);
-        // Always use jiti for ESM or TS files
-        if (path && (path.endsWith(".mjs") || path.endsWith(".ts") || path.endsWith(".cts") || path.endsWith(".mts"))) {
-            return lazyJiti()(path);
-        }
         try {
-            return path ? require(path) : {};
+            return require(path);
         } catch  {
             return lazyJiti()(path);
         }

package/lib/lib/setupTrackingContext.js

@@ -66,6 +66,9 @@ function getTailwindConfig(configOrPath) {
         }
         // It has changed (based on timestamps), or first run
         for (let file of newDeps){
+            // When loaded transitively through a TypeScript file `require.cache`
+            // may be undefined. Happens in Node 22.18+.
+            if (!require.cache) continue;
             delete require.cache[file];
         }
         let newConfig = (0, _validateConfig.validateConfig)((0, _resolveconfig.default)((0, _loadconfig.loadConfig)(userConfigPath)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.4.17",
+  "version": "3.4.18",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -72,7 +72,7 @@
     "fast-glob": "^3.3.2",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
-    "jiti": "^1.21.6",
+    "jiti": "^1.21.7",
     "lilconfig": "^3.1.3",
     "micromatch": "^4.0.8",
     "normalize-path": "^3.0.0",
@@ -81,7 +81,7 @@
     "postcss": "^8.4.47",
     "postcss-import": "^15.1.0",
     "postcss-js": "^4.0.1",
-    "postcss-load-config": "^4.0.2",
+    "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
     "postcss-nested": "^6.2.0",
     "postcss-selector-parser": "^6.1.2",
     "resolve": "^1.22.8",

package/src/cli/build/plugin.js

@@ -43,10 +43,13 @@ async function loadPostCssPlugins(customPostCssPath) {
           config.plugins = []
         }
 
+        // We have to await these because in v5 and v6 of postcss-load-config
+        // these functions return promises while they don't in v4. Awaiting a
+        // non-promise is basically a no-op so this is safe to do.
         return {
           file,
-          plugins: loadPlugins(config, file),
-          options: loadOptions(config, file),
+          plugins: await loadPlugins(config, file),
+          options: await loadOptions(config, file),
         }
       })()
     : await postcssrc()

package/src/corePlugins.js

@@ -409,8 +409,8 @@ export let variantPlugins = {
     matchVariant(
       'supports',
       (value = '') => {
-        let check = normalize(value)
-        let isRaw = /^\w*\s*\(/.test(check)
+        let check = value.startsWith('--') ? value : normalize(value)
+        let isRaw = /^[\w-]*\s*\(/.test(check)
 
         // Chrome has a bug where `(condition1)or(condition2)` is not valid
         // But `(condition1) or (condition2)` is supported.

package/src/lib/generateRules.js

@@ -143,7 +143,14 @@ function applyImportant(matches, classCandidate) {
         className === classCandidate ? `!${className}` : className
       )
 
-      r.selector = ast.toString()
+      let newSelector = ast.toString()
+
+      if (newSelector.trim() === '') {
+        r.remove()
+        return
+      }
+
+      r.selector = newSelector
 
       r.walkDecls((d) => (d.important = true))
     })

package/src/lib/load-config.ts

@@ -35,23 +35,8 @@ export function loadConfig(path: string): Config {
   let config = (function () {
     if (!path) return {}
 
-    // Always use jiti for now. There is a a bug that occurs in Node v22.12+
-    // where imported files return invalid results
-    return lazyJiti()(path)
-
-    // Always use jiti for ESM or TS files
-    if (
-      path &&
-      (path.endsWith('.mjs') ||
-        path.endsWith('.ts') ||
-        path.endsWith('.cts') ||
-        path.endsWith('.mts'))
-    ) {
-      return lazyJiti()(path)
-    }
-
     try {
-      return path ? require(path) : {}
+      return require(path)
     } catch {
       return lazyJiti()(path)
     }

package/src/lib/setupTrackingContext.js

@@ -54,6 +54,9 @@ function getTailwindConfig(configOrPath) {
 
     // It has changed (based on timestamps), or first run
     for (let file of newDeps) {
+      // When loaded transitively through a TypeScript file `require.cache`
+      // may be undefined. Happens in Node 22.18+.
+      if (!require.cache) continue
       delete require.cache[file]
     }
     let newConfig = validateConfig(resolveConfig(loadConfig(userConfigPath)))