tailwindcss 0.0.0-insiders.8259dfd → 0.0.0-insiders.8293c2d

package/lib/corePlugins.js

@@ -2,22 +2,22 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.variantPlugins = exports.corePlugins = void 0;
+exports.corePlugins = exports.variantPlugins = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var path = _interopRequireWildcard(require("path"));
 var _postcss = _interopRequireDefault(require("postcss"));
 var _createUtilityPlugin = _interopRequireDefault(require("./util/createUtilityPlugin"));
 var _buildMediaQuery = _interopRequireDefault(require("./util/buildMediaQuery"));
-var _prefixSelector = _interopRequireDefault(require("./util/prefixSelector"));
 var _parseAnimationValue = _interopRequireDefault(require("./util/parseAnimationValue"));
 var _flattenColorPalette = _interopRequireDefault(require("./util/flattenColorPalette"));
 var _withAlphaVariable = _interopRequireWildcard(require("./util/withAlphaVariable"));
 var _toColorValue = _interopRequireDefault(require("./util/toColorValue"));
 var _isPlainObject = _interopRequireDefault(require("./util/isPlainObject"));
 var _transformThemeValue = _interopRequireDefault(require("./util/transformThemeValue"));
-var _pluginUtils = require("./util/pluginUtils");
 var _packageJson = require("../package.json");
 var _log = _interopRequireDefault(require("./util/log"));
+var _normalizeScreens = require("./util/normalizeScreens");
+var _parseBoxShadowValue = require("./util/parseBoxShadowValue");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -27,13 +27,11 @@ function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
     } else {
-        var newObj = {
-        };
+        var newObj = {};
         if (obj != null) {
             for(var key in obj){
                 if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {
-                    };
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
                     if (desc.get || desc.set) {
                         Object.defineProperty(newObj, key, desc);
                     } else {
@@ -47,54 +45,21 @@ function _interopRequireWildcard(obj) {
     }
 }
 let variantPlugins = {
-    pseudoElementVariants: ({ config , addVariant  })=>{
-        addVariant('first-letter', (0, _pluginUtils).transformAllSelectors((selector)=>{
-            return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                return withPseudo(`first-letter${config('separator')}${className}`, '::first-letter');
-            });
-        }));
-        addVariant('first-line', (0, _pluginUtils).transformAllSelectors((selector)=>{
-            return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                return withPseudo(`first-line${config('separator')}${className}`, '::first-line');
-            });
-        }));
+    pseudoElementVariants: ({ addVariant  })=>{
+        addVariant('first-letter', '&::first-letter');
+        addVariant('first-line', '&::first-line');
         addVariant('marker', [
-            (0, _pluginUtils).transformAllSelectors((selector)=>{
-                let variantSelector = (0, _pluginUtils).updateAllClasses(selector, (className)=>{
-                    return `marker${config('separator')}${className}`;
-                });
-                return `${variantSelector} *::marker`;
-            }),
-            (0, _pluginUtils).transformAllSelectors((selector)=>{
-                return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                    return withPseudo(`marker${config('separator')}${className}`, '::marker');
-                });
-            }), 
+            '& *::marker',
+            '&::marker'
         ]);
         addVariant('selection', [
-            (0, _pluginUtils).transformAllSelectors((selector)=>{
-                let variantSelector = (0, _pluginUtils).updateAllClasses(selector, (className)=>{
-                    return `selection${config('separator')}${className}`;
-                });
-                return `${variantSelector} *::selection`;
-            }),
-            (0, _pluginUtils).transformAllSelectors((selector)=>{
-                return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                    return withPseudo(`selection${config('separator')}${className}`, '::selection');
-                });
-            }), 
+            '& *::selection',
+            '&::selection'
         ]);
