tailwindcss 0.0.0-insiders.2cd6fad → 0.0.0-insiders.2d40d0b

package/CHANGELOG.md

@@ -7,10 +7,74 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
+- Support using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
+- Add `--watch=always` option to prevent exit when stdin closes ([#9966](https://github.com/tailwindlabs/tailwindcss/pull/9966))
+- Add standalone CLI build for 64-bit Windows on ARM (`node16-win-arm64`) ([#10001](https://github.com/tailwindlabs/tailwindcss/pull/10001))
+- Add `delay-0` and `duration-0` by default ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+
+### Fixed
+
+- Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829))
+- Fix `foo-[abc]/[def]` not being handled correctly ([#9866](https://github.com/tailwindlabs/tailwindcss/pull/9866))
+- Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865))
+- Support renaming of output files by `PostCSS` plugin. ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
+- Improve return value of `resolveConfig`, unwrap `ResolvableTo` ([#9972](https://github.com/tailwindlabs/tailwindcss/pull/9972))
+- Clip unbalanced brackets in arbitrary values ([#9973](https://github.com/tailwindlabs/tailwindcss/pull/9973))
+- Don’t reorder webkit scrollbar pseudo elements ([#9991](https://github.com/tailwindlabs/tailwindcss/pull/9991))
+- Deterministic sorting of arbitrary variants ([#10016](https://github.com/tailwindlabs/tailwindcss/pull/10016))
+- Add `data` key to theme types ([#10023](https://github.com/tailwindlabs/tailwindcss/pull/10023))
+- Prevent invalid arbitrary variant selectors from failing the build ([#10059](https://github.com/tailwindlabs/tailwindcss/pull/10059))
+- Properly handle subtraction followed by a variable ([#10074](https://github.com/tailwindlabs/tailwindcss/pull/10074))
+- Fix missing `string[]` in the `theme.dropShadow` types ([#10072](https://github.com/tailwindlabs/tailwindcss/pull/10072))
+- Update list of length units ([#10100](https://github.com/tailwindlabs/tailwindcss/pull/10100))
+- Fix not matching arbitrary properties when closely followed by square brackets ([#10212](https://github.com/tailwindlabs/tailwindcss/pull/10212))
+- Allow direct nesting in `root` or `@layer` nodes ([#10229](https://github.com/tailwindlabs/tailwindcss/pull/10229))
+- Don't prefix classes in arbitrary variants ([#10214](https://github.com/tailwindlabs/tailwindcss/pull/10214))
+- Fix perf regression when checking for changed content ([#10234](https://github.com/tailwindlabs/tailwindcss/pull/10234))
+- Fix missing `blocklist` member in the `Config` type ([#10239](https://github.com/tailwindlabs/tailwindcss/pull/10239))
+- Escape group names in selectors ([#10276](https://github.com/tailwindlabs/tailwindcss/pull/10276))
+- Consider earlier variants before sorting functions ([#10288](https://github.com/tailwindlabs/tailwindcss/pull/10288))
+
+### Changed
+
+- Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
+- Update esbuild to v16 ([#10178](https://github.com/tailwindlabs/tailwindcss/pull/10178))
+
+## [3.2.4] - 2022-11-11
+
+### Added
+
+- Add `blocklist` option to prevent generating unwanted CSS ([#9812](https://github.com/tailwindlabs/tailwindcss/pull/9812))
+
+### Fixed
+
+- Fix watching of files on Linux when renames are involved ([#9796](https://github.com/tailwindlabs/tailwindcss/pull/9796))
+- Make sure errors are always displayed when watching for changes ([#9810](https://github.com/tailwindlabs/tailwindcss/pull/9810))
+
+## [3.2.3] - 2022-11-09
+
+### Fixed
+
+- Fixed use of `raw` content in the CLI ([#9773](https://github.com/tailwindlabs/tailwindcss/pull/9773))
+- Pick up changes from files that are both context and content deps ([#9787](https://github.com/tailwindlabs/tailwindcss/pull/9787))
+- Sort pseudo-elements ONLY after classes when using variants and `@apply` ([#9765](https://github.com/tailwindlabs/tailwindcss/pull/9765))
+- Support important utilities in the safelist (pattern must include a `!`) ([#9791](https://github.com/tailwindlabs/tailwindcss/pull/9791))
+
+## [3.2.2] - 2022-11-04
+
 ### Fixed
 
 - Escape special characters in resolved content base paths ([#9650](https://github.com/tailwindlabs/tailwindcss/pull/9650))
 - Don't reuse container for array returning variant functions ([#9644](https://github.com/tailwindlabs/tailwindcss/pull/9644))
+- Exclude non-relevant selectors when generating rules with the important modifier ([#9677](https://github.com/tailwindlabs/tailwindcss/issues/9677))
+- Fix merging of arrays during config resolution ([#9706](https://github.com/tailwindlabs/tailwindcss/issues/9706))
+- Ensure configured `font-feature-settings` are included in Preflight ([#9707](https://github.com/tailwindlabs/tailwindcss/pull/9707))
+- Fix fractional values not being parsed properly inside arbitrary properties ([#9705](https://github.com/tailwindlabs/tailwindcss/pull/9705))
+- Fix incorrect selectors when using `@apply` in selectors with combinators and pseudos ([#9722](https://github.com/tailwindlabs/tailwindcss/pull/9722))
+- Fix cannot read properties of undefined (reading 'modifier') ([#9656](https://github.com/tailwindlabs/tailwindcss/pull/9656), [aa979d6](https://github.com/tailwindlabs/tailwindcss/commit/aa979d645f8bf4108c5fc938d7c0ba085b654c31))
 
 ## [3.2.1] - 2022-10-21
 
@@ -2091,7 +2155,10 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.1...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...HEAD
+[3.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.3...v3.2.4
+[3.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.2...v3.2.3
+[3.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.1...v3.2.2
 [3.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.0...v3.2.1
 [3.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...v3.2.0
 [3.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...v3.1.8

package/README.md

@@ -14,7 +14,7 @@
 
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/workflow/status/tailwindlabs/tailwindcss/Node.js%20CI" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/nodejs.yml?branch=master" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
     <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
     <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>

package/lib/cli/build/index.js

@@ -35,7 +35,11 @@ async function build(args, configs) {
     let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
     let processor = await (0, _pluginJs.createProcessor)(args, configPath);
     if (shouldWatch) {
-        /* Abort the watcher if stdin is closed to avoid zombie processes */ process.stdin.on("end", ()=>process.exit(0));
+        // Abort the watcher if stdin is closed to avoid zombie processes
+        // You can disable this behavior with --watch=always
+        if (args["--watch"] !== "always") {
+            process.stdin.on("end", ()=>process.exit(0));
+        }
         process.stdin.resume();
         await processor.watch();
     } else {

package/lib/cli/build/plugin.js

@@ -113,8 +113,8 @@ let state = {
     contextDependencies: new Set(),
     /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
     refreshContentPaths () {
-        var ref;
-        this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, (ref = this.context) === null || ref === void 0 ? void 0 : ref.tailwindConfig);
+        var _this_context;
+        this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, (_this_context = this.context) === null || _this_context === void 0 ? void 0 : _this_context.tailwindConfig);
     },
     get config () {
         return this.context.tailwindConfig;
@@ -170,9 +170,9 @@ let state = {
         let rawContent = this.config.content.files.filter((file)=>{
             return file !== null && typeof file === "object";
         });
-        for (let { raw: content1 , extension ="html"  } of rawContent){
-            content1.push({
-                content: content1,
+        for (let { raw: htmlContent , extension ="html"  } of rawContent){
+            content.push({
+                content: htmlContent,
                 extension
             });
         }
@@ -184,8 +184,8 @@ let state = {
             return this.context;
         }
         _shared.env.DEBUG && console.time("Searching for config");
-        var ref;
-        let configPath = (ref = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && ref !== void 0 ? ref : cliConfigPath;
+        var _findAtConfigPath;
+        let configPath = (_findAtConfigPath = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && _findAtConfigPath !== void 0 ? _findAtConfigPath : cliConfigPath;
         _shared.env.DEBUG && console.timeEnd("Searching for config");
         _shared.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
@@ -213,7 +213,7 @@ let state = {
     }
 };
 async function createProcessor(args, cliConfigPath) {
-    var ref;
+    var _args_content;
     let postcss = (0, _deps.loadPostcss)();
     let input = args["--input"];
     let output = args["--output"];
@@ -229,8 +229,8 @@ async function createProcessor(args, cliConfigPath) {
             args["--content"] = args["--purge"];
         }
     }
-    var ref1;
-    let content = (ref1 = (ref = args["--content"]) === null || ref === void 0 ? void 0 : ref.split(/(?<!{[^}]+),/)) !== null && ref1 !== void 0 ? ref1 : [];
+    var _args_content_split;
+    let content = (_args_content_split = (_args_content = args["--content"]) === null || _args_content === void 0 ? void 0 : _args_content.split(/(?<!{[^}]+),/)) !== null && _args_content_split !== void 0 ? _args_content_split : [];
     let tailwindPlugin = ()=>{
         return {
             postcssPlugin: "tailwindcss",
@@ -304,13 +304,24 @@ async function createProcessor(args, cliConfigPath) {
                 return;
             }
             return Promise.all([
-                (0, _utils.outputFile)(output, result.css),
-                result.map && (0, _utils.outputFile)(output + ".map", result.map.toString())
+                (0, _utils.outputFile)(result.opts.to, result.css),
+                result.map && (0, _utils.outputFile)(result.opts.to + ".map", result.map.toString())
             ]);
         }).then(()=>{
             let end = process.hrtime.bigint();
             console.error();
             console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
+        }).then(()=>{}, (err)=>{
+            // TODO: If an initial build fails we can't easily pick up any PostCSS dependencies
+            // that were collected before the error occurred
+            // The result is not stored on the error so we have to store it externally
+            // and pull the messages off of it here somehow
+            // This results in a less than ideal DX because the watcher will not pick up
+            // changes to imported CSS if one of them caused an error during the initial build
+            // If you fix it and then save the main CSS file so there's no error
+            // The watcher will start watching the imported CSS files and will be
+            // resilient to future errors.
+            console.error(err);
         });
     }
     /**

package/lib/cli/build/watching.js

@@ -37,22 +37,70 @@ function createWatcher(args, { state , rebuild  }) {
             pollInterval: pollInterval
         } : false
     });
+    // A queue of rebuilds, file reads, etc… to run
     let chain = Promise.resolve();
-    let pendingRebuilds = new Set();
-    let changedContent = [];
+    /**
+   * A list of files that have been changed since the last rebuild
+   *
+   * @type {{file: string, content: () => Promise<string>, extension: string}[]}
+   */ let changedContent = [];
+    /**
+   * A list of files for which a rebuild has already been queued.
+   * This is used to prevent duplicate rebuilds when multiple events are fired for the same file.
+   * The rebuilt file is cleared from this list when it's associated rebuild has _started_
+   * This is because if the file is changed during a rebuild it won't trigger a new rebuild which it should
+   **/ let pendingRebuilds = new Set();
+    let _timer;
+    let _reject;
+    /**
+   * Rebuilds the changed files and resolves when the rebuild is
+   * complete regardless of whether it was successful or not
+   */ async function rebuildAndContinue() {
+        let changes = changedContent.splice(0);
+        // There are no changes to rebuild so we can just do nothing
+        if (changes.length === 0) {
+            return Promise.resolve();
+        }
+        // Clear all pending rebuilds for the about-to-be-built files
+        changes.forEach((change)=>pendingRebuilds.delete(change.file));
+        // Resolve the promise even when the rebuild fails
+        return rebuild(changes).then(()=>{}, ()=>{});
+    }
     /**
    *
    * @param {*} file
    * @param {(() => Promise<string>) | null} content
-   */ function recordChangedFile(file, content = null) {
+   * @param {boolean} skipPendingCheck
+   * @returns {Promise<void>}
+   */ function recordChangedFile(file, content = null, skipPendingCheck = false) {
         file = _path.default.resolve(file);
-        content = content !== null && content !== void 0 ? content : async ()=>await _fs.default.promises.readFile(file, "utf8");
+        // Applications like Vim/Neovim fire both rename and change events in succession for atomic writes
+        // In that case rebuild has already been queued by rename, so can be skipped in change
+        if (pendingRebuilds.has(file) && !skipPendingCheck) {
+            return Promise.resolve();
+        }
+        // Mark that a rebuild of this file is going to happen
+        // It MUST happen synchronously before the rebuild is queued for this to be effective
+        pendingRebuilds.add(file);
         changedContent.push({
             file,
-            content,
+            content: content !== null && content !== void 0 ? content : ()=>_fs.default.promises.readFile(file, "utf8"),
             extension: _path.default.extname(file).slice(1)
         });
-        chain = chain.then(()=>rebuild(changedContent.splice(0)));
+        if (_timer) {
+            clearTimeout(_timer);
+            _reject();
+        }
+        // If a rebuild is already in progress we don't want to start another one until the 10ms timer has expired
+        chain = chain.then(()=>new Promise((resolve, reject)=>{
+                _timer = setTimeout(resolve, 10);
+                _reject = reject;
+            }));
+        // Resolves once this file has been rebuilt (or the rebuild for this file has failed)
+        // This queues as many rebuilds as there are changed files
+        // But those rebuilds happen after some delay
+        // And will immediately resolve if there are no changes
+        chain = chain.then(rebuildAndContinue, rebuildAndContinue);
         return chain;
     }
     watcher.on("change", (file)=>recordChangedFile(file));
@@ -91,15 +139,32 @@ function createWatcher(args, { state , rebuild  }) {
         if (pendingRebuilds.has(filePath)) {
             return;
         }
+        // We'll go ahead and add the file to the pending rebuilds list here
+        // It'll be removed when the rebuild starts unless the read fails
+        // which will be taken care of as well
         pendingRebuilds.add(filePath);
-        chain = chain.then(async ()=>{
-            let content;
+        async function enqueue() {
             try {
-                content = await (0, _utilsJs.readFileWithRetries)(_path.default.resolve(filePath));
-            } finally{
-                pendingRebuilds.delete(filePath);
+                // We need to read the file as early as possible outside of the chain
+                // because it may be gone by the time we get to it. doing the read
+                // immediately increases the chance that the file is still there
+                let content = await (0, _utilsJs.readFileWithRetries)(_path.default.resolve(filePath));
+                if (content === undefined) {
+                    return;
+                }
+                // This will push the rebuild onto the chain
+                // We MUST skip the rebuild check here otherwise the rebuild will never happen on Linux
+                // This is because the order of events and timing is different on Linux
+                // @ts-ignore: TypeScript isn't picking up that content is a string here
+                await recordChangedFile(filePath, ()=>content, true);
+            } catch  {
+            // If reading the file fails, it's was probably a deleted temporary file
+            // So we can ignore it and no rebuild is needed
             }
-            return recordChangedFile(filePath, ()=>content);
+        }
+        enqueue().then(()=>{
+            // If the file read fails we still need to make sure the file isn't stuck in the pending rebuilds list
+            pendingRebuilds.delete(filePath);
         });
     });
     return {

package/lib/cli/init/index.js

@@ -16,8 +16,8 @@ function _interopRequireDefault(obj) {
 }
 function init(args, configs) {
     let messages = [];
-    var ref;
-    let tailwindConfigLocation = _path.default.resolve((ref = args["_"][1]) !== null && ref !== void 0 ? ref : `./${configs.tailwind}`);
+    var _args___;
+    let tailwindConfigLocation = _path.default.resolve((_args___ = args["_"][1]) !== null && _args___ !== void 0 ? _args___ : `./${configs.tailwind}`);
     if (_fs.default.existsSync(tailwindConfigLocation)) {
         messages.push(`${_path.default.basename(tailwindConfigLocation)} already exists.`);
     } else {

package/lib/cli.js

@@ -72,7 +72,7 @@ let commands = {
                 description: "Output file"
             },
             "--watch": {
-                type: Boolean,
+                type: oneOf(String, Boolean),
                 description: "Watch for changes and rebuild as needed"
             },
             "--poll": {
@@ -159,8 +159,8 @@ let args = (()=>{
             ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
-            var ref;
-            return !(value === null || value === void 0 ? void 0 : (ref = value.type) === null || ref === void 0 ? void 0 : ref.manualParsing);
+            var _value_type;
+            return !(value === null || value === void 0 ? void 0 : (_value_type = value.type) === null || _value_type === void 0 ? void 0 : _value_type.manualParsing);
         }).map(([key, value])=>[
                 key,
                 typeof value === "object" ? value.type : value
@@ -171,8 +171,8 @@ let args = (()=>{
         for(let i = result["_"].length - 1; i >= 0; --i){
             let flag = result["_"][i];
             if (!flag.startsWith("-")) continue;
-            let flagName = flag;
-            let handler = flags[flag];
+            let [flagName, flagValue] = flag.split("=");
+            let handler = flags[flagName];
             // Resolve flagName & handler
             while(typeof handler === "string"){
                 flagName = handler;
@@ -181,14 +181,24 @@ let args = (()=>{
             if (!handler) continue;
             let args = [];
             let offset = i + 1;
-            // Parse args for current flag
-            while(result["_"][offset] && !result["_"][offset].startsWith("-")){
-                args.push(result["_"][offset++]);
+            // --flag value syntax was used so we need to pull `value` from `args`
+            if (flagValue === undefined) {
+                // Parse args for current flag
+                while(result["_"][offset] && !result["_"][offset].startsWith("-")){
+                    args.push(result["_"][offset++]);
+                }
+                // Cleanup manually parsed flags + args
+                result["_"].splice(i, 1 + args.length);
+                // No args were provided, use default value defined in handler
+                // One arg was provided, use that directly
+                // Multiple args were provided so pass them all in an array
+                flagValue = args.length === 0 ? undefined : args.length === 1 ? args[0] : args;
+            } else {
+                // Remove the whole flag from the args array
+                result["_"].splice(i, 1);
             }
-            // Cleanup manually parsed flags + args
-            result["_"].splice(i, 1 + args.length);
             // Set the resolved value in the `result` object
-            result[flagName] = handler.type(args.length === 0 ? undefined : args.length === 1 ? args[0] : args, flagName);
+            result[flagName] = handler.type(flagValue, flagName);
         }
         // Ensure that the `command` is always the first argument in the `args`.
         // This is important so that we don't have to check if a default command

package/lib/corePlugins.js

@@ -212,14 +212,14 @@ let variantPlugins = {
         }
         let variants = {
             group: (_, { modifier  })=>modifier ? [
-                    `:merge(.group\\/${modifier})`,
+                    `:merge(.group\\/${(0, _escapeClassName.default)(modifier)})`,
                     " &"
                 ] : [
                     `:merge(.group)`,
                     " &"
                 ],
             peer: (_, { modifier  })=>modifier ? [
-                    `:merge(.peer\\/${modifier})`,
+                    `:merge(.peer\\/${(0, _escapeClassName.default)(modifier)})`,
                     " ~ &"
                 ] : [
                     `:merge(.peer)`,
@@ -277,15 +277,15 @@ let variantPlugins = {
         addVariant("print", "@media print");
     },
     screenVariants: ({ theme , addVariant , matchVariant  })=>{
-        var ref;
-        let rawScreens = (ref = theme("screens")) !== null && ref !== void 0 ? ref : {};
+        var _theme;
+        let rawScreens = (_theme = theme("screens")) !== null && _theme !== void 0 ? _theme : {};
         let areSimpleScreens = Object.values(rawScreens).every((v)=>typeof v === "string");
         let screens = (0, _normalizeScreens.normalizeScreens)(theme("screens"));
         /** @type {Set<string>} */ let unitCache = new Set([]);
         /** @param {string} value */ function units(value) {
-            var ref;
-            var ref1;
-            return (ref1 = (ref = value.match(/(\D+)$/)) === null || ref === void 0 ? void 0 : ref[1]) !== null && ref1 !== void 0 ? ref1 : "(none)";
+            var _value_match;
+            var _value_match_;
+            return (_value_match_ = (_value_match = value.match(/(\D+)$/)) === null || _value_match === void 0 ? void 0 : _value_match[1]) !== null && _value_match_ !== void 0 ? _value_match_ : "(none)";
         }
         /** @param {string} value */ function recordUnits(value) {
             if (value !== undefined) {
@@ -384,7 +384,7 @@ let variantPlugins = {
         });
     },
     supportsVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("supports", (value = "")=>{
             let check = (0, _dataTypes.normalize)(value);
             let isRaw = /^\w*\s*\(/.test(check);
@@ -402,35 +402,35 @@ let variantPlugins = {
             }
             return `@supports ${check}`;
         }, {
-            values: (ref = theme("supports")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("supports")) !== null && _theme !== void 0 ? _theme : {}
         });
     },
     ariaVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("aria", (value)=>`&[aria-${(0, _dataTypes.normalize)(value)}]`, {
-            values: (ref = theme("aria")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("aria")) !== null && _theme !== void 0 ? _theme : {}
         });
-        var ref1;
+        var _theme1;
         matchVariant("group-aria", (value, { modifier  })=>modifier ? `:merge(.group\\/${modifier})[aria-${(0, _dataTypes.normalize)(value)}] &` : `:merge(.group)[aria-${(0, _dataTypes.normalize)(value)}] &`, {
-            values: (ref1 = theme("aria")) !== null && ref1 !== void 0 ? ref1 : {}
+            values: (_theme1 = theme("aria")) !== null && _theme1 !== void 0 ? _theme1 : {}
         });
-        var ref2;
+        var _theme2;
         matchVariant("peer-aria", (value, { modifier  })=>modifier ? `:merge(.peer\\/${modifier})[aria-${(0, _dataTypes.normalize)(value)}] ~ &` : `:merge(.peer)[aria-${(0, _dataTypes.normalize)(value)}] ~ &`, {
-            values: (ref2 = theme("aria")) !== null && ref2 !== void 0 ? ref2 : {}
+            values: (_theme2 = theme("aria")) !== null && _theme2 !== void 0 ? _theme2 : {}
         });
     },
     dataVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("data", (value)=>`&[data-${(0, _dataTypes.normalize)(value)}]`, {
-            values: (ref = theme("data")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("data")) !== null && _theme !== void 0 ? _theme : {}
         });
-        var ref1;
+        var _theme1;
         matchVariant("group-data", (value, { modifier  })=>modifier ? `:merge(.group\\/${modifier})[data-${(0, _dataTypes.normalize)(value)}] &` : `:merge(.group)[data-${(0, _dataTypes.normalize)(value)}] &`, {
-            values: (ref1 = theme("data")) !== null && ref1 !== void 0 ? ref1 : {}
+            values: (_theme1 = theme("data")) !== null && _theme1 !== void 0 ? _theme1 : {}
         });
-        var ref2;
+        var _theme2;
         matchVariant("peer-data", (value, { modifier  })=>modifier ? `:merge(.peer\\/${modifier})[data-${(0, _dataTypes.normalize)(value)}] ~ &` : `:merge(.peer)[data-${(0, _dataTypes.normalize)(value)}] ~ &`, {
-            values: (ref2 = theme("data")) !== null && ref2 !== void 0 ? ref2 : {}
+            values: (_theme2 = theme("data")) !== null && _theme2 !== void 0 ? _theme2 : {}
         });
     },
     orientationVariants: ({ addVariant  })=>{
@@ -1223,8 +1223,8 @@ let corePlugins = {
     },
     animation: ({ matchUtilities , theme , config  })=>{
         let prefixName = (name)=>`${config("prefix")}${(0, _escapeClassName.default)(name)}`;
-        var ref;
-        let keyframes = Object.fromEntries(Object.entries((ref = theme("keyframes")) !== null && ref !== void 0 ? ref : {}).map(([key, value])=>{
+        var _theme;
+        let keyframes = Object.fromEntries(Object.entries((_theme = theme("keyframes")) !== null && _theme !== void 0 ? _theme : {}).map(([key, value])=>{
             return [
                 key,
                 {
@@ -2872,10 +2872,16 @@ let corePlugins = {
     },
     fontSize: ({ matchUtilities , theme  })=>{
         matchUtilities({
-            text: (value)=>{
+            text: (value, { modifier  })=>{
                 let [fontSize, options] = Array.isArray(value) ? value : [
                     value
                 ];
+                if (modifier) {
+                    return {
+                        "font-size": fontSize,
+                        "line-height": modifier
+                    };
+                }
                 let { lineHeight , letterSpacing , fontWeight  } = (0, _isPlainObject.default)(options) ? options : {
                     lineHeight: options
                 };
@@ -2894,6 +2900,7 @@ let corePlugins = {
             }
         }, {
             values: theme("fontSize"),
+            modifiers: theme("lineHeight"),
             type: [
                 "absolute-size",
                 "relative-size",
@@ -3441,15 +3448,15 @@ let corePlugins = {
     },
     ringWidth: ({ matchUtilities , addDefaults , addUtilities , theme , config  })=>{
         let ringColorDefault = (()=>{
-            var ref, ref1;
+            var _theme, _theme1;
             if ((0, _featureFlags.flagEnabled)(config(), "respectDefaultRingColorOpacity")) {
                 return theme("ringColor.DEFAULT");
             }
             let ringOpacityDefault = theme("ringOpacity.DEFAULT", "0.5");
-            if (!((ref = theme("ringColor")) === null || ref === void 0 ? void 0 : ref.DEFAULT)) {
+            if (!((_theme = theme("ringColor")) === null || _theme === void 0 ? void 0 : _theme.DEFAULT)) {
                 return `rgb(147 197 253 / ${ringOpacityDefault})`;
             }
-            return (0, _withAlphaVariable.withAlphaValue)((ref1 = theme("ringColor")) === null || ref1 === void 0 ? void 0 : ref1.DEFAULT, ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})`);
+            return (0, _withAlphaVariable.withAlphaValue)((_theme1 = theme("ringColor")) === null || _theme1 === void 0 ? void 0 : _theme1.DEFAULT, ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})`);
         })();
         addDefaults("ring-width", {
             "--tw-ring-inset": " ",

package/lib/css/preflight.css

@@ -22,6 +22,7 @@
 2. Prevent adjustments of font size after orientation changes in iOS.
 3. Use a more readable tab size.
 4. Use the user's configured `sans` font-family by default.
+5. Use the user's configured `sans` font-feature-settings by default.
 */
 
 html {
@@ -30,6 +31,7 @@ html {
   -moz-tab-size: 4; /* 3 */
   tab-size: 4; /* 3 */
   font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
+  font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
 }
 
 /*

package/lib/featureFlags.js

@@ -38,14 +38,14 @@ let featureFlags = {
 };
 function flagEnabled(config, flag) {
     if (featureFlags.future.includes(flag)) {
-        var ref;
-        var ref1, ref2;
-        return config.future === "all" || ((ref2 = (ref1 = config === null || config === void 0 ? void 0 : (ref = config.future) === null || ref === void 0 ? void 0 : ref[flag]) !== null && ref1 !== void 0 ? ref1 : defaults[flag]) !== null && ref2 !== void 0 ? ref2 : false);
+        var _config_future;
+        var _config_future_flag, _ref;
+        return config.future === "all" || ((_ref = (_config_future_flag = config === null || config === void 0 ? void 0 : (_config_future = config.future) === null || _config_future === void 0 ? void 0 : _config_future[flag]) !== null && _config_future_flag !== void 0 ? _config_future_flag : defaults[flag]) !== null && _ref !== void 0 ? _ref : false);
     }
     if (featureFlags.experimental.includes(flag)) {
-        var ref3;
-        var ref4, ref5;
-        return config.experimental === "all" || ((ref5 = (ref4 = config === null || config === void 0 ? void 0 : (ref3 = config.experimental) === null || ref3 === void 0 ? void 0 : ref3[flag]) !== null && ref4 !== void 0 ? ref4 : defaults[flag]) !== null && ref5 !== void 0 ? ref5 : false);
+        var _config_experimental;
+        var _config_experimental_flag, _ref1;
+        return config.experimental === "all" || ((_ref1 = (_config_experimental_flag = config === null || config === void 0 ? void 0 : (_config_experimental = config.experimental) === null || _config_experimental === void 0 ? void 0 : _config_experimental[flag]) !== null && _config_experimental_flag !== void 0 ? _config_experimental_flag : defaults[flag]) !== null && _ref1 !== void 0 ? _ref1 : false);
     }
     return false;
 }
@@ -53,8 +53,8 @@ function experimentalFlagsEnabled(config) {
     if (config.experimental === "all") {
         return featureFlags.experimental;
     }
-    var ref;
-    return Object.keys((ref = config === null || config === void 0 ? void 0 : config.experimental) !== null && ref !== void 0 ? ref : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
+    var _config_experimental;
+    return Object.keys((_config_experimental = config === null || config === void 0 ? void 0 : config.experimental) !== null && _config_experimental !== void 0 ? _config_experimental : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
 }
 function issueFlagNotices(config) {
     if (process.env.JEST_WORKER_ID !== undefined) {

package/lib/index.js

@@ -21,10 +21,10 @@ module.exports = function tailwindcss(configOrPath) {
                 return root;
             },
             function(root, result) {
-                var ref;
+                var _findAtConfigPath1;
                 // Use the path for the `@config` directive if it exists, otherwise use the
                 // path for the file being processed
-                configOrPath = (ref = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && ref !== void 0 ? ref : configOrPath;
+                configOrPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : configOrPath;
                 let context = (0, _setupTrackingContext.default)(configOrPath);
                 if (root.type === "document") {
                     let roots = root.nodes.filter((node)=>node.type === "root");

package/lib/lib/collapseAdjacentRules.js

@@ -29,10 +29,10 @@ function collapseAdjacentRules() {
                 return;
             }
             let properties = comparisonMap[node.type];
-            var _property, _property1;
+            var _node_property, _currentRule_property;
             if (node.type === "atrule" && node.name === "font-face") {
                 currentRule = node;
-            } else if (properties.every((property)=>((_property = node[property]) !== null && _property !== void 0 ? _property : "").replace(/\s+/g, " ") === ((_property1 = currentRule[property]) !== null && _property1 !== void 0 ? _property1 : "").replace(/\s+/g, " "))) {
+            } else if (properties.every((property)=>((_node_property = node[property]) !== null && _node_property !== void 0 ? _node_property : "").replace(/\s+/g, " ") === ((_currentRule_property = currentRule[property]) !== null && _currentRule_property !== void 0 ? _currentRule_property : "").replace(/\s+/g, " "))) {
                 // An AtRule may not have children (for example if we encounter duplicate @import url(…) rules)
                 if (node.nodes) {
                     currentRule.append(node.nodes);

package/lib/lib/collapseDuplicateDeclarations.js

@@ -76,8 +76,8 @@ let UNITLESS_NUMBER = Symbol("unitless-number");
 function resolveUnit(input) {
     let result = /^-?\d*.?\d+([\w%]+)?$/g.exec(input);
     if (result) {
-        var ref;
-        return (ref = result[1]) !== null && ref !== void 0 ? ref : UNITLESS_NUMBER;
+        var _result_;
+        return (_result_ = result[1]) !== null && _result_ !== void 0 ? _result_ : UNITLESS_NUMBER;
     }
     return null;
 }