tailwindcss 0.0.0-insiders.ea6f14a → 0.0.0-insiders.ec1f7b0

package/CHANGELOG.md

@@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix CLI `--content` option ([#5775](https://github.com/tailwindlabs/tailwindcss/pull/5775))
 - Fix before/after utilities overriding custom content values at larger breakpoints ([#5820](https://github.com/tailwindlabs/tailwindcss/pull/5820))
 - Cleanup duplicate properties ([#5830](https://github.com/tailwindlabs/tailwindcss/pull/5830))
+- Allow `_` inside `url()` when using arbitrary values ([#5853](https://github.com/tailwindlabs/tailwindcss/pull/5853))
+- Prevent crashes when using comments in `@layer` AtRules ([#5854](https://github.com/tailwindlabs/tailwindcss/pull/5854))
+- Handle color transformations properly with `theme(...)` for all relevant plugins ([#4533](https://github.com/tailwindlabs/tailwindcss/pull/4533), [#5871](https://github.com/tailwindlabs/tailwindcss/pull/5871))
 
 ## [3.0.0-alpha.1] - 2021-10-01
 
@@ -70,6 +73,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix using negated `content` globs ([#5625](https://github.com/tailwindlabs/tailwindcss/pull/5625))
 - Fix using backslashes in `content` globs ([#5628](https://github.com/tailwindlabs/tailwindcss/pull/5628))
 
+## [2.2.19] - 2021-10-29
+
+### Fixed
+
+- Ensure `corePlugins`  order is consisent in AOT mode ([#5928](https://github.com/tailwindlabs/tailwindcss/pull/5928))
+
+## [2.2.18] - 2021-10-29
+
+### Fixed
+
+- Bump versions for security vulnerabilities ([#5924](https://github.com/tailwindlabs/tailwindcss/pull/5924))
+
+## [2.2.17] - 2021-10-13
+
+### Fixed
+
+- Configure chokidar's `awaitWriteFinish` setting to avoid occasional stale builds on Windows ([#5758](https://github.com/tailwindlabs/tailwindcss/pull/5758))
+
 ## [2.2.16] - 2021-09-26
 
 ### Fixed
@@ -1629,7 +1650,10 @@ No release notes
 - Everything!
 
 [unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.0-alpha.1...HEAD
-[3.0.0-alpha.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.16...v3.0.0-alpha.1
+[3.0.0-alpha.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.19...v3.0.0-alpha.1
+[2.2.19]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.18...v2.2.19
+[2.2.18]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.17...v2.2.18
+[2.2.17]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.16...v2.2.17
 [2.2.16]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.15...v2.2.16
 [2.2.15]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15
 [2.2.14]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.13...v2.2.14

package/lib/cli.js

@@ -22,7 +22,7 @@ function _interopRequireDefault(obj) {
     };
 }
 let env = {
-    DEBUG: process.env.DEBUG !== undefined
+    DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0'
 };
 // ---
 function indentRecursive(node, indent = 0) {

package/lib/corePluginList.js

@@ -135,7 +135,10 @@ var _default = [
     "backgroundBlendMode",
     "mixBlendMode",
     "boxShadow",
-    "outline",
+    "outlineStyle",
+    "outlineWidth",
+    "outlineOffset",
+    "outlineColor",
     "ringWidth",
     "ringColor",
     "ringOpacity",

package/lib/corePlugins.js

@@ -192,6 +192,9 @@ let variantPlugins = {
             addVariant('dark', '@media (prefers-color-scheme: dark)');
         }
     },
+    printVariant: ({ addVariant  })=>{
+        addVariant('print', '@media print');
+    },
     screenVariants: ({ theme , addVariant  })=>{
         for(let screen in theme('screens')){
             let size = theme('screens')[screen];
@@ -3010,20 +3013,69 @@ let corePlugins = {
             });
         };
     })(),
-    outline: ({ matchUtilities , theme  })=>{
+    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  })=>{

package/lib/lib/expandTailwindAtRules.js

@@ -42,6 +42,8 @@ const PATTERNS = [
     /([^<>"'`\s]*\[\w*"[^"`\s]*"?\])/.source,
     /([^<>"'`\s]*\[\w*\('[^"'`\s]*'\)\])/.source,
     /([^<>"'`\s]*\[\w*\("[^"'`\s]*"\)\])/.source,
+    /([^<>"'`\s]*\[\w*\('[^"`\s]*'\)\])/.source,
+    /([^<>"'`\s]*\[\w*\("[^'`\s]*"\)\])/.source,
     /([^<>"'`\s]*\['[^"'`\s]*'\])/.source,
     /([^<>"'`\s]*\["[^"'`\s]*"\])/.source,
     /([^<>"'`\s]*\[[^"'`\s]+\][^<>"'`\s]*)/.source,

package/lib/lib/generateRules.js

@@ -444,15 +444,28 @@ function generateRules(candidates, context) {
         context.classCache.set(candidate, matches);
         allRules.push(matches);
     }
-    return allRules.flat(1).map(([{ sort , layer , options  }, rule])=>{
-        if (options.respectImportant) {
-            if (context.tailwindConfig.important === true) {
+    // Strategy based on `tailwindConfig.important`
+    let strategy = ((important)=>{
+        if (important === true) {
+            return (rule)=>{
                 rule.walkDecls((d)=>{
                     if (d.parent.type === 'rule' && !inKeyframes(d.parent)) {
                         d.important = true;
                     }
                 });
-            } else if (typeof context.tailwindConfig.important === 'string') {
+            };
+        }
+        if (typeof important === 'string') {
+            return (rule)=>{
+                rule.selectors = rule.selectors.map((selector)=>{
+                    return `${important} ${selector}`;
+                });
+            };
+        }
+    })(context.tailwindConfig.important);
+    return allRules.flat(1).map(([{ sort , layer , options  }, rule])=>{
+        if (options.respectImportant) {
+            if (strategy) {
                 let container = _postcss.default.root({
                     nodes: [
                         rule.clone()
@@ -462,9 +475,7 @@ function generateRules(candidates, context) {
                     if (inKeyframes(r)) {
                         return;
                     }
-                    r.selectors = r.selectors.map((selector)=>{
-                        return `${context.tailwindConfig.important} ${selector}`;
-                    });
+                    strategy(r);
                 });
                 rule = container.nodes[0];
             }

package/lib/lib/setupContextUtils.js

@@ -258,7 +258,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                         return ({ format  })=>format(str)
                         ;
                     }
-                    let [, name, params] = /@(.*?) (\(.*\))/g.exec(str);
+                    let [, name, params] = /@(.*?) (.*)/g.exec(str);
                     return ({ wrap  })=>wrap(_postcss.default.atRule({
                             name,
                             params
@@ -607,6 +607,7 @@ function resolvePlugins(context, root) {
         _corePlugins.variantPlugins['directionVariants'],
         _corePlugins.variantPlugins['reducedMotionVariants'],
         _corePlugins.variantPlugins['darkVariants'],
+        _corePlugins.variantPlugins['printVariant'],
         _corePlugins.variantPlugins['screenVariants'], 
     ];
     return [

package/lib/lib/sharedState.js

@@ -6,7 +6,7 @@ exports.contextSourcesMap = exports.configContextMap = exports.env = exports.con
 const env = {
     TAILWIND_MODE: process.env.TAILWIND_MODE,
     NODE_ENV: process.env.NODE_ENV,
-    DEBUG: process.env.DEBUG !== undefined,
+    DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0',
     TAILWIND_DISABLE_TOUCH: process.env.TAILWIND_DISABLE_TOUCH !== undefined,
     TAILWIND_TOUCH_DIR: process.env.TAILWIND_TOUCH_DIR
 };

package/lib/util/dataTypes.js

@@ -22,14 +22,23 @@ let COMMA = /,(?![^(]*\))/g // Comma separator that is not located between brack
 ;
 let UNDERSCORE = /_(?![^(]*\))/g // Underscore separator that is not located between brackets. E.g.: `rgba(255,_255,_255)_black` these don't count.
 ;
-function normalize(value) {
+function normalize(value, isRoot = true) {
+    // Keep raw strings if it starts with `url(`
+    if (value.includes('url(')) {
+        return value.split(/(url\(.*?\))/g).filter(Boolean).map((part)=>{
+            if (/^url\(.*?\)$/.test(part)) {
+                return part;
+            }
+            return normalize(part, false);
+        }).join('');
+    }
     // Convert `_` to ` `, except for escaped underscores `\_`
     value = value.replace(/([^\\])_+/g, (fullMatch, characterBefore)=>characterBefore + ' '.repeat(fullMatch.length - 1)
     ).replace(/^_/g, ' ').replace(/\\_/g, '_');
     // Remove leftover whitespace
-    value = value.trim();
-    // Keep raw strings if it starts with `url(`
-    if (value.startsWith('url(')) return value;
+    if (isRoot) {
+        value = value.trim();
+    }
     // Add spaces around operators inside calc() that do not follow an operator
     // or '('.
     return value.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, '$1 $2 ');

package/lib/util/pluginUtils.js

@@ -154,8 +154,14 @@ function splitAtFirst(input, delim) {
 }
 function coerceValue(types, modifier, options, tailwindConfig) {
     if (isArbitraryValue(modifier)) {
-        let [explicitType, value] = splitAtFirst(modifier.slice(1, -1), ':');
-        if (explicitType !== undefined && !supportedTypes.includes(explicitType)) {
+        let arbitraryValue = modifier.slice(1, -1);
+        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
+        if (!/^[\w-_]+$/g.test(explicitType)) {
+            value = arbitraryValue;
+        } else if (explicitType !== undefined && !supportedTypes.includes(explicitType)) {
             return [];
         }
         if (value.length > 0 && supportedTypes.includes(explicitType)) {

package/lib/util/transformThemeValue.js

@@ -14,8 +14,12 @@ function transformThemeValue(themeSection) {
         'fontSize',
         'outline'
     ].includes(themeSection)) {
-        return (value)=>Array.isArray(value) ? value[0] : value
-        ;
+        return (value)=>{
+            if (typeof value === 'function') value = value({
+            });
+            if (Array.isArray(value)) value = value[0];
+            return value;
+        };
     }
     if ([
         'fontFamily',
@@ -30,8 +34,12 @@ function transformThemeValue(themeSection) {
         'cursor',
         'animation', 
     ].includes(themeSection)) {
-        return (value)=>Array.isArray(value) ? value.join(', ') : value
-        ;
+        return (value)=>{
+            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.
@@ -40,14 +48,16 @@ function transformThemeValue(themeSection) {
         'gridTemplateRows',
         'objectPosition'
     ].includes(themeSection)) {
-        return (value)=>typeof value === 'string' ? _postcss.default.list.comma(value).join(' ') : value
-        ;
+        return (value)=>{
+            if (typeof value === 'function') value = value({
+            });
+            if (typeof value === 'string') value = _postcss.default.list.comma(value).join(' ');
+            return value;
+        };
     }
-    if (themeSection === 'colors') {
-        return (value)=>typeof value === 'function' ? value({
-            }) : value
-        ;
-    }
-    return (value)=>value
-    ;
+    return (value)=>{
+        if (typeof value === 'function') value = value({
+        });
+        return value;
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-insiders.ea6f14a",
+  "version": "0.0.0-insiders.ec1f7b0",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -47,16 +47,16 @@
     "@swc/core": "^1.2.92",
     "@swc/jest": "^0.1.5",
     "@swc/register": "^0.1.7",
-    "autoprefixer": "^10.3.6",
+    "autoprefixer": "^10.3.7",
     "cross-env": "^7.0.3",
     "cssnano": "^5.0.8",
     "esbuild": "^0.13.4",
-    "eslint": "^7.32.0",
+    "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.2.4",
+    "jest": "^27.3.1",
     "jest-diff": "^27.2.5",
-    "postcss": "^8.3.8",
+    "postcss": "^8.3.11",
     "postcss-cli": "^8.3.1",
     "prettier": "^2.4.1",
     "rimraf": "^3.0.0"