tailwindcss 3.2.4 → 3.2.6

package/CHANGELOG.md

@@ -9,6 +9,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.2.6] - 2023-02-08
+
+### Fixed
+
+- drop oxide api shim ([add16364b4b1100e1af23ad1ca6900a0b53cbba0](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
+
+## [3.2.5] - 2023-02-08
+
+### Added
+
+- Add standalone CLI build for 64-bit Windows on ARM (`node16-win-arm64`) ([#10001](https://github.com/tailwindlabs/tailwindcss/pull/10001))
+
+### 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))
+- Allow variants with slashes ([#10336](https://github.com/tailwindlabs/tailwindcss/pull/10336))
+- Ensure generated CSS is always sorted in the same order for a given set of templates ([#10382](https://github.com/tailwindlabs/tailwindcss/pull/10382))
+- Handle variants when the same class appears multiple times in a selector ([#10397](https://github.com/tailwindlabs/tailwindcss/pull/10397))
+- Handle group/peer variants with quoted strings ([#10400](https://github.com/tailwindlabs/tailwindcss/pull/10400))
+- Parse alpha value from rgba/hsla colors when using variables ([#10429](https://github.com/tailwindlabs/tailwindcss/pull/10429))
+- Sort by `layer` inside `variants` layer ([#10505](https://github.com/tailwindlabs/tailwindcss/pull/10505))
+- Add `--watch=always` option to prevent exit when stdin closes ([#9966](https://github.com/tailwindlabs/tailwindcss/pull/9966))
+
+### Changed
+
+- Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
+- Update esbuild to v17 ([#10368](https://github.com/tailwindlabs/tailwindcss/pull/10368))
+- Include `outline-color` in `transition` and `transition-colors` utilitires ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
+
 ## [3.2.4] - 2022-11-11
 
 ### Added
@@ -2121,7 +2169,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...HEAD
+[3.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...v3.2.6
+[3.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...v3.2.5
 [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

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/ci-stable.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

@@ -18,7 +18,7 @@ const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-conf
 const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("../../processTailwindFeatures"));
 const _deps = require("./deps");
 const _utils = require("./utils");
-const _shared = require("../shared");
+const _sharedState = require("../../lib/sharedState");
 const _resolveConfigJs = /*#__PURE__*/ _interopRequireDefault(require("../../../resolveConfig.js"));
 const _getModuleDependenciesJs = /*#__PURE__*/ _interopRequireDefault(require("../../lib/getModuleDependencies.js"));
 const _contentJs = require("../../lib/content.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;
@@ -143,7 +143,7 @@ let state = {
         return config;
     },
     refreshConfigDependencies (configPath) {
-        _shared.env.DEBUG && console.time("Module dependencies");
+        _sharedState.env.DEBUG && console.time("Module dependencies");
         for (let file of this.configDependencies){
             delete require.cache[require.resolve(file)];
         }
@@ -153,7 +153,7 @@ let state = {
                 this.configDependencies.add(dependency);
             }
         }
-        _shared.env.DEBUG && console.timeEnd("Module dependencies");
+        _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
     },
     readContentPaths () {
         let content = [];
@@ -161,10 +161,17 @@ let state = {
         // TODO: When we make the postcss plugin async-capable this can become async
         let files = _fastGlob.default.sync(this.contentPatterns.all);
         for (let file of files){
-            content.push({
-                content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
-                extension: _path.default.extname(file).slice(1)
-            });
+            if (_sharedState.env.OXIDE) {
+                content.push({
+                    file,
+                    extension: _path.default.extname(file).slice(1)
+                });
+            } else {
+                content.push({
+                    content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
+                    extension: _path.default.extname(file).slice(1)
+                });
+            }
         }
         // Resolve raw content in the tailwind config
         let rawContent = this.config.content.files.filter((file)=>{
@@ -183,37 +190,35 @@ let state = {
             this.context.changedContent = this.changedContent.splice(0);
             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;
-        _shared.env.DEBUG && console.timeEnd("Searching for config");
-        _shared.env.DEBUG && console.time("Loading config");
+        _sharedState.env.DEBUG && console.time("Searching for config");
+        var _findAtConfigPath;
+        let configPath = (_findAtConfigPath = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && _findAtConfigPath !== void 0 ? _findAtConfigPath : cliConfigPath;
+        _sharedState.env.DEBUG && console.timeEnd("Searching for config");
+        _sharedState.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
-        _shared.env.DEBUG && console.timeEnd("Loading config");
-        _shared.env.DEBUG && console.time("Creating context");
+        _sharedState.env.DEBUG && console.timeEnd("Loading config");
+        _sharedState.env.DEBUG && console.time("Creating context");
         this.context = createContext(config, []);
         Object.assign(this.context, {
             userConfigPath: configPath
         });
-        _shared.env.DEBUG && console.timeEnd("Creating context");
-        _shared.env.DEBUG && console.time("Resolving content paths");
+        _sharedState.env.DEBUG && console.timeEnd("Creating context");
+        _sharedState.env.DEBUG && console.time("Resolving content paths");
         this.refreshContentPaths();
-        _shared.env.DEBUG && console.timeEnd("Resolving content paths");
+        _sharedState.env.DEBUG && console.timeEnd("Resolving content paths");
         if (this.watcher) {
-            _shared.env.DEBUG && console.time("Watch new files");
+            _sharedState.env.DEBUG && console.time("Watch new files");
             this.watcher.refreshWatchedFiles();
-            _shared.env.DEBUG && console.timeEnd("Watch new files");
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
         }
-        _shared.env.DEBUG && console.time("Reading content files");
         for (let file of this.readContentPaths()){
             this.context.changedContent.push(file);
         }
-        _shared.env.DEBUG && console.timeEnd("Reading content files");
         return this.context;
     }
 };
 async function createProcessor(args, cliConfigPath) {
-    var ref;
+    var _args_content;
     let postcss = (0, _deps.loadPostcss)();
     let input = args["--input"];
     let output = args["--output"];
@@ -229,13 +234,13 @@ 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",
             Once (root, { result  }) {
-                _shared.env.DEBUG && console.time("Compiling CSS");
+                _sharedState.env.DEBUG && console.time("Compiling CSS");
                 (0, _processTailwindFeatures.default)(({ createContext  })=>{
                     console.error();
                     console.error("Rebuilding...");
@@ -249,7 +254,7 @@ async function createProcessor(args, cliConfigPath) {
                         });
                     };
                 })(root, result);
-                _shared.env.DEBUG && console.timeEnd("Compiling CSS");
+                _sharedState.env.DEBUG && console.timeEnd("Compiling CSS");
             }
         };
     };
@@ -286,17 +291,17 @@ async function createProcessor(args, cliConfigPath) {
             if (!state.watcher) {
                 return result;
             }
-            _shared.env.DEBUG && console.time("Recording PostCSS dependencies");
+            _sharedState.env.DEBUG && console.time("Recording PostCSS dependencies");
             for (let message of result.messages){
                 if (message.type === "dependency") {
                     state.contextDependencies.add(message.file);
                 }
             }
-            _shared.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
+            _sharedState.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
             // TODO: This needs to be in a different spot
-            _shared.env.DEBUG && console.time("Watch new files");
+            _sharedState.env.DEBUG && console.time("Watch new files");
             state.watcher.refreshWatchedFiles();
-            _shared.env.DEBUG && console.timeEnd("Watch new files");
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
             return result;
         }).then((result)=>{
             if (!output) {
@@ -304,8 +309,8 @@ 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();

package/lib/cli/index.js

@@ -1,18 +1,239 @@
+#!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_exportStar(require("./build"), exports);
-_exportStar(require("./config"), exports);
-_exportStar(require("./content"), exports);
-function _exportStar(from, to) {
-    Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) Object.defineProperty(to, k, {
-            enumerable: true,
-            get: function() {
-                return from[k];
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _build = require("./build");
+const _help = require("./help");
+const _init = require("./init");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function isESM() {
+    const pkgPath = _path.default.resolve("./package.json");
+    try {
+        let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
+        return pkg.type && pkg.type === "module";
+    } catch (err) {
+        return false;
+    }
+}
+let configs = isESM() ? {
+    tailwind: "tailwind.config.cjs",
+    postcss: "postcss.config.cjs"
+} : {
+    tailwind: "tailwind.config.js",
+    postcss: "postcss.config.js"
+};
+// ---
+function oneOf(...options) {
+    return Object.assign((value = true)=>{
+        for (let option of options){
+            let parsed = option(value);
+            if (parsed === value) {
+                return parsed;
             }
+        }
+        throw new Error("...");
+    }, {
+        manualParsing: true
+    });
+}
+let commands = {
+    init: {
+        run: _init.init,
+        args: {
+            "--full": {
+                type: Boolean,
+                description: `Initialize a full \`${configs.tailwind}\` file`
+            },
+            "--postcss": {
+                type: Boolean,
+                description: `Initialize a \`${configs.postcss}\` file`
+            },
+            "-f": "--full",
+            "-p": "--postcss"
+        }
+    },
+    build: {
+        run: _build.build,
+        args: {
+            "--input": {
+                type: String,
+                description: "Input file"
+            },
+            "--output": {
+                type: String,
+                description: "Output file"
+            },
+            "--watch": {
+                type: oneOf(String, Boolean),
+                description: "Watch for changes and rebuild as needed"
+            },
+            "--poll": {
+                type: Boolean,
+                description: "Use polling instead of filesystem events when watching"
+            },
+            "--content": {
+                type: String,
+                description: "Content paths to use for removing unused classes"
+            },
+            "--purge": {
+                type: String,
+                deprecated: true
+            },
+            "--postcss": {
+                type: oneOf(String, Boolean),
+                description: "Load custom PostCSS configuration"
+            },
+            "--minify": {
+                type: Boolean,
+                description: "Minify the output"
+            },
+            "--config": {
+                type: String,
+                description: "Path to a custom config file"
+            },
+            "--no-autoprefixer": {
+                type: Boolean,
+                description: "Disable autoprefixer"
+            },
+            "-c": "--config",
+            "-i": "--input",
+            "-o": "--output",
+            "-m": "--minify",
+            "-w": "--watch",
+            "-p": "--poll"
+        }
+    }
+};
+let sharedFlags = {
+    "--help": {
+        type: Boolean,
+        description: "Display usage information"
+    },
+    "-h": "--help"
+};
+if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.argv[2] === undefined || process.argv.slice(2).every((flag)=>sharedFlags[flag] !== undefined))) {
+    (0, _help.help)({
+        usage: [
+            "tailwindcss [--input input.css] [--output output.css] [--watch] [options...]",
+            "tailwindcss init [--full] [--postcss] [options...]"
+        ],
+        commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
+        options: {
+            ...commands.build.args,
+            ...sharedFlags
+        }
+    });
+    process.exit(0);
+}
+let command = ((arg = "")=>arg.startsWith("-") ? undefined : arg)(process.argv[2]) || "build";
+if (commands[command] === undefined) {
+    if (_fs.default.existsSync(_path.default.resolve(command))) {
+        // TODO: Deprecate this in future versions
+        // Check if non-existing command, might be a file.
+        command = "build";
+    } else {
+        (0, _help.help)({
+            message: `Invalid command: ${command}`,
+            usage: [
+                "tailwindcss <command> [options]"
+            ],
+            commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
+            options: sharedFlags
+        });
+        process.exit(1);
+    }
+}
+// Execute command
+let { args: flags , run  } = commands[command];
+let args = (()=>{
+    try {
+        let result = (0, _arg.default)(Object.fromEntries(Object.entries({
+            ...flags,
+            ...sharedFlags
+        }).filter(([_key, value])=>{
+            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
+            ])), {
+            permissive: true
         });
+        // Manual parsing of flags to allow for special flags like oneOf(Boolean, String)
+        for(let i = result["_"].length - 1; i >= 0; --i){
+            let flag = result["_"][i];
+            if (!flag.startsWith("-")) continue;
+            let [flagName, flagValue] = flag.split("=");
+            let handler = flags[flagName];
+            // Resolve flagName & handler
+            while(typeof handler === "string"){
+                flagName = handler;
+                handler = flags[handler];
+            }
+            if (!handler) continue;
+            let args = [];
+            let offset = i + 1;
+            // --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);
+            }
+            // Set the resolved value in the `result` object
+            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
+        // (build) was used or not from within each plugin.
+        //
+        // E.g.: tailwindcss input.css -> _: ['build', 'input.css']
+        // E.g.: tailwindcss build input.css -> _: ['build', 'input.css']
+        if (result["_"][0] !== command) {
+            result["_"].unshift(command);
+        }
+        return result;
+    } catch (err) {
+        if (err.code === "ARG_UNKNOWN_OPTION") {
+            (0, _help.help)({
+                message: err.message,
+                usage: [
+                    "tailwindcss <command> [options]"
+                ],
+                options: sharedFlags
+            });
+            process.exit(1);
+        }
+        throw err;
+    }
+})();
+if (args["--help"]) {
+    (0, _help.help)({
+        options: {
+            ...flags,
+            ...sharedFlags
+        },
+        usage: [
+            `tailwindcss ${command} [options]`
+        ]
     });
-    return from;
+    process.exit(0);
 }
+run(args, configs);

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 {