-        addVariant('file', (0, _pluginUtils).transformAllSelectors((selector)=>{
-            return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                return withPseudo(`file${config('separator')}${className}`, '::file-selector-button');
-            });
-        }));
-        addVariant('before', (0, _pluginUtils).transformAllSelectors((selector)=>{
-            return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                return withPseudo(`before${config('separator')}${className}`, '::before');
-            });
-        }, {
-            withRule: (rule)=>{
+        addVariant('file', '&::file-selector-button');
+        addVariant('placeholder', '&::placeholder');
+        addVariant('before', ({ container  })=>{
+            container.walkRules((rule)=>{
                 let foundContent = false;
                 rule.walkDecls('content', ()=>{
                     foundContent = true;
@@ -102,17 +67,14 @@ let variantPlugins = {
                 if (!foundContent) {
                     rule.prepend(_postcss.default.decl({
                         prop: 'content',
-                        value: '""'
+                        value: 'var(--tw-content)'
                     }));
                 }
-            }
-        }));
-        addVariant('after', (0, _pluginUtils).transformAllSelectors((selector)=>{
-            return (0, _pluginUtils).updateAllClasses(selector, (className, { withPseudo  })=>{
-                return withPseudo(`after${config('separator')}${className}`, '::after');
             });
-        }, {
-            withRule: (rule)=>{
+            return '&::before';
+        });
+        addVariant('after', ({ container  })=>{
+            container.walkRules((rule)=>{
                 let foundContent = false;
                 rule.walkDecls('content', ()=>{
                     foundContent = true;
@@ -120,13 +82,14 @@ let variantPlugins = {
                 if (!foundContent) {
                     rule.prepend(_postcss.default.decl({
                         prop: 'content',
-                        value: '""'
+                        value: 'var(--tw-content)'
                     }));
                 }
-            }
-        }));
+            });
+            return '&::after';
+        });
     },
-    pseudoClassVariants: ({ config , addVariant  })=>{
+    pseudoClassVariants: ({ addVariant  })=>{
         let pseudoVariants = [
             // Positional
             [
@@ -180,94 +143,40 @@ let variantPlugins = {
             'focus-visible',
             'active',
             'disabled', 
-        ];
-        for (let variant of pseudoVariants){
-            let [variantName, state] = Array.isArray(variant) ? variant : [
+        ].map((variant)=>Array.isArray(variant) ? variant : [
                 variant,
                 `:${variant}`
-            ];
-            addVariant(variantName, (0, _pluginUtils).transformAllClasses((className, { withAttr , withPseudo  })=>{
-                if (state.startsWith(':')) {
-                    return withPseudo(`${variantName}${config('separator')}${className}`, state);
-                } else if (state.startsWith('[')) {
-                    return withAttr(`${variantName}${config('separator')}${className}`, state);
-                }
-            }));
+            ]
+        );
+        for (let [variantName, state] of pseudoVariants){
+            addVariant(variantName, `&${state}`);
         }
-        let groupMarker = (0, _prefixSelector).default(config('prefix'), '.group');
-        for (let variant1 of pseudoVariants){
-            let [variantName, state] = Array.isArray(variant1) ? variant1 : [
-                variant1,
-                `:${variant1}`
-            ];
-            let groupVariantName = `group-${variantName}`;
-            addVariant(groupVariantName, (0, _pluginUtils).transformAllSelectors((selector)=>{
-                let variantSelector = (0, _pluginUtils).updateAllClasses(selector, (className)=>{
-                    if (`.${className}` === groupMarker) return className;
-                    return `${groupVariantName}${config('separator')}${className}`;
-                });
-                if (variantSelector === selector) {
-                    return null;
-                }
-                return (0, _pluginUtils).applyStateToMarker(variantSelector, groupMarker, state, (marker, selector)=>`${marker} ${selector}`
-                );
-            }));
+        for (let [variantName1, state1] of pseudoVariants){
+            addVariant(`group-${variantName1}`, `:merge(.group)${state1} &`);
         }
-        let peerMarker = (0, _prefixSelector).default(config('prefix'), '.peer');
-        for (let variant2 of pseudoVariants){
-            let [variantName, state] = Array.isArray(variant2) ? variant2 : [
-                variant2,
-                `:${variant2}`
-            ];
-            let peerVariantName = `peer-${variantName}`;
-            addVariant(peerVariantName, (0, _pluginUtils).transformAllSelectors((selector)=>{
-                let variantSelector = (0, _pluginUtils).updateAllClasses(selector, (className)=>{
-                    if (`.${className}` === peerMarker) return className;
-                    return `${peerVariantName}${config('separator')}${className}`;
-                });
-                if (variantSelector === selector) {
-                    return null;
-                }
-                return (0, _pluginUtils).applyStateToMarker(variantSelector, peerMarker, state, (marker, selector)=>selector.trim().startsWith('~') ? `${marker}${selector}` : `${marker} ~ ${selector}`
-                );
-            }));
+        for (let [variantName2, state2] of pseudoVariants){
+            addVariant(`peer-${variantName2}`, `:merge(.peer)${state2} ~ &`);
         }
     },
-    directionVariants: ({ config , addVariant  })=>{
-        addVariant('ltr', (0, _pluginUtils).transformAllSelectors((selector)=>{
+    directionVariants: ({ addVariant  })=>{
+        addVariant('ltr', ()=>{
             _log.default.warn('rtl-experimental', [
                 'The RTL features in Tailwind CSS are currently in preview.',
                 'Preview features are not covered by semver, and may be improved in breaking ways at any time.', 
             ]);
-            return `[dir="ltr"] ${(0, _pluginUtils).updateAllClasses(selector, (className)=>`ltr${config('separator')}${className}`
-            )}`;
-        }));
-        addVariant('rtl', (0, _pluginUtils).transformAllSelectors((selector)=>{
+            return '[dir="ltr"] &';
+        });
+        addVariant('rtl', ()=>{
             _log.default.warn('rtl-experimental', [
                 'The RTL features in Tailwind CSS are currently in preview.',
                 'Preview features are not covered by semver, and may be improved in breaking ways at any time.', 
             ]);
-            return `[dir="rtl"] ${(0, _pluginUtils).updateAllClasses(selector, (className)=>`rtl${config('separator')}${className}`
-            )}`;
-        }));
+            return '[dir="rtl"] &';
+        });
     },
-    reducedMotionVariants: ({ config , addVariant  })=>{
-        addVariant('motion-safe', (0, _pluginUtils).transformLastClasses((className)=>{
-            return `motion-safe${config('separator')}${className}`;
-        }, {
-            wrap: ()=>_postcss.default.atRule({
-                    name: 'media',
-                    params: '(prefers-reduced-motion: no-preference)'
-                })
-        }));
-        addVariant('motion-reduce', (0, _pluginUtils).transformLastClasses((className)=>{
-            return `motion-reduce${config('separator')}${className}`;
-        }, {
-            wrap: ()=>_postcss.default.atRule({
-                    name: 'media',
-                    params: '(prefers-reduced-motion: reduce)'
-                })
-        }));
+    reducedMotionVariants: ({ addVariant  })=>{
+        addVariant('motion-safe', '@media (prefers-reduced-motion: no-preference)');
+        addVariant('motion-reduce', '@media (prefers-reduced-motion: reduce)');
     },
     darkVariants: ({ config , addVariant  })=>{
         let mode = config('darkMode', 'media');
@@ -279,43 +188,56 @@ let variantPlugins = {
             ]);
         }
         if (mode === 'class') {
-            addVariant('dark', (0, _pluginUtils).transformAllSelectors((selector)=>{
-                let variantSelector = (0, _pluginUtils).updateLastClasses(selector, (className)=>{
-                    return `dark${config('separator')}${className}`;
-                });
-                if (variantSelector === selector) {
-                    return null;
-                }
-                let darkSelector = (0, _prefixSelector).default(config('prefix'), `.dark`);
-                return `${darkSelector} ${variantSelector}`;
-            }));
+            addVariant('dark', '.dark &');
         } else if (mode === 'media') {
-            addVariant('dark', (0, _pluginUtils).transformLastClasses((className)=>{
-                return `dark${config('separator')}${className}`;
-            }, {
-                wrap: ()=>_postcss.default.atRule({
-                        name: 'media',
-                        params: '(prefers-color-scheme: dark)'
-                    })
-            }));
+            addVariant('dark', '@media (prefers-color-scheme: dark)');
         }
     },
-    screenVariants: ({ config , theme , addVariant  })=>{
-        for(let screen in theme('screens')){
-            let size = theme('screens')[screen];
-            let query = (0, _buildMediaQuery).default(size);
-            addVariant(screen, (0, _pluginUtils).transformLastClasses((className)=>{
-                return `${screen}${config('separator')}${className}`;
-            }, {
-                wrap: ()=>_postcss.default.atRule({
-                        name: 'media',
-                        params: query
-                    })
-            }));
+    printVariant: ({ addVariant  })=>{
+        addVariant('print', '@media print');
+    },
+    screenVariants: ({ theme , addVariant  })=>{
+        for (let screen of (0, _normalizeScreens).normalizeScreens(theme('screens'))){
+            let query = (0, _buildMediaQuery).default(screen);
+            addVariant(screen.name, `@media ${query}`);
         }
+    },
+    orientationVariants: ({ addVariant  })=>{
+        addVariant('portrait', '@media (orientation: portrait)');
+        addVariant('landscape', '@media (orientation: landscape)');
     }
 };
 exports.variantPlugins = variantPlugins;
+let cssTransformValue = [
+    'translate(var(--tw-translate-x), var(--tw-translate-y))',
+    'rotate(var(--tw-rotate))',
+    'skewX(var(--tw-skew-x))',
+    'skewY(var(--tw-skew-y))',
+    'scaleX(var(--tw-scale-x))',
+    'scaleY(var(--tw-scale-y))', 
+].join(' ');
+let cssFilterValue = [
+    'var(--tw-blur)',
+    'var(--tw-brightness)',
+    'var(--tw-contrast)',
+    'var(--tw-grayscale)',
+    'var(--tw-hue-rotate)',
+    'var(--tw-invert)',
+    'var(--tw-saturate)',
+    'var(--tw-sepia)',
+    'var(--tw-drop-shadow)', 
+].join(' ');
+let cssBackdropFilterValue = [
+    'var(--tw-backdrop-blur)',
+    'var(--tw-backdrop-brightness)',
+    'var(--tw-backdrop-contrast)',
+    'var(--tw-backdrop-grayscale)',
+    'var(--tw-backdrop-hue-rotate)',
+    'var(--tw-backdrop-invert)',
+    'var(--tw-backdrop-opacity)',
+    'var(--tw-backdrop-saturate)',
+    'var(--tw-backdrop-sepia)', 
+].join(' ');
 let corePlugins = {
     preflight: ({ addBase  })=>{
         let preflightStyles = _postcss.default.parse(_fs.default.readFileSync(path.join(__dirname, './css/preflight.css'), 'utf8'));
@@ -327,27 +249,11 @@ let corePlugins = {
         ]);
     },
     container: (()=>{
-        function extractMinWidths(breakpoints) {
-            return Object.values(breakpoints !== null && breakpoints !== void 0 ? breakpoints : {
-            }).flatMap((breakpoints)=>{
-                if (typeof breakpoints === 'string') {
-                    breakpoints = {
-                        min: breakpoints
-                    };
-                }
-                if (!Array.isArray(breakpoints)) {
-                    breakpoints = [
-                        breakpoints
-                    ];
-                }
-                return breakpoints.filter((breakpoint)=>{
-                    var ref;
-                    return (breakpoint === null || breakpoint === void 0 ? void 0 : (ref = breakpoint.hasOwnProperty) === null || ref === void 0 ? void 0 : ref.call(breakpoint, 'min')) || (breakpoint === null || breakpoint === void 0 ? void 0 : breakpoint.hasOwnProperty('min-width'));
-                }).map((breakpoint)=>{
-                    var ref;
-                    return (ref = breakpoint['min-width']) !== null && ref !== void 0 ? ref : breakpoint.min;
-                });
-            });
+        function extractMinWidths(breakpoints = []) {
+            return breakpoints.flatMap((breakpoint1)=>breakpoint1.values.map((breakpoint)=>breakpoint.min
+                )
+            ).filter((v)=>v !== undefined
+            );
         }
         function mapMinWidthsToPadding(minWidths, screens, paddings) {
             if (typeof paddings === 'undefined') {
@@ -371,29 +277,28 @@ let corePlugins = {
                 });
             }
             for (let minWidth of minWidths){
-                for (let [screen, value] of Object.entries(screens)){
-                    let screenMinWidth = typeof value === 'object' && value !== null ? value.min || value['min-width'] : value;
-                    if (`${screenMinWidth}` === `${minWidth}`) {
-                        mapping.push({
-                            screen,
-                            minWidth,
-                            padding: paddings[screen]
-                        });
+                for (let screen of screens){
+                    for (let { min  } of screen.values){
+                        if (min === minWidth) {
+                            mapping.push({
+                                minWidth,
+                                padding: paddings[screen.name]
+                            });
+                        }
                     }
                 }
             }
             return mapping;
         }
         return function({ addComponents , theme  }) {
-            let screens = theme('container.screens', theme('screens'));
+            let screens = (0, _normalizeScreens).normalizeScreens(theme('container.screens', theme('screens')));
             let minWidths = extractMinWidths(screens);
             let paddings = mapMinWidthsToPadding(minWidths, screens, theme('container.padding'));
             let generatePaddingFor = (minWidth)=>{
-                let paddingConfig = paddings.find((padding)=>`${padding.minWidth}` === `${minWidth}`
+                let paddingConfig = paddings.find((padding)=>padding.minWidth === minWidth
                 );
                 if (!paddingConfig) {
-                    return {
-                    };
+                    return {};
                 }
                 return {
                     paddingRight: paddingConfig.padding,
@@ -417,8 +322,7 @@ let corePlugins = {
                     }, theme('container.center', false) ? {
                         marginRight: 'auto',
                         marginLeft: 'auto'
-                    } : {
-                    }, generatePaddingFor(0))
+                    } : {}, generatePaddingFor(0))
                 },
                 ...atRules, 
             ]);
@@ -900,13 +804,12 @@ let corePlugins = {
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-translate-x',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
                 ], 
             ],
@@ -915,13 +818,12 @@ let corePlugins = {
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-translate-y',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
                 ], 
             ], 
@@ -935,16 +837,15 @@ let corePlugins = {
             [
                 [
                     '@defaults transform',
-                    {
-                    }
+                    {}
                 ],
                 '--tw-rotate',
                 [
                     'transform',
-                    'var(--tw-transform)'
+                    cssTransformValue
                 ]
-            ], 
-        ], 
+            ]
+        ]
     ], {
         supportsNegativeValues: true
     }),
@@ -955,30 +856,28 @@ let corePlugins = {
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-skew-x',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
-                ], 
+                ]
             ],
             [
                 'skew-y',
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-skew-y',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
-                ], 
+                ]
             ], 
         ], 
     ], {
@@ -990,14 +889,13 @@ let corePlugins = {
             [
                 [
                     '@defaults transform',
-                    {
-                    }
+                    {}
                 ],
                 '--tw-scale-x',
                 '--tw-scale-y',
                 [
                     'transform',
-                    'var(--tw-transform)'
+                    cssTransformValue
                 ], 
             ], 
         ],
@@ -1007,13 +905,12 @@ let corePlugins = {
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-scale-x',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
                 ], 
             ],
@@ -1022,65 +919,39 @@ let corePlugins = {
                 [
                     [
                         '@defaults transform',
-                        {
-                        }
+                        {}
                     ],
                     '--tw-scale-y',
                     [
                         'transform',
-                        'var(--tw-transform)'
+                        cssTransformValue
                     ]
                 ], 
             ], 
         ], 
-    ]),
-    transform: ({ addBase , addUtilities  })=>{
-        addBase({
-            '@defaults transform': {
-                '--tw-translate-x': '0',
-                '--tw-translate-y': '0',
-                '--tw-rotate': '0',
-                '--tw-skew-x': '0',
-                '--tw-skew-y': '0',
-                '--tw-scale-x': '1',
-                '--tw-scale-y': '1',
-                '--tw-transform': [
-                    'translateX(var(--tw-translate-x))',
-                    'translateY(var(--tw-translate-y))',
-                    'rotate(var(--tw-rotate))',
-                    'skewX(var(--tw-skew-x))',
-                    'skewY(var(--tw-skew-y))',
-                    'scaleX(var(--tw-scale-x))',
-                    'scaleY(var(--tw-scale-y))', 
-                ].join(' ')
-            }
+    ], {
+        supportsNegativeValues: true
+    }),
+    transform: ({ addDefaults , addUtilities  })=>{
+        addDefaults('transform', {
+            '--tw-translate-x': '0',
+            '--tw-translate-y': '0',
+            '--tw-rotate': '0',
+            '--tw-skew-x': '0',
+            '--tw-skew-y': '0',
+            '--tw-scale-x': '1',
+            '--tw-scale-y': '1'
         });
         addUtilities({
             '.transform': {
-                '@defaults transform': {
-                },
-                transform: 'var(--tw-transform)'
+                '@defaults transform': {},
+                transform: cssTransformValue
             },
             '.transform-cpu': {
-                '--tw-transform': [
-                    'translateX(var(--tw-translate-x))',
-                    'translateY(var(--tw-translate-y))',
-                    'rotate(var(--tw-rotate))',
-                    'skewX(var(--tw-skew-x))',
-                    'skewY(var(--tw-skew-y))',
-                    'scaleX(var(--tw-scale-x))',
-                    'scaleY(var(--tw-scale-y))', 
-                ].join(' ')
+                transform: cssTransformValue
             },
             '.transform-gpu': {
-                '--tw-transform': [
-                    'translate3d(var(--tw-translate-x), var(--tw-translate-y), 0)',
-                    'rotate(var(--tw-rotate))',
-                    'skewX(var(--tw-skew-x))',
-                    'skewY(var(--tw-skew-y))',
-                    'scaleX(var(--tw-scale-x))',
-                    'scaleY(var(--tw-scale-y))', 
-                ].join(' ')
+                transform: cssTransformValue.replace('translate(var(--tw-translate-x), var(--tw-translate-y))', 'translate3d(var(--tw-translate-x), var(--tw-translate-y), 0)')
             },
             '.transform-none': {
                 transform: 'none'
@@ -1091,8 +962,7 @@ let corePlugins = {
         let prefixName = (name)=>prefix(`.${name}`).slice(1)
         ;
         var ref;
-        let keyframes = Object.fromEntries(Object.entries((ref = theme('keyframes')) !== null && ref !== void 0 ? ref : {
-        }).map(([key, value])=>{
+        let keyframes = Object.fromEntries(Object.entries((ref = theme('keyframes')) !== null && ref !== void 0 ? ref : {}).map(([key, value])=>{
             return [
                 key,
                 {
@@ -1101,8 +971,8 @@ let corePlugins = {
             ];
         }));
         matchUtilities({
-            animate: (value)=>{
-                let animations = (0, _parseAnimationValue).default(value);
+            animate: (value1)=>{
+                let animations = (0, _parseAnimationValue).default(value1);
                 return [
                     ...animations.flatMap((animation)=>keyframes[animation.name]
                     ),
@@ -1121,7 +991,13 @@ let corePlugins = {
         });
     },
     cursor: (0, _createUtilityPlugin).default('cursor'),
-    touchAction: ({ addUtilities  })=>{
+    touchAction: ({ addDefaults , addUtilities  })=>{
+        addDefaults('touch-action', {
+            '--tw-pan-x': ' ',
+            '--tw-pan-y': ' ',
+            '--tw-pinch-zoom': ' '
+        });
+        let cssTouchActionValue = 'var(--tw-pan-x) var(--tw-pan-y) var(--tw-pinch-zoom)';
         addUtilities({
             '.touch-auto': {
                 'touch-action': 'auto'
@@ -1130,25 +1006,39 @@ let corePlugins = {
                 'touch-action': 'none'
             },
             '.touch-pan-x': {
-                'touch-action': 'pan-x'
+                '@defaults touch-action': {},
+                '--tw-pan-x': 'pan-x',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pan-left': {
-                'touch-action': 'pan-left'
+                '@defaults touch-action': {},
+                '--tw-pan-x': 'pan-left',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pan-right': {
-                'touch-action': 'pan-right'
+                '@defaults touch-action': {},
+                '--tw-pan-x': 'pan-right',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pan-y': {
-                'touch-action': 'pan-y'
+                '@defaults touch-action': {},
+                '--tw-pan-y': 'pan-y',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pan-up': {
-                'touch-action': 'pan-up'
+                '@defaults touch-action': {},
+                '--tw-pan-y': 'pan-up',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pan-down': {
-                'touch-action': 'pan-down'
+                '@defaults touch-action': {},
+                '--tw-pan-y': 'pan-down',
+                'touch-action': cssTouchActionValue
             },
             '.touch-pinch-zoom': {
-                'touch-action': 'pinch-zoom'
+                '@defaults touch-action': {},
+                '--tw-pinch-zoom': 'pinch-zoom',
+                'touch-action': cssTouchActionValue
             },
             '.touch-manipulation': {
                 'touch-action': 'manipulation'
@@ -1187,29 +1077,24 @@ let corePlugins = {
             }
         });
     },
-    scrollSnapType: ({ addUtilities , addBase  })=>{
-        addBase({
-            '@defaults scroll-snap-type': {
-                '--tw-scroll-snap-strictness': 'proximity'
-            }
+    scrollSnapType: ({ addDefaults , addUtilities  })=>{
+        addDefaults('scroll-snap-type', {
+            '--tw-scroll-snap-strictness': 'proximity'
         });
         addUtilities({
             '.snap-none': {
                 'scroll-snap-type': 'none'
             },
             '.snap-x': {
-                '@defaults scroll-snap-type': {
-                },
+                '@defaults scroll-snap-type': {},
                 'scroll-snap-type': 'x var(--tw-scroll-snap-strictness)'
             },
             '.snap-y': {
-                '@defaults scroll-snap-type': {
-                },
+                '@defaults scroll-snap-type': {},
                 'scroll-snap-type': 'y var(--tw-scroll-snap-strictness)'
             },
             '.snap-both': {
-                '@defaults scroll-snap-type': {
-                },
+                '@defaults scroll-snap-type': {},
                 'scroll-snap-type': 'both var(--tw-scroll-snap-strictness)'
             },
             '.snap-mandatory': {
@@ -1713,8 +1598,7 @@ let corePlugins = {
                 value = value === '0' ? '0px' : value;
                 return {
                     '& > :not([hidden]) ~ :not([hidden])': {
-                        '@defaults border-width': {
-                        },
+                        '@defaults border-width': {},
                         '--tw-divide-x-reverse': '0',
                         'border-right-width': `calc(${value} * var(--tw-divide-x-reverse))`,
                         'border-left-width': `calc(${value} * calc(1 - var(--tw-divide-x-reverse)))`
@@ -1725,8 +1609,7 @@ let corePlugins = {
                 value = value === '0' ? '0px' : value;
                 return {
                     '& > :not([hidden]) ~ :not([hidden])': {
-                        '@defaults border-width': {
-                        },
+                        '@defaults border-width': {},
                         '--tw-divide-y-reverse': '0',
                         'border-top-width': `calc(${value} * calc(1 - var(--tw-divide-y-reverse)))`,
                         'border-bottom-width': `calc(${value} * var(--tw-divide-y-reverse))`
@@ -1742,13 +1625,11 @@ let corePlugins = {
         });
         addUtilities({
             '.divide-y-reverse > :not([hidden]) ~ :not([hidden])': {
-                '@defaults border-width': {
-                },
+                '@defaults border-width': {},
                 '--tw-divide-y-reverse': '1'
             },
             '.divide-x-reverse > :not([hidden]) ~ :not([hidden])': {
-                '@defaults border-width': {
-                },
+                '@defaults border-width': {},
                 '--tw-divide-x-reverse': '1'
             }
         });
@@ -1772,10 +1653,10 @@ let corePlugins = {
             }
         });
     },
-    divideColor: ({ matchUtilities , theme , corePlugins  })=>{
+    divideColor: ({ matchUtilities , theme , corePlugins: corePlugins1  })=>{
         matchUtilities({
             divide: (value)=>{
-                if (!corePlugins('divideOpacity')) {
+                if (!corePlugins1('divideOpacity')) {
                     return {
                         ['& > :not([hidden]) ~ :not([hidden])']: {
                             'border-color': (0, _toColorValue).default(value)
@@ -2080,8 +1961,7 @@ let corePlugins = {
             [
                 [
                     '@defaults border-width',
-                    {
-                    }
+                    {}
                 ],
                 'border-width'
             ]
@@ -2092,8 +1972,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-left-width',
                     'border-right-width'
@@ -2104,8 +1983,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-top-width',
                     'border-bottom-width'
@@ -2118,8 +1996,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-top-width'
                 ]
@@ -2129,8 +2006,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-right-width'
                 ]
@@ -2140,8 +2016,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-bottom-width'
                 ]
@@ -2151,8 +2026,7 @@ let corePlugins = {
                 [
                     [
                         '@defaults border-width',
-                        {
-                        }
+                        {}
                     ],
                     'border-left-width'
                 ]
@@ -2186,26 +2060,10 @@ let corePlugins = {
             }
         });
     },
-    borderColor: ({ addBase , matchUtilities , theme , corePlugins  })=>{
-        if (!corePlugins('borderOpacity')) {
-            let value = theme('borderColor.DEFAULT', 'currentColor');
-            addBase({
-                '@defaults border-width': {
-                    'border-color': (0, _toColorValue).default(value)
-                }
-            });
-        } else {
-            addBase({
-                '@defaults border-width': (0, _withAlphaVariable).default({
-                    color: theme('borderColor.DEFAULT', 'currentColor'),
-                    property: 'border-color',
-                    variable: '--tw-border-opacity'
-                })
-            });
-        }
+    borderColor: ({ matchUtilities , theme , corePlugins: corePlugins2  })=>{
         matchUtilities({
             border: (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-color': (0, _toColorValue).default(value)
                     };
@@ -2225,7 +2083,7 @@ let corePlugins = {
         });
         matchUtilities({
             'border-x': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-left-color': (0, _toColorValue).default(value),
                         'border-right-color': (0, _toColorValue).default(value)
@@ -2241,7 +2099,7 @@ let corePlugins = {
                 });
             },
             'border-y': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-top-color': (0, _toColorValue).default(value),
                         'border-bottom-color': (0, _toColorValue).default(value)
@@ -2263,7 +2121,7 @@ let corePlugins = {
         });
         matchUtilities({
             'border-t': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-top-color': (0, _toColorValue).default(value)
                     };
@@ -2275,7 +2133,7 @@ let corePlugins = {
                 });
             },
             'border-r': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-right-color': (0, _toColorValue).default(value)
                     };
@@ -2287,7 +2145,7 @@ let corePlugins = {
                 });
             },
             'border-b': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-bottom-color': (0, _toColorValue).default(value)
                     };
@@ -2299,7 +2157,7 @@ let corePlugins = {
                 });
             },
             'border-l': (value)=>{
-                if (!corePlugins('borderOpacity')) {
+                if (!corePlugins2('borderOpacity')) {
                     return {
                         'border-left-color': (0, _toColorValue).default(value)
                     };
@@ -2324,10 +2182,10 @@ let corePlugins = {
             ]
         ], 
     ]),
-    backgroundColor: ({ matchUtilities , theme , corePlugins  })=>{
+    backgroundColor: ({ matchUtilities , theme , corePlugins: corePlugins3  })=>{
         matchUtilities({
             bg: (value)=>{
-                if (!corePlugins('backgroundOpacity')) {
+                if (!corePlugins3('backgroundOpacity')) {
                     return {
                         'background-color': (0, _toColorValue).default(value)
                     };
@@ -2408,6 +2266,12 @@ let corePlugins = {
             },
             '.decoration-clone': {
                 'box-decoration-break': 'clone'
+            },
+            '.box-decoration-slice': {
+                'box-decoration-break': 'slice'
+            },
+            '.box-decoration-clone': {
+                'box-decoration-break': 'clone'
             }
         });
     },
@@ -2707,12 +2571,10 @@ let corePlugins = {
                 };
                 return {
                     'font-size': fontSize,
-                    ...lineHeight === undefined ? {
-                    } : {
+                    ...lineHeight === undefined ? {} : {
                         'line-height': lineHeight
                     },
-                    ...letterSpacing === undefined ? {
-                    } : {
+                    ...letterSpacing === undefined ? {} : {
                         'letter-spacing': letterSpacing
                     }
                 };
@@ -2766,42 +2628,58 @@ let corePlugins = {
             }
         });
     },
-    fontVariantNumeric: ({ addUtilities  })=>{
+    fontVariantNumeric: ({ addDefaults , addUtilities  })=>{
+        let cssFontVariantNumericValue = 'var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction)';
+        addDefaults('font-variant-numeric', {
+            '--tw-ordinal': ' ',
+            '--tw-slashed-zero': ' ',
+            '--tw-numeric-figure': ' ',
+            '--tw-numeric-spacing': ' ',
+            '--tw-numeric-fraction': ' '
+        });
         addUtilities({
-            '.ordinal, .slashed-zero, .lining-nums, .oldstyle-nums, .proportional-nums, .tabular-nums, .diagonal-fractions, .stacked-fractions': {
-                '--tw-ordinal': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-slashed-zero': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-numeric-figure': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-numeric-spacing': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-numeric-fraction': 'var(--tw-empty,/*!*/ /*!*/)',
-                'font-variant-numeric': 'var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction)'
-            },
             '.normal-nums': {
                 'font-variant-numeric': 'normal'
             },
             '.ordinal': {
-                '--tw-ordinal': 'ordinal'
+                '@defaults font-variant-numeric': {},
+                '--tw-ordinal': 'ordinal',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.slashed-zero': {
-                '--tw-slashed-zero': 'slashed-zero'
+                '@defaults font-variant-numeric': {},
+                '--tw-slashed-zero': 'slashed-zero',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.lining-nums': {
-                '--tw-numeric-figure': 'lining-nums'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-figure': 'lining-nums',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.oldstyle-nums': {
-                '--tw-numeric-figure': 'oldstyle-nums'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-figure': 'oldstyle-nums',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.proportional-nums': {
-                '--tw-numeric-spacing': 'proportional-nums'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-spacing': 'proportional-nums',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.tabular-nums': {
-                '--tw-numeric-spacing': 'tabular-nums'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-spacing': 'tabular-nums',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.diagonal-fractions': {
-                '--tw-numeric-fraction': 'diagonal-fractions'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-fraction': 'diagonal-fractions',
+                'font-variant-numeric': cssFontVariantNumericValue
             },
             '.stacked-fractions': {
-                '--tw-numeric-fraction': 'stacked-fractions'
+                '@defaults font-variant-numeric': {},
+                '--tw-numeric-fraction': 'stacked-fractions',
+                'font-variant-numeric': cssFontVariantNumericValue
             }
         });
     },
@@ -2823,10 +2701,10 @@ let corePlugins = {
     ], {
         supportsNegativeValues: true
     }),
-    textColor: ({ matchUtilities , theme , corePlugins  })=>{
+    textColor: ({ matchUtilities , theme , corePlugins: corePlugins4  })=>{
         matchUtilities({
             text: (value)=>{
-                if (!corePlugins('textOpacity')) {
+                if (!corePlugins4('textOpacity')) {
                     return {
                         color: (0, _toColorValue).default(value)
                     };
@@ -2853,13 +2731,16 @@ let corePlugins = {
     textDecoration: ({ addUtilities  })=>{
         addUtilities({
             '.underline': {
-                'text-decoration': 'underline'
+                'text-decoration-line': 'underline'
+            },
+            '.overline': {
+                'text-decoration-line': 'overline'
             },
             '.line-through': {
-                'text-decoration': 'line-through'
+                'text-decoration-line': 'line-through'
             },
             '.no-underline': {
-                'text-decoration': 'none'
+                'text-decoration-line': 'none'
             }
         });
     },
@@ -2873,11 +2754,55 @@ let corePlugins = {
         }, {
             values: (0, _flattenColorPalette).default(theme('textDecorationColor')),
             type: [
-                'color',
-                'any'
+                'color'
             ]
         });
     },
+    textDecorationStyle: ({ addUtilities  })=>{
+        addUtilities({
+            '.decoration-solid': {
+                'text-decoration-style': 'solid'
+            },
+            '.decoration-double': {
+                'text-decoration-style': 'double'
+            },
+            '.decoration-dotted': {
+                'text-decoration-style': 'dotted'
+            },
+            '.decoration-dashed': {
+                'text-decoration-style': 'dashed'
+            },
+            '.decoration-wavy': {
+                'text-decoration-style': 'wavy'
+            }
+        });
+    },
+    textDecorationThickness: (0, _createUtilityPlugin).default('textDecorationThickness', [
+        [
+            'decoration',
+            [
+                'text-decoration-thickness'
+            ]
+        ]
+    ], {
+        type: [
+            'length',
+            'percentage'
+        ]
+    }),
+    textUnderlineOffset: (0, _createUtilityPlugin).default('textUnderlineOffset', [
+        [
+            'underline-offset',
+            [
+                'text-underline-offset'
+            ]
+        ]
+    ], {
+        type: [
+            'length',
+            'percentage'
+        ]
+    }),
     fontSmoothing: ({ addUtilities  })=>{
         addUtilities({
             '.antialiased': {
@@ -2890,10 +2815,10 @@ let corePlugins = {
             }
         });
     },
-    placeholderColor: ({ matchUtilities , theme , corePlugins  })=>{
+    placeholderColor: ({ matchUtilities , theme , corePlugins: corePlugins5  })=>{
         matchUtilities({
             placeholder: (value)=>{
-                if (!corePlugins('placeholderOpacity')) {
+                if (!corePlugins5('placeholderOpacity')) {
                     return {
                         '&::placeholder': {
                             color: (0, _toColorValue).default(value)
@@ -3078,64 +3003,136 @@ let corePlugins = {
             `var(--tw-ring-shadow, 0 0 #0000)`,
             `var(--tw-shadow)`, 
         ].join(', ');
-        return function({ matchUtilities , addBase , theme  }) {
-            addBase({
-                '@defaults box-shadow': {
-                    '--tw-ring-offset-shadow': '0 0 #0000',
-                    '--tw-ring-shadow': '0 0 #0000',
-                    '--tw-shadow': '0 0 #0000'
-                }
+        return function({ matchUtilities , addDefaults , theme  }) {
+            addDefaults(' box-shadow', {
+                '--tw-ring-offset-shadow': '0 0 #0000',
+                '--tw-ring-shadow': '0 0 #0000',
+                '--tw-shadow': '0 0 #0000',
+                '--tw-shadow-colored': '0 0 #0000'
             });
             matchUtilities({
                 shadow: (value)=>{
                     value = transformValue(value);
+                    let ast = (0, _parseBoxShadowValue).parseBoxShadowValue(value);
+                    for (let shadow of ast){
+                        // Don't override color if the whole shadow is a variable
+                        if (!shadow.valid) {
+                            continue;
+                        }
+                        shadow.color = 'var(--tw-shadow-color)';
+                    }
                     return {
-                        '@defaults box-shadow': {
-                        },
+                        '@defaults box-shadow': {},
                         '--tw-shadow': value === 'none' ? '0 0 #0000' : value,
+                        '--tw-shadow-colored': value === 'none' ? '0 0 #0000' : (0, _parseBoxShadowValue).formatBoxShadowValue(ast),
                         'box-shadow': defaultBoxShadow
                     };
                 }
             }, {
-                values: theme('boxShadow')
+                values: theme('boxShadow'),
+                type: [
+                    'shadow'
+                ]
             });
         };
     })(),
-    outline: ({ matchUtilities , theme  })=>{
+    boxShadowColor: ({ matchUtilities , theme  })=>{
+        matchUtilities({
+            shadow: (value)=>{
+                return {
+                    '--tw-shadow-color': (0, _toColorValue).default(value),
+                    '--tw-shadow': 'var(--tw-shadow-colored)'
+                };
+            }
+        }, {
+            values: (0, _flattenColorPalette).default(theme('boxShadowColor')),
+            type: [
+                'color'
+            ]
+        });
+    },
+    outlineStyle: ({ addUtilities  })=>{
+        addUtilities({
+            '.outline-none': {
+                outline: '2px solid transparent',
+                'outline-offset': '2px'
+            },
+            '.outline': {
+                'outline-style': 'solid'
+            },
+            '.outline-dashed': {
+                'outline-style': 'dashed'
+            },
+            '.outline-dotted': {
+                'outline-style': 'dotted'
+            },
+            '.outline-double': {
+                'outline-style': 'double'
+            },
+            '.outline-hidden': {
+                'outline-style': 'hidden'
+            }
+        });
+    },
+    outlineWidth: (0, _createUtilityPlugin).default('outlineWidth', [
+        [
+            'outline',
+            [
+                'outline-width'
+            ]
+        ]
+    ], {
+        type: [
+            'length',
+            'number',
+            'percentage'
+        ]
+    }),
+    outlineOffset: (0, _createUtilityPlugin).default('outlineOffset', [
+        [
+            'outline-offset',
+            [
+                'outline-offset'
+            ]
+        ]
+    ], {
+        type: [
+            'length',
+            'number',
+            'percentage'
+        ]
+    }),
+    outlineColor: ({ matchUtilities , theme  })=>{
         matchUtilities({
             outline: (value)=>{
-                value = Array.isArray(value) ? value : value.split(',');
-                let [outline, outlineOffset = '0'] = Array.isArray(value) ? value : [
-                    value
-                ];
                 return {
-                    outline,
-                    'outline-offset': outlineOffset
+                    'outline-color': (0, _toColorValue).default(value)
                 };
             }
         }, {
-            values: theme('outline')
+            values: (0, _flattenColorPalette).default(theme('outlineColor')),
+            type: [
+                'color'
+            ]
         });
     },
-    ringWidth: ({ matchUtilities , addBase , addUtilities , theme  })=>{
+    ringWidth: ({ matchUtilities , addDefaults , addUtilities , theme  })=>{
         let ringOpacityDefault = theme('ringOpacity.DEFAULT', '0.5');
         let ringColorDefault = (0, _withAlphaVariable).withAlphaValue(theme('ringColor.DEFAULT'), ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})`);
-        addBase({
-            '@defaults ring-width': {
-                '--tw-ring-inset': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-ring-offset-width': theme('ringOffsetWidth.DEFAULT', '0px'),
-                '--tw-ring-offset-color': theme('ringOffsetColor.DEFAULT', '#fff'),
-                '--tw-ring-color': ringColorDefault,
-                '--tw-ring-offset-shadow': '0 0 #0000',
-                '--tw-ring-shadow': '0 0 #0000',
-                '--tw-shadow': '0 0 #0000'
-            }
+        addDefaults('ring-width', {
+            '--tw-ring-inset': ' ',
+            '--tw-ring-offset-width': theme('ringOffsetWidth.DEFAULT', '0px'),
+            '--tw-ring-offset-color': theme('ringOffsetColor.DEFAULT', '#fff'),
+            '--tw-ring-color': ringColorDefault,
+            '--tw-ring-offset-shadow': '0 0 #0000',
+            '--tw-ring-shadow': '0 0 #0000',
+            '--tw-shadow': '0 0 #0000',
+            '--tw-shadow-colored': '0 0 #0000'
         });
         matchUtilities({
             ring: (value)=>{
                 return {
-                    '@defaults ring-width': {
-                    },
+                    '@defaults ring-width': {},
                     '--tw-ring-offset-shadow': `var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)`,
                     '--tw-ring-shadow': `var(--tw-ring-inset) 0 0 0 calc(${value} + var(--tw-ring-offset-width)) var(--tw-ring-color)`,
                     'box-shadow': [
@@ -3151,8 +3148,7 @@ let corePlugins = {
         });
         addUtilities({
             '.ring-inset': {
-                '@defaults ring-width': {
-                },
+                '@defaults ring-width': {},
                 '--tw-ring-inset': 'inset'
             }
         });
@@ -3209,9 +3205,8 @@ let corePlugins = {
             blur: (value)=>{
                 return {
                     '--tw-blur': `blur(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3223,9 +3218,8 @@ let corePlugins = {
             brightness: (value)=>{
                 return {
                     '--tw-brightness': `brightness(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3237,9 +3231,8 @@ let corePlugins = {
             contrast: (value)=>{
                 return {
                     '--tw-contrast': `contrast(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3252,9 +3245,8 @@ let corePlugins = {
                 return {
                     '--tw-drop-shadow': Array.isArray(value) ? value.map((v)=>`drop-shadow(${v})`
                     ).join(' ') : `drop-shadow(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3266,9 +3258,8 @@ let corePlugins = {
             grayscale: (value)=>{
                 return {
                     '--tw-grayscale': `grayscale(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3280,9 +3271,8 @@ let corePlugins = {
             'hue-rotate': (value)=>{
                 return {
                     '--tw-hue-rotate': `hue-rotate(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3295,9 +3285,8 @@ let corePlugins = {
             invert: (value)=>{
                 return {
                     '--tw-invert': `invert(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3309,9 +3298,8 @@ let corePlugins = {
             saturate: (value)=>{
                 return {
                     '--tw-saturate': `saturate(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
@@ -3323,45 +3311,30 @@ let corePlugins = {
             sepia: (value)=>{
                 return {
                     '--tw-sepia': `sepia(${value})`,
-                    '@defaults filter': {
-                    },
-                    filter: 'var(--tw-filter)'
+                    '@defaults filter': {},
+                    filter: cssFilterValue
                 };
             }
         }, {
             values: theme('sepia')
         });
     },
-    filter: ({ addBase , addUtilities  })=>{
-        addBase({
-            '@defaults filter': {
-                '--tw-blur': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-brightness': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-contrast': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-grayscale': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-hue-rotate': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-invert': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-saturate': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-sepia': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-drop-shadow': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-filter': [
-                    'var(--tw-blur)',
-                    'var(--tw-brightness)',
-                    'var(--tw-contrast)',
-                    'var(--tw-grayscale)',
-                    'var(--tw-hue-rotate)',
-                    'var(--tw-invert)',
-                    'var(--tw-saturate)',
-                    'var(--tw-sepia)',
-                    'var(--tw-drop-shadow)', 
-                ].join(' ')
-            }
+    filter: ({ addDefaults , addUtilities  })=>{
+        addDefaults('filter', {
+            '--tw-blur': ' ',
+            '--tw-brightness': ' ',
+            '--tw-contrast': ' ',
+            '--tw-grayscale': ' ',
+            '--tw-hue-rotate': ' ',
+            '--tw-invert': ' ',
+            '--tw-saturate': ' ',
+            '--tw-sepia': ' ',
+            '--tw-drop-shadow': ' '
         });
         addUtilities({
             '.filter': {
-                '@defaults filter': {
-                },
-                filter: 'var(--tw-filter)'
+                '@defaults filter': {},
+                filter: cssFilterValue
             },
             '.filter-none': {
                 filter: 'none'
@@ -3373,9 +3346,8 @@ let corePlugins = {
             'backdrop-blur': (value)=>{
                 return {
                     '--tw-backdrop-blur': `blur(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3387,9 +3359,8 @@ let corePlugins = {
             'backdrop-brightness': (value)=>{
                 return {
                     '--tw-backdrop-brightness': `brightness(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3401,9 +3372,8 @@ let corePlugins = {
             'backdrop-contrast': (value)=>{
                 return {
                     '--tw-backdrop-contrast': `contrast(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3415,9 +3385,8 @@ let corePlugins = {
             'backdrop-grayscale': (value)=>{
                 return {
                     '--tw-backdrop-grayscale': `grayscale(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3429,9 +3398,8 @@ let corePlugins = {
             'backdrop-hue-rotate': (value)=>{
                 return {
                     '--tw-backdrop-hue-rotate': `hue-rotate(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3444,9 +3412,8 @@ let corePlugins = {
             'backdrop-invert': (value)=>{
                 return {
                     '--tw-backdrop-invert': `invert(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3458,9 +3425,8 @@ let corePlugins = {
             'backdrop-opacity': (value)=>{
                 return {
                     '--tw-backdrop-opacity': `opacity(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3472,9 +3438,8 @@ let corePlugins = {
             'backdrop-saturate': (value)=>{
                 return {
                     '--tw-backdrop-saturate': `saturate(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
@@ -3486,45 +3451,30 @@ let corePlugins = {
             'backdrop-sepia': (value)=>{
                 return {
                     '--tw-backdrop-sepia': `sepia(${value})`,
-                    '@defaults backdrop-filter': {
-                    },
-                    'backdrop-filter': 'var(--tw-backdrop-filter)'
+                    '@defaults backdrop-filter': {},
+                    'backdrop-filter': cssBackdropFilterValue
                 };
             }
         }, {
             values: theme('backdropSepia')
         });
     },
-    backdropFilter: ({ addBase , addUtilities  })=>{
-        addBase({
-            '@defaults backdrop-filter': {
-                '--tw-backdrop-blur': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-brightness': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-contrast': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-grayscale': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-hue-rotate': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-invert': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-opacity': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-saturate': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-sepia': 'var(--tw-empty,/*!*/ /*!*/)',
-                '--tw-backdrop-filter': [
-                    'var(--tw-backdrop-blur)',
-                    'var(--tw-backdrop-brightness)',
-                    'var(--tw-backdrop-contrast)',
-                    'var(--tw-backdrop-grayscale)',
-                    'var(--tw-backdrop-hue-rotate)',
-                    'var(--tw-backdrop-invert)',
-                    'var(--tw-backdrop-opacity)',
-                    'var(--tw-backdrop-saturate)',
-                    'var(--tw-backdrop-sepia)', 
-                ].join(' ')
-            }
+    backdropFilter: ({ addDefaults , addUtilities  })=>{
+        addDefaults('backdrop-filter', {
+            '--tw-backdrop-blur': ' ',
+            '--tw-backdrop-brightness': ' ',
+            '--tw-backdrop-contrast': ' ',
+            '--tw-backdrop-grayscale': ' ',
+            '--tw-backdrop-hue-rotate': ' ',
+            '--tw-backdrop-invert': ' ',
+            '--tw-backdrop-opacity': ' ',
+            '--tw-backdrop-saturate': ' ',
+            '--tw-backdrop-sepia': ' '
         });
         addUtilities({
             '.backdrop-filter': {
-                '@defaults backdrop-filter': {
-                },
-                'backdrop-filter': 'var(--tw-backdrop-filter)'
+                '@defaults backdrop-filter': {},
+                'backdrop-filter': cssBackdropFilterValue
             },
             '.backdrop-filter-none': {
                 'backdrop-filter': 'none'
@@ -3538,8 +3488,7 @@ let corePlugins = {
             transition: (value)=>{
                 return {
                     'transition-property': value,
-                    ...value === 'none' ? {
-                    } : {
+                    ...value === 'none' ? {} : {
                         'transition-timing-function': defaultTimingFunction,
                         'transition-duration': defaultDuration
                     }
@@ -3585,6 +3534,17 @@ let corePlugins = {
             ]
         ]
     ]),
-    content: (0, _createUtilityPlugin).default('content')
+    content: (0, _createUtilityPlugin).default('content', [
+        [
+            'content',
+            [
+                '--tw-content',
+                [
+                    'content',
+                    'var(--tw-content)'
+                ]
+            ]
+        ], 
+    ])
 };
 exports.corePlugins = corePlugins;