tailwindcss 0.0.0-oxide.6bf5e56 → 0.0.0-oxide.956419c

package/CHANGELOG.md

@@ -20,6 +20,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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))
+
+### Changed
+
+- Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
 
 ## [3.2.4] - 2022-11-11
 

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 ref;
+            return !(value === null || value === void 0 ? void 0 : (ref = value.type) === null || ref === void 0 ? void 0 : ref.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.js

@@ -1,239 +1,7 @@
 #!/usr/bin/env node
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _build = require("./cli/build");
-const _help = require("./cli/help");
-const _init = require("./cli/init");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
+if (process.env.OXIDE) {
+    module.exports = require("./oxide/cli.js");
+} else {
+    module.exports = require("./cli/index.js");
 }
-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 ref;
-            return !(value === null || value === void 0 ? void 0 : (ref = value.type) === null || ref === void 0 ? void 0 : ref.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]`
-        ]
-    });
-    process.exit(0);
-}
-run(args, configs);

package/lib/index.js

@@ -1,48 +1,6 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _setupTrackingContext = /*#__PURE__*/ _interopRequireDefault(require("./lib/setupTrackingContext"));
-const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("./processTailwindFeatures"));
-const _sharedState = require("./lib/sharedState");
-const _findAtConfigPath = require("./lib/findAtConfigPath");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
+if (process.env.OXIDE) {
+    module.exports = require("./oxide/postcss-plugin.js");
+} else {
+    module.exports = require("./plugin.js");
 }
-module.exports = function tailwindcss(configOrPath) {
-    return {
-        postcssPlugin: "tailwindcss",
-        plugins: [
-            _sharedState.env.DEBUG && function(root) {
-                console.log("\n");
-                console.time("JIT TOTAL");
-                return root;
-            },
-            function(root, result) {
-                var ref;
-                // 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;
-                let context = (0, _setupTrackingContext.default)(configOrPath);
-                if (root.type === "document") {
-                    let roots = root.nodes.filter((node)=>node.type === "root");
-                    for (const root1 of roots){
-                        if (root1.type === "root") {
-                            (0, _processTailwindFeatures.default)(context)(root1, result);
-                        }
-                    }
-                    return;
-                }
-                (0, _processTailwindFeatures.default)(context)(root, result);
-            },
-            _sharedState.env.DEBUG && function(root) {
-                console.timeEnd("JIT TOTAL");
-                console.log("\n");
-                return root;
-            }
-        ].filter(Boolean)
-    };
-};
-module.exports.postcss = true;

package/lib/lib/defaultExtractor.js

@@ -216,7 +216,7 @@ let ALLOWED_CLASS_CHARACTERS = /[^"'`\s<>\]]+/;
         // This means that there was an extra closing `]`
         // We'll clip to just before it
         if (depth < 0) {
-            return input.substring(0, match.index);
+            return input.substring(0, match.index - 1);
         }
         // We've finished balancing the brackets but there still may be characters that can be included
         // For example in the class `text-[#336699]/[.35]`

package/lib/oxide/cli.d.js

@@ -0,0 +1 @@
+"use strict";

package/lib/oxide/cli.js

@@ -0,0 +1,2 @@
+"use strict";
+require("../cli/index.js");

package/lib/oxide/postcss-plugin.d.js

@@ -0,0 +1 @@
+"use strict";

package/lib/oxide/postcss-plugin.js

@@ -0,0 +1,2 @@
+"use strict";
+module.exports = require("../plugin.js");

package/lib/plugin.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _setupTrackingContext = /*#__PURE__*/ _interopRequireDefault(require("./lib/setupTrackingContext"));
+const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("./processTailwindFeatures"));
+const _sharedState = require("./lib/sharedState");
+const _findAtConfigPath = require("./lib/findAtConfigPath");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+module.exports = function tailwindcss(configOrPath) {
+    return {
+        postcssPlugin: "tailwindcss",
+        plugins: [
+            _sharedState.env.DEBUG && function(root) {
+                console.log("\n");
+                console.time("JIT TOTAL");
+                return root;
+            },
+            function(root, result) {
+                var ref;
+                // 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;
+                let context = (0, _setupTrackingContext.default)(configOrPath);
+                if (root.type === "document") {
+                    let roots = root.nodes.filter((node)=>node.type === "root");
+                    for (const root1 of roots){
+                        if (root1.type === "root") {
+                            (0, _processTailwindFeatures.default)(context)(root1, result);
+                        }
+                    }
+                    return;
+                }
+                (0, _processTailwindFeatures.default)(context)(root, result);
+            },
+            _sharedState.env.DEBUG && function(root) {
+                console.timeEnd("JIT TOTAL");
+                console.log("\n");
+                return root;
+            }
+        ].filter(Boolean)
+    };
+};
+module.exports.postcss = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide.6bf5e56",
+  "version": "0.0.0-oxide.956419c",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -13,10 +13,10 @@
     "tailwindcss": "lib/cli.js"
   },
   "scripts": {
-    "preswcify": "npm run generate && rimraf lib",
-    "swcify": "swc src --out-dir lib --copy-files",
-    "postswcify": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
-    "rebuild-fixtures": "npm run swcify && node -r @swc/register scripts/rebuildFixtures.js",
+    "prebuild": "npm run generate && rimraf lib",
+    "build": "swc src --out-dir lib --copy-files",
+    "postbuild": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
+    "rebuild-fixtures": "npm run build && node -r @swc/register scripts/rebuildFixtures.js",
     "style": "eslint .",
     "pretest": "npm run generate",
     "test": "jest",
@@ -28,8 +28,8 @@
     "release-channel": "node ./scripts/release-channel.js",
     "release-notes": "node ./scripts/release-notes.js",
     "oxide:install": "npm install --prefix ./oxide",
-    "oxide:dev": "concurrently -n tailwind,oxide-node -c green,yellow 'npm run swcify -- --watch' 'npm run --prefix ./oxide dev:node'",
-    "oxide:build": "npm run --prefix ./oxide build:node && npm run swcify"
+    "oxide:dev": "concurrently -n tailwind,oxide-node -c green,yellow 'npm run build -- --watch' 'npm run --prefix ./oxide dev:node'",
+    "oxide:build": "npm run --prefix ./oxide build:node && npm run build"
   },
   "files": [
     "src/*",
@@ -66,7 +66,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "@tailwindcss/oxide": "0.0.0-insiders.6bf5e56",
+    "@tailwindcss/oxide": "0.0.0-insiders.956419c",
     "arg": "^5.0.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",