tailwindcss 3.0.21 → 3.0.24

package/lib/util/parseObjectStyles.js

@@ -6,11 +6,6 @@ exports.default = parseObjectStyles;
 var _postcss = _interopRequireDefault(require("postcss"));
 var _postcssNested = _interopRequireDefault(require("postcss-nested"));
 var _postcssJs = _interopRequireDefault(require("postcss-js"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function parseObjectStyles(styles) {
     if (!Array.isArray(styles)) {
         return parseObjectStyles([
@@ -21,7 +16,7 @@ function parseObjectStyles(styles) {
         return (0, _postcss).default([
             (0, _postcssNested).default({
                 bubble: [
-                    'screen'
+                    "screen"
                 ]
             }), 
         ]).process(style, {
@@ -29,3 +24,8 @@ function parseObjectStyles(styles) {
         }).root.nodes;
     });
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/util/pluginUtils.js

@@ -60,16 +60,16 @@ function asValue(modifier, options = {}, { validate =()=>true
     if (value !== undefined) {
         return value;
     }
-    if (options.supportsNegativeValues && modifier.startsWith('-')) {
+    if (options.supportsNegativeValues && modifier.startsWith("-")) {
         return asNegativeValue(modifier.slice(1), options.values, validate);
     }
     return resolveArbitraryValue(modifier, validate);
 }
 function isArbitraryValue(input) {
-    return input.startsWith('[') && input.endsWith(']');
+    return input.startsWith("[") && input.endsWith("]");
 }
 function splitAlpha(modifier) {
-    let slashIdx = modifier.lastIndexOf('/');
+    let slashIdx = modifier.lastIndexOf("/");
     if (slashIdx === -1 || slashIdx === modifier.length - 1) {
         return [
             modifier
@@ -126,12 +126,12 @@ let typeMap = {
     percentage: guess(_dataTypes.percentage),
     position: guess(_dataTypes.position),
     lookup: asLookupValue,
-    'generic-name': guess(_dataTypes.genericName),
-    'family-name': guess(_dataTypes.familyName),
+    "generic-name": guess(_dataTypes.genericName),
+    "family-name": guess(_dataTypes.familyName),
     number: guess(_dataTypes.number),
-    'line-width': guess(_dataTypes.lineWidth),
-    'absolute-size': guess(_dataTypes.absoluteSize),
-    'relative-size': guess(_dataTypes.relativeSize),
+    "line-width": guess(_dataTypes.lineWidth),
+    "absolute-size": guess(_dataTypes.absoluteSize),
+    "relative-size": guess(_dataTypes.relativeSize),
     shadow: guess(_dataTypes.shadow)
 };
 let supportedTypes = Object.keys(typeMap);
@@ -149,7 +149,7 @@ function splitAtFirst(input, delim) {
 function coerceValue(types, modifier, options, tailwindConfig) {
     if (isArbitraryValue(modifier)) {
         let arbitraryValue = modifier.slice(1, -1);
-        let [explicitType, value] = splitAtFirst(arbitraryValue, ':');
+        let [explicitType, value] = splitAtFirst(arbitraryValue, ":");
         // It could be that this resolves to `url(https` which is not a valid
         // identifier. We currently only support "simple" words with dashes or
         // underscores. E.g.: family-name

package/lib/util/prefixSelector.js

@@ -13,7 +13,7 @@ function _default(prefix, selector, prependNegative = false) {
     return (0, _postcssSelectorParser).default((selectors)=>{
         selectors.walkClasses((classSelector)=>{
             let baseClass = classSelector.value;
-            let shouldPlaceNegativeBeforePrefix = prependNegative && baseClass.startsWith('-');
+            let shouldPlaceNegativeBeforePrefix = prependNegative && baseClass.startsWith("-");
             classSelector.value = shouldPlaceNegativeBeforePrefix ? `-${prefix}${baseClass.slice(1)}` : `${prefix}${baseClass}`;
         });
     }).processSync(selector);

package/lib/util/resolveConfig.js

@@ -13,16 +13,38 @@ var _toPath = require("./toPath");
 var _normalizeConfig = require("./normalizeConfig");
 var _isPlainObject = _interopRequireDefault(require("./isPlainObject"));
 var _cloneDeep = require("./cloneDeep");
+function resolveConfig(configs) {
+    let allConfigs = [
+        ...extractPluginConfigs(configs),
+        {
+            prefix: "",
+            important: false,
+            separator: ":",
+            variantOrder: _defaultConfigStub.default.variantOrder
+        }, 
+    ];
+    var ref, ref1;
+    return (0, _normalizeConfig).normalizeConfig((0, _defaults).defaults({
+        theme: resolveFunctionKeys(mergeExtensions(mergeThemes(allConfigs.map((t)=>{
+            return (ref = t === null || t === void 0 ? void 0 : t.theme) !== null && ref !== void 0 ? ref : {};
+        })))),
+        corePlugins: resolveCorePlugins(allConfigs.map((c)=>c.corePlugins
+        )),
+        plugins: resolvePluginLists(configs.map((c)=>{
+            return (ref1 = c === null || c === void 0 ? void 0 : c.plugins) !== null && ref1 !== void 0 ? ref1 : [];
+        }))
+    }, ...allConfigs));
+}
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function isFunction(input) {
-    return typeof input === 'function';
+    return typeof input === "function";
 }
 function isObject(input) {
-    return typeof input === 'object' && input !== null;
+    return typeof input === "object" && input !== null;
 }
 function mergeWith(target, ...sources) {
     let customizer = sources.pop();
@@ -46,7 +68,7 @@ const configUtils = {
     colors: _colors.default,
     negative (scale) {
         // TODO: Log that this function isn't really needed anymore?
-        return Object.keys(scale).filter((key)=>scale[key] !== '0'
+        return Object.keys(scale).filter((key)=>scale[key] !== "0"
         ).reduce((negativeScale, key)=>{
             let negativeValue = (0, _negateValue).default(scale[key]);
             if (negativeValue !== undefined) {
@@ -56,7 +78,7 @@ const configUtils = {
         }, {});
     },
     breakpoints (screens) {
-        return Object.keys(screens).filter((key)=>typeof screens[key] === 'string'
+        return Object.keys(screens).filter((key)=>typeof screens[key] === "string"
         ).reduce((breakpoints, key)=>({
                 ...breakpoints,
                 [`screen-${key}`]: screens[key]
@@ -165,8 +187,8 @@ function extractPluginConfigs(configs) {
             ...allConfigs,
             config
         ];
-        var ref1;
-        const plugins = (ref1 = config === null || config === void 0 ? void 0 : config.plugins) !== null && ref1 !== void 0 ? ref1 : [];
+        var ref2;
+        const plugins = (ref2 = config === null || config === void 0 ? void 0 : config.plugins) !== null && ref2 !== void 0 ? ref2 : [];
         if (plugins.length === 0) {
             return;
         }
@@ -209,25 +231,3 @@ function resolvePluginLists(pluginLists) {
     }, []);
     return result;
 }
-function resolveConfig(configs) {
-    let allConfigs = [
-        ...extractPluginConfigs(configs),
-        {
-            prefix: '',
-            important: false,
-            separator: ':',
-            variantOrder: _defaultConfigStub.default.variantOrder
-        }, 
-    ];
-    var ref, ref2;
-    return (0, _normalizeConfig).normalizeConfig((0, _defaults).defaults({
-        theme: resolveFunctionKeys(mergeExtensions(mergeThemes(allConfigs.map((t)=>{
-            return (ref = t === null || t === void 0 ? void 0 : t.theme) !== null && ref !== void 0 ? ref : {};
-        })))),
-        corePlugins: resolveCorePlugins(allConfigs.map((c)=>c.corePlugins
-        )),
-        plugins: resolvePluginLists(configs.map((c)=>{
-            return (ref2 = c === null || c === void 0 ? void 0 : c.plugins) !== null && ref2 !== void 0 ? ref2 : [];
-        }))
-    }, ...allConfigs));
-}

package/lib/util/resolveConfigPath.js

@@ -5,20 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = resolveConfigPath;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function isObject(value) {
-    return typeof value === 'object' && value !== null;
-}
-function isEmpty(obj) {
-    return Object.keys(obj).length === 0;
-}
-function isString(value) {
-    return typeof value === 'string' || value instanceof String;
-}
 function resolveConfigPath(pathOrConfig) {
     // require('tailwindcss')({ theme: ..., variants: ... })
     if (isObject(pathOrConfig) && pathOrConfig.config === undefined && !isEmpty(pathOrConfig)) {
@@ -38,8 +24,8 @@ function resolveConfigPath(pathOrConfig) {
     }
     // require('tailwindcss')
     for (const configFile of [
-        './tailwind.config.js',
-        './tailwind.config.cjs'
+        "./tailwind.config.js",
+        "./tailwind.config.cjs"
     ]){
         try {
             const configPath = _path.default.resolve(configFile);
@@ -49,3 +35,17 @@ function resolveConfigPath(pathOrConfig) {
     }
     return null;
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function isObject(value) {
+    return typeof value === "object" && value !== null;
+}
+function isEmpty(obj) {
+    return Object.keys(obj).length === 0;
+}
+function isString(value) {
+    return typeof value === "string" || value instanceof String;
+}

package/lib/util/responsive.js

@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = responsive;
 var _postcss = _interopRequireDefault(require("postcss"));
 var _cloneNodes = _interopRequireDefault(require("./cloneNodes"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function responsive(rules) {
     return _postcss.default.atRule({
-        name: 'responsive'
+        name: "responsive"
     }).append((0, _cloneNodes).default(Array.isArray(rules) ? rules : [
         rules
     ]));
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/util/toColorValue.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = toColorValue;
 function toColorValue(maybeFunction) {
-    return typeof maybeFunction === 'function' ? maybeFunction({}) : maybeFunction;
+    return typeof maybeFunction === "function" ? maybeFunction({}) : maybeFunction;
 }

package/lib/util/toPath.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.toPath = toPath;
 function toPath(path) {
     if (Array.isArray(path)) return path;
-    let openBrackets = path.split('[').length - 1;
-    let closedBrackets = path.split(']').length - 1;
+    let openBrackets = path.split("[").length - 1;
+    let closedBrackets = path.split("]").length - 1;
     if (openBrackets !== closedBrackets) {
         throw new Error(`Path is invalid. Has unbalanced brackets: ${path}`);
     }

package/lib/util/transformThemeValue.js

@@ -4,56 +4,56 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = transformThemeValue;
 var _postcss = _interopRequireDefault(require("postcss"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function transformThemeValue(themeSection) {
     if ([
-        'fontSize',
-        'outline'
+        "fontSize",
+        "outline"
     ].includes(themeSection)) {
         return (value)=>{
-            if (typeof value === 'function') value = value({});
+            if (typeof value === "function") value = value({});
             if (Array.isArray(value)) value = value[0];
             return value;
         };
     }
     if ([
-        'fontFamily',
-        'boxShadow',
-        'transitionProperty',
-        'transitionDuration',
-        'transitionDelay',
-        'transitionTimingFunction',
-        'backgroundImage',
-        'backgroundSize',
-        'backgroundColor',
-        'cursor',
-        'animation', 
+        "fontFamily",
+        "boxShadow",
+        "transitionProperty",
+        "transitionDuration",
+        "transitionDelay",
+        "transitionTimingFunction",
+        "backgroundImage",
+        "backgroundSize",
+        "backgroundColor",
+        "cursor",
+        "animation", 
     ].includes(themeSection)) {
         return (value)=>{
-            if (typeof value === 'function') value = value({});
-            if (Array.isArray(value)) value = value.join(', ');
+            if (typeof value === "function") value = value({});
+            if (Array.isArray(value)) value = value.join(", ");
             return value;
         };
     }
     // For backwards compatibility reasons, before we switched to underscores
     // instead of commas for arbitrary values.
     if ([
-        'gridTemplateColumns',
-        'gridTemplateRows',
-        'objectPosition'
+        "gridTemplateColumns",
+        "gridTemplateRows",
+        "objectPosition"
     ].includes(themeSection)) {
         return (value)=>{
-            if (typeof value === 'function') value = value({});
-            if (typeof value === 'string') value = _postcss.default.list.comma(value).join(' ');
+            if (typeof value === "function") value = value({});
+            if (typeof value === "string") value = _postcss.default.list.comma(value).join(" ");
             return value;
         };
     }
     return (value)=>{
-        if (typeof value === 'function') value = value({});
+        if (typeof value === "function") value = value({});
         return value;
     };
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/util/withAlphaVariable.js

@@ -2,29 +2,14 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.withAlphaValue = withAlphaValue;
 exports.default = withAlphaVariable;
+exports.withAlphaValue = withAlphaValue;
 var _color = require("./color");
-function withAlphaValue(color, alphaValue, defaultValue) {
-    if (typeof color === 'function') {
-        return color({
-            opacityValue: alphaValue
-        });
-    }
-    let parsed = (0, _color).parseColor(color);
-    if (parsed === null) {
-        return defaultValue;
-    }
-    return (0, _color).formatColor({
-        ...parsed,
-        alpha: alphaValue
-    });
-}
 function withAlphaVariable({ color , property , variable  }) {
     let properties = [].concat(property);
-    if (typeof color === 'function') {
+    if (typeof color === "function") {
         return {
-            [variable]: '1',
+            [variable]: "1",
             ...Object.fromEntries(properties.map((p)=>{
                 return [
                     p,
@@ -53,7 +38,7 @@ function withAlphaVariable({ color , property , variable  }) {
         ));
     }
     return {
-        [variable]: '1',
+        [variable]: "1",
         ...Object.fromEntries(properties.map((p)=>{
             return [
                 p,
@@ -65,3 +50,18 @@ function withAlphaVariable({ color , property , variable  }) {
         }))
     };
 }
+function withAlphaValue(color, alphaValue, defaultValue) {
+    if (typeof color === "function") {
+        return color({
+            opacityValue: alphaValue
+        });
+    }
+    let parsed = (0, _color).parseColor(color);
+    if (parsed === null) {
+        return defaultValue;
+    }
+    return (0, _color).formatColor({
+        ...parsed,
+        alpha: alphaValue
+    });
+}

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "tailwindcss",
-  "version": "3.0.21",
+  "version": "3.0.24",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
-  "style": "dist/tailwind.css",
   "repository": "https://github.com/tailwindlabs/tailwindcss.git",
   "bugs": "https://github.com/tailwindlabs/tailwindcss/issues",
   "homepage": "https://tailwindcss.com",
@@ -13,18 +12,20 @@
     "tailwindcss": "lib/cli.js"
   },
   "scripts": {
-    "preswcify": "npm run generate:plugin-list && rimraf lib",
+    "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",
     "prepublishOnly": "npm install --force && npm run swcify",
     "style": "eslint .",
-    "pretest": "npm run generate:plugin-list",
+    "pretest": "npm run generate",
     "test": "jest",
     "test:integrations": "npm run test --prefix ./integrations",
     "install:integrations": "node scripts/install-integrations.js",
     "posttest": "npm run style",
-    "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js"
+    "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js",
+    "generate:types": "node -r @swc/register scripts/generate-types.js",
+    "generate": "npm run generate:plugin-list"
   },
   "files": [
     "src/*",
@@ -38,45 +39,45 @@
     "*.js"
   ],
   "devDependencies": {
-    "@swc/cli": "^0.1.55",
-    "@swc/core": "^1.2.127",
-    "@swc/jest": "^0.2.17",
+    "@swc/cli": "^0.1.56",
+    "@swc/core": "^1.2.160",
+    "@swc/jest": "^0.2.20",
     "@swc/register": "^0.1.10",
-    "autoprefixer": "^10.4.2",
-    "cssnano": "^5.0.16",
-    "esbuild": "^0.14.10",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "^8.3.0",
+    "autoprefixer": "^10.4.4",
+    "cssnano": "^5.1.7",
+    "esbuild": "^0.14.25",
+    "eslint": "^8.11.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.4.7",
-    "jest-diff": "^27.4.6",
-    "postcss": "^8.4.6",
-    "prettier": "^2.5.1",
-    "prettier-plugin-tailwindcss": "^0.1.7",
-    "rimraf": "^3.0.0"
+    "jest": "^27.5.1",
+    "jest-diff": "^27.5.1",
+    "prettier": "^2.6.0",
+    "prettier-plugin-tailwindcss": "^0.1.8",
+    "rimraf": "^3.0.0",
+    "source-map-js": "^1.0.2"
   },
   "peerDependencies": {
-    "autoprefixer": "^10.0.2",
     "postcss": "^8.0.9"
   },
   "dependencies": {
     "arg": "^5.0.1",
-    "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "cosmiconfig": "^7.0.1",
     "detective": "^5.2.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.11",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
+    "lilconfig": "^2.0.5",
     "normalize-path": "^3.0.0",
-    "object-hash": "^2.2.0",
+    "object-hash": "^3.0.0",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.12",
     "postcss-js": "^4.0.0",
-    "postcss-load-config": "^3.1.0",
+    "postcss-load-config": "^3.1.4",
     "postcss-nested": "5.0.6",
-    "postcss-selector-parser": "^6.0.9",
+    "postcss-selector-parser": "^6.0.10",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
     "resolve": "^1.22.0"