tailwindcss 3.0.0-alpha.1 → 3.0.2

package/lib/util/dataTypes.js

@@ -8,6 +8,7 @@ exports.number = number;
 exports.percentage = percentage;
 exports.length = length;
 exports.lineWidth = lineWidth;
+exports.shadow = shadow;
 exports.color = color;
 exports.image = image;
 exports.gradient = gradient;
@@ -17,19 +18,35 @@ exports.genericName = genericName;
 exports.absoluteSize = absoluteSize;
 exports.relativeSize = relativeSize;
 var _color = require("./color");
+var _parseBoxShadowValue = require("./parseBoxShadowValue");
+let cssFunctions = [
+    'min',
+    'max',
+    'clamp',
+    'calc'
+];
 // Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Types
 let COMMA = /,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
 ;
 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 ');
@@ -38,10 +55,12 @@ function url(value) {
     return value.startsWith('url(');
 }
 function number(value) {
-    return !isNaN(Number(value));
+    return !isNaN(Number(value)) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?`).test(value)
+    );
 }
 function percentage(value) {
-    return /%$/g.test(value) || /^calc\(.+?%\)/g.test(value);
+    return /%$/g.test(value) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?%`).test(value)
+    );
 }
 let lengthUnits = [
     'cm',
@@ -63,7 +82,10 @@ let lengthUnits = [
 ];
 let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`;
 function length(value) {
-    return new RegExp(`${lengthUnitsPattern}$`).test(value) || new RegExp(`^calc\\(.+?${lengthUnitsPattern}`).test(value);
+    return value.split(UNDERSCORE).every((part)=>{
+        return part === '0' || new RegExp(`${lengthUnitsPattern}$`).test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(part)
+        );
+    });
 }
 let lineWidths = new Set([
     'thin',
@@ -73,6 +95,15 @@ let lineWidths = new Set([
 function lineWidth(value) {
     return lineWidths.has(value);
 }
+function shadow(value) {
+    let parsedShadows = (0, _parseBoxShadowValue).parseBoxShadowValue(normalize(value));
+    for (let parsedShadow of parsedShadows){
+        if (!parsedShadow.valid) {
+            return false;
+        }
+    }
+    return true;
+}
 function color(value) {
     let colors = 0;
     let result = value.split(UNDERSCORE).every((part)=>{

package/lib/util/formatVariantSelector.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.formatVariantSelector = formatVariantSelector;
+exports.finalizeSelector = finalizeSelector;
+exports.selectorFunctions = void 0;
+var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
+var _unesc = _interopRequireDefault(require("postcss-selector-parser/dist/util/unesc"));
+var _escapeClassName = _interopRequireDefault(require("../util/escapeClassName"));
+var _prefixSelector = _interopRequireDefault(require("../util/prefixSelector"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let MERGE = ':merge';
+let PARENT = '&';
+let selectorFunctions = new Set([
+    MERGE
+]);
+exports.selectorFunctions = selectorFunctions;
+function formatVariantSelector(current, ...others) {
+    for (let other of others){
+        let incomingValue = resolveFunctionArgument(other, MERGE);
+        if (incomingValue !== null) {
+            let existingValue = resolveFunctionArgument(current, MERGE, incomingValue);
+            if (existingValue !== null) {
+                let existingTarget = `${MERGE}(${incomingValue})`;
+                let splitIdx = other.indexOf(existingTarget);
+                let addition = other.slice(splitIdx + existingTarget.length).split(' ')[0];
+                current = current.replace(existingTarget, existingTarget + addition);
+                continue;
+            }
+        }
+        current = other.replace(PARENT, current);
+    }
+    return current;
+}
+function finalizeSelector(format, { selector: selector1 , candidate , context  }) {
+    var ref, ref1;
+    var ref2;
+    let separator = (ref2 = context === null || context === void 0 ? void 0 : (ref = context.tailwindConfig) === null || ref === void 0 ? void 0 : ref.separator) !== null && ref2 !== void 0 ? ref2 : ':';
+    // Split by the separator, but ignore the separator inside square brackets:
+    //
+    // E.g.: dark:lg:hover:[paint-order:markers]
+    //           ┬  ┬     ┬            ┬
+    //           │  │     │            ╰── We will not split here
+    //           ╰──┴─────┴─────────────── We will split here
+    //
+    let splitter = new RegExp(`\\${separator}(?![^[]*\\])`);
+    let base = candidate.split(splitter).pop();
+    if (context === null || context === void 0 ? void 0 : (ref1 = context.tailwindConfig) === null || ref1 === void 0 ? void 0 : ref1.prefix) {
+        format = (0, _prefixSelector).default(context.tailwindConfig.prefix, format);
+    }
+    format = format.replace(PARENT, `.${(0, _escapeClassName).default(candidate)}`);
+    // Normalize escaped classes, e.g.:
+    //
+    // The idea would be to replace the escaped `base` in the selector with the
+    // `format`. However, in css you can escape the same selector in a few
+    // different ways. This would result in different strings and therefore we
+    // can't replace it properly.
+    //
+    //               base: bg-[rgb(255,0,0)]
+    //   base in selector: bg-\\[rgb\\(255\\,0\\,0\\)\\]
+    //       escaped base: bg-\\[rgb\\(255\\2c 0\\2c 0\\)\\]
+    //
+    selector1 = (0, _postcssSelectorParser).default((selectors)=>{
+        return selectors.walkClasses((node)=>{
+            if (node.raws && node.value.includes(base)) {
+                node.raws.value = (0, _escapeClassName).default((0, _unesc).default(node.raws.value));
+            }
+            return node;
+        });
+    }).processSync(selector1);
+    // We can safely replace the escaped base now, since the `base` section is
+    // now in a normalized escaped value.
+    selector1 = selector1.replace(`.${(0, _escapeClassName).default(base)}`, format);
+    // Remove unnecessary pseudo selectors that we used as placeholders
+    return (0, _postcssSelectorParser).default((selectors)=>{
+        return selectors.map((selector2)=>{
+            selector2.walkPseudos((p)=>{
+                if (selectorFunctions.has(p.value)) {
+                    p.replaceWith(p.nodes);
+                }
+                return p;
+            });
+            // This will make sure to move pseudo's to the correct spot (the end for
+            // pseudo elements) because otherwise the selector will never work
+            // anyway.
+            //
+            // E.g.:
+            //  - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
+            //  - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
+            //
+            // `::before:hover` doesn't work, which means that we can make it work for you by flipping the order.
+            function collectPseudoElements(selector) {
+                let nodes = [];
+                for (let node of selector.nodes){
+                    if (isPseudoElement(node)) {
+                        nodes.push(node);
+                        selector.removeChild(node);
+                    }
+                    if (node === null || node === void 0 ? void 0 : node.nodes) {
+                        nodes.push(...collectPseudoElements(node));
+                    }
+                }
+                return nodes;
+            }
+            let pseudoElements = collectPseudoElements(selector2);
+            if (pseudoElements.length > 0) {
+                selector2.nodes.push(pseudoElements.sort(sortSelector));
+            }
+            return selector2;
+        });
+    }).processSync(selector1);
+}
+// Note: As a rule, double colons (::) should be used instead of a single colon
+// (:). This distinguishes pseudo-classes from pseudo-elements. However, since
+// this distinction was not present in older versions of the W3C spec, most
+// browsers support both syntaxes for the original pseudo-elements.
+let pseudoElementsBC = [
+    ':before',
+    ':after',
+    ':first-line',
+    ':first-letter'
+];
+// These pseudo-elements _can_ be combined with other pseudo selectors AND the order does matter.
+let pseudoElementExceptions = [
+    '::file-selector-button'
+];
+// This will make sure to move pseudo's to the correct spot (the end for
+// pseudo elements) because otherwise the selector will never work
+// anyway.
+//
+// E.g.:
+//  - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
+//  - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
+//
+// `::before:hover` doesn't work, which means that we can make it work
+// for you by flipping the order.
+function sortSelector(a, z) {
+    // Both nodes are non-pseudo's so we can safely ignore them and keep
+    // them in the same order.
+    if (a.type !== 'pseudo' && z.type !== 'pseudo') {
+        return 0;
+    }
+    // If one of them is a combinator, we need to keep it in the same order
+    // because that means it will start a new "section" in the selector.
+    if (a.type === 'combinator' ^ z.type === 'combinator') {
+        return 0;
+    }
+    // One of the items is a pseudo and the other one isn't. Let's move
+    // the pseudo to the right.
+    if (a.type === 'pseudo' ^ z.type === 'pseudo') {
+        return (a.type === 'pseudo') - (z.type === 'pseudo');
+    }
+    // Both are pseudo's, move the pseudo elements (except for
+    // ::file-selector-button) to the right.
+    return isPseudoElement(a) - isPseudoElement(z);
+}
+function isPseudoElement(node) {
+    if (node.type !== 'pseudo') return false;
+    if (pseudoElementExceptions.includes(node.value)) return false;
+    return node.value.startsWith('::') || pseudoElementsBC.includes(node.value);
+}
+function resolveFunctionArgument(haystack, needle, arg) {
+    let startIdx = haystack.indexOf(arg ? `${needle}(${arg})` : needle);
+    if (startIdx === -1) return null;
+    // Start inside the `(`
+    startIdx += needle.length + 1;
+    let target = '';
+    let count = 0;
+    for (let char of haystack.slice(startIdx)){
+        if (char !== '(' && char !== ')') {
+            target += char;
+        } else if (char === '(') {
+            target += char;
+            count++;
+        } else if (char === ')') {
+            if (--count < 0) break; // unbalanced
+            target += char;
+        }
+    }
+    return target;
+}

package/lib/util/isValidArbitraryValue.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = isValidArbitraryValue;
+let matchingBrackets = new Map([
+    [
+        '{',
+        '}'
+    ],
+    [
+        '[',
+        ']'
+    ],
+    [
+        '(',
+        ')'
+    ], 
+]);
+let inverseMatchingBrackets = new Map(Array.from(matchingBrackets.entries()).map(([k, v])=>[
+        v,
+        k
+    ]
+));
+let quotes = new Set([
+    '"',
+    "'",
+    '`'
+]);
+function isValidArbitraryValue(value) {
+    let stack = [];
+    let inQuotes = false;
+    for(let i = 0; i < value.length; i++){
+        let char = value[i];
+        if (char === ':' && !inQuotes && stack.length === 0) {
+            return false;
+        }
+        // Non-escaped quotes allow us to "allow" anything in between
+        if (quotes.has(char) && value[i - 1] !== '\\') {
+            inQuotes = !inQuotes;
+        }
+        if (inQuotes) continue;
+        if (value[i - 1] === '\\') continue; // Escaped
+        if (matchingBrackets.has(char)) {
+            stack.push(char);
+        } else if (inverseMatchingBrackets.has(char)) {
+            let inverse = inverseMatchingBrackets.get(char);
+            // Nothing to pop from, therefore it is unbalanced
+            if (stack.length <= 0) {
+                return false;
+            }
+            // Popped value must match the inverse value, otherwise it is unbalanced
+            if (stack.pop() !== inverse) {
+                return false;
+            }
+        }
+    }
+    // If there is still something on the stack, it is also unbalanced
+    if (stack.length > 0) {
+        return false;
+    }
+    // All good, totally balanced!
+    return true;
+}

package/lib/util/nameClass.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+exports.asClass = asClass;
 exports.default = nameClass;
 exports.formatClass = formatClass;
 var _escapeClassName = _interopRequireDefault(require("./escapeClassName"));
@@ -21,7 +22,7 @@ function formatClass(classPrefix, key) {
     if (key === 'DEFAULT') {
         return classPrefix;
     }
-    if (key === '-') {
+    if (key === '-' || key === '-DEFAULT') {
         return `-${classPrefix}`;
     }
     if (key.startsWith('-')) {

package/lib/util/negateValue.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 function _default(value) {
     value = `${value}`;
+    if (value === '0') {
+        return '0';
+    }
     // Flip sign of numbers
     if (/^[+-]?(\d+|\d*\.\d+)(e[+-]?\d+)?(%|\w+)?$/.test(value)) {
         return value.replace(/^[+-]?/, (sign)=>sign === '-' ? '' : '-'
@@ -13,5 +16,4 @@ function _default(value) {
     if (value.includes('var(') || value.includes('calc(')) {
         return `calc(${value} * -1)`;
     }
-    return value;
 }

package/lib/util/normalizeConfig.js

@@ -120,6 +120,17 @@ function normalizeConfig(config) {
         if (Array.isArray(purge === null || purge === void 0 ? void 0 : (ref = purge.options) === null || ref === void 0 ? void 0 : ref.safelist)) return purge.options.safelist;
         return [];
     })();
+    // Normalize prefix option
+    if (typeof config.prefix === 'function') {
+        _log.default.warn('prefix-function', [
+            'As of Tailwind CSS v3.0, `prefix` cannot be a function.',
+            'Update `prefix` in your configuration to be a string to eliminate this warning.'
+        ]);
+        config.prefix = '';
+    } else {
+        var _prefix;
+        config.prefix = (_prefix = config.prefix) !== null && _prefix !== void 0 ? _prefix : '';
+    }
     // Normalize the `content`
     config.content = {
         files: (()=>{
@@ -145,16 +156,19 @@ function normalizeConfig(config) {
             })();
             let extractors = {
             };
-            extractors.DEFAULT = (()=>{
-                var ref, ref37, ref38, ref39;
-                if ((ref = config.purge) === null || ref === void 0 ? void 0 : (ref37 = ref.options) === null || ref37 === void 0 ? void 0 : ref37.defaultExtractor) {
+            let defaultExtractor = (()=>{
+                var ref, ref10, ref11, ref12;
+                if ((ref = config.purge) === null || ref === void 0 ? void 0 : (ref10 = ref.options) === null || ref10 === void 0 ? void 0 : ref10.defaultExtractor) {
                     return config.purge.options.defaultExtractor;
                 }
-                if ((ref38 = config.content) === null || ref38 === void 0 ? void 0 : (ref39 = ref38.options) === null || ref39 === void 0 ? void 0 : ref39.defaultExtractor) {
+                if ((ref11 = config.content) === null || ref11 === void 0 ? void 0 : (ref12 = ref11.options) === null || ref12 === void 0 ? void 0 : ref12.defaultExtractor) {
                     return config.content.options.defaultExtractor;
                 }
                 return undefined;
             })();
+            if (defaultExtractor !== undefined) {
+                extractors.DEFAULT = defaultExtractor;
+            }
             // Functions
             if (typeof extract === 'function') {
                 extractors.DEFAULT = extract;
@@ -171,11 +185,11 @@ function normalizeConfig(config) {
         })(),
         transform: (()=>{
             let transform = (()=>{
-                var ref, ref49, ref50, ref51, ref52, ref53;
+                var ref, ref13, ref14, ref15, ref16, ref17;
                 if ((ref = config.purge) === null || ref === void 0 ? void 0 : ref.transform) return config.purge.transform;
-                if ((ref49 = config.content) === null || ref49 === void 0 ? void 0 : ref49.transform) return config.content.transform;
-                if ((ref50 = config.purge) === null || ref50 === void 0 ? void 0 : (ref51 = ref50.transform) === null || ref51 === void 0 ? void 0 : ref51.DEFAULT) return config.purge.transform.DEFAULT;
-                if ((ref52 = config.content) === null || ref52 === void 0 ? void 0 : (ref53 = ref52.transform) === null || ref53 === void 0 ? void 0 : ref53.DEFAULT) return config.content.transform.DEFAULT;
+                if ((ref13 = config.content) === null || ref13 === void 0 ? void 0 : ref13.transform) return config.content.transform;
+                if ((ref14 = config.purge) === null || ref14 === void 0 ? void 0 : (ref15 = ref14.transform) === null || ref15 === void 0 ? void 0 : ref15.DEFAULT) return config.purge.transform.DEFAULT;
+                if ((ref16 = config.content) === null || ref16 === void 0 ? void 0 : (ref17 = ref16.transform) === null || ref17 === void 0 ? void 0 : ref17.DEFAULT) return config.content.transform.DEFAULT;
                 return {
                 };
             })();

package/lib/util/normalizeScreens.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.normalizeScreens = normalizeScreens;
+function normalizeScreens(screens, root = true) {
+    if (Array.isArray(screens)) {
+        return screens.map((screen)=>{
+            if (root && Array.isArray(screen)) {
+                throw new Error('The tuple syntax is not supported for `screens`.');
+            }
+            if (typeof screen === 'string') {
+                return {
+                    name: screen.toString(),
+                    values: [
+                        {
+                            min: screen,
+                            max: undefined
+                        }
+                    ]
+                };
+            }
+            let [name, options] = screen;
+            name = name.toString();
+            if (typeof options === 'string') {
+                return {
+                    name,
+                    values: [
+                        {
+                            min: options,
+                            max: undefined
+                        }
+                    ]
+                };
+            }
+            if (Array.isArray(options)) {
+                return {
+                    name,
+                    values: options.map((option)=>resolveValue(option)
+                    )
+                };
+            }
+            return {
+                name,
+                values: [
+                    resolveValue(options)
+                ]
+            };
+        });
+    }
+    return normalizeScreens(Object.entries(screens !== null && screens !== void 0 ? screens : {
+    }), false);
+}
+function resolveValue({ 'min-width': _minWidth , min =_minWidth , max , raw  } = {
+}) {
+    return {
+        min,
+        max,
+        raw
+    };
+}

package/lib/util/parseBoxShadowValue.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.parseBoxShadowValue = parseBoxShadowValue;
+exports.formatBoxShadowValue = formatBoxShadowValue;
+let KEYWORDS = new Set([
+    'inset',
+    'inherit',
+    'initial',
+    'revert',
+    'unset'
+]);
+let COMMA = /\,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
+;
+let SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead.
+;
+let LENGTH = /^-?(\d+)(.*?)$/g;
+function parseBoxShadowValue(input) {
+    let shadows = input.split(COMMA);
+    return shadows.map((shadow)=>{
+        let value = shadow.trim();
+        let result = {
+            raw: value
+        };
+        let parts = value.split(SPACE);
+        let seen = new Set();
+        for (let part of parts){
+            // Reset index, since the regex is stateful.
+            LENGTH.lastIndex = 0;
+            // Keyword
+            if (!seen.has('KEYWORD') && KEYWORDS.has(part)) {
+                result.keyword = part;
+                seen.add('KEYWORD');
+            } else if (LENGTH.test(part)) {
+                if (!seen.has('X')) {
+                    result.x = part;
+                    seen.add('X');
+                } else if (!seen.has('Y')) {
+                    result.y = part;
+                    seen.add('Y');
+                } else if (!seen.has('BLUR')) {
+                    result.blur = part;
+                    seen.add('BLUR');
+                } else if (!seen.has('SPREAD')) {
+                    result.spread = part;
+                    seen.add('SPREAD');
+                }
+            } else {
+                if (!result.color) {
+                    result.color = part;
+                } else {
+                    if (!result.unknown) result.unknown = [];
+                    result.unknown.push(part);
+                }
+            }
+        }
+        // Check if valid
+        result.valid = result.x !== undefined && result.y !== undefined;
+        return result;
+    });
+}
+function formatBoxShadowValue(shadows) {
+    return shadows.map((shadow)=>{
+        if (!shadow.valid) {
+            return shadow.raw;
+        }
+        return [
+            shadow.keyword,
+            shadow.x,
+            shadow.y,
+            shadow.blur,
+            shadow.spread,
+            shadow.color
+        ].filter(Boolean).join(' ');
+    }).join(', ');
+}