tailwindcss 3.0.22 → 3.1.0

package/lib/util/normalizeConfig.js

@@ -4,26 +4,44 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.normalizeConfig = normalizeConfig;
 var _log = _interopRequireWildcard(require("./log"));
+function _getRequireWildcardCache() {
+    if (typeof WeakMap !== "function") return null;
+    var cache = new WeakMap();
+    _getRequireWildcardCache = function() {
+        return cache;
+    };
+    return cache;
+}
 function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
-    } else {
-        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) : {};
-                    if (desc.get || desc.set) {
-                        Object.defineProperty(newObj, key, desc);
-                    } else {
-                        newObj[key] = obj[key];
-                    }
-                }
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache();
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
             }
         }
-        newObj.default = obj;
-        return newObj;
     }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 function normalizeConfig(config) {
     // Quick structure validation
@@ -50,45 +68,44 @@ function normalizeConfig(config) {
             return false;
         }
         // `config.content` should be an object or an array
-        if (!Array.isArray(config.content) && !(typeof config.content === 'object' && config.content !== null)) {
+        if (!Array.isArray(config.content) && !(typeof config.content === "object" && config.content !== null)) {
             return false;
         }
         // When `config.content` is an array, it should consist of FilePaths or RawFiles
         if (Array.isArray(config.content)) {
             return config.content.every((path)=>{
                 // `path` can be a string
-                if (typeof path === 'string') return true;
+                if (typeof path === "string") return true;
                 // `path` can be an object { raw: string, extension?: string }
                 // `raw` must be a string
-                if (typeof (path === null || path === void 0 ? void 0 : path.raw) !== 'string') return false;
+                if (typeof (path === null || path === void 0 ? void 0 : path.raw) !== "string") return false;
                 // `extension` (if provided) should also be a string
-                if ((path === null || path === void 0 ? void 0 : path.extension) && typeof (path === null || path === void 0 ? void 0 : path.extension) !== 'string') {
+                if ((path === null || path === void 0 ? void 0 : path.extension) && typeof (path === null || path === void 0 ? void 0 : path.extension) !== "string") {
                     return false;
                 }
                 return true;
             });
         }
         // When `config.content` is an object
-        if (typeof config.content === 'object' && config.content !== null) {
+        if (typeof config.content === "object" && config.content !== null) {
             // Only `files`, `extract` and `transform` can exist in `config.content`
             if (Object.keys(config.content).some((key)=>![
-                    'files',
-                    'extract',
-                    'transform'
-                ].includes(key)
-            )) {
+                    "files",
+                    "extract",
+                    "transform"
+                ].includes(key))) {
                 return false;
             }
             // `config.content.files` should exist of FilePaths or RawFiles
             if (Array.isArray(config.content.files)) {
                 if (!config.content.files.every((path)=>{
                     // `path` can be a string
-                    if (typeof path === 'string') return true;
+                    if (typeof path === "string") return true;
                     // `path` can be an object { raw: string, extension?: string }
                     // `raw` must be a string
-                    if (typeof (path === null || path === void 0 ? void 0 : path.raw) !== 'string') return false;
+                    if (typeof (path === null || path === void 0 ? void 0 : path.raw) !== "string") return false;
                     // `extension` (if provided) should also be a string
-                    if ((path === null || path === void 0 ? void 0 : path.extension) && typeof (path === null || path === void 0 ? void 0 : path.extension) !== 'string') {
+                    if ((path === null || path === void 0 ? void 0 : path.extension) && typeof (path === null || path === void 0 ? void 0 : path.extension) !== "string") {
                         return false;
                     }
                     return true;
@@ -96,23 +113,23 @@ function normalizeConfig(config) {
                     return false;
                 }
                 // `config.content.extract` is optional, and can be a Function or a Record<String, Function>
-                if (typeof config.content.extract === 'object') {
+                if (typeof config.content.extract === "object") {
                     for (let value of Object.values(config.content.extract)){
-                        if (typeof value !== 'function') {
+                        if (typeof value !== "function") {
                             return false;
                         }
                     }
-                } else if (!(config.content.extract === undefined || typeof config.content.extract === 'function')) {
+                } else if (!(config.content.extract === undefined || typeof config.content.extract === "function")) {
                     return false;
                 }
                 // `config.content.transform` is optional, and can be a Function or a Record<String, Function>
-                if (typeof config.content.transform === 'object') {
+                if (typeof config.content.transform === "object") {
                     for (let value of Object.values(config.content.transform)){
-                        if (typeof value !== 'function') {
+                        if (typeof value !== "function") {
                             return false;
                         }
                     }
-                } else if (!(config.content.transform === undefined || typeof config.content.transform === 'function')) {
+                } else if (!(config.content.transform === undefined || typeof config.content.transform === "function")) {
                     return false;
                 }
             }
@@ -121,10 +138,10 @@ function normalizeConfig(config) {
         return false;
     })();
     if (!valid) {
-        _log.default.warn('purge-deprecation', [
-            'The `purge`/`content` options have changed in Tailwind CSS v3.0.',
-            'Update your configuration file to eliminate this warning.',
-            'https://tailwindcss.com/docs/upgrade-guide#configure-content-sources', 
+        _log.default.warn("purge-deprecation", [
+            "The `purge`/`content` options have changed in Tailwind CSS v3.0.",
+            "Update your configuration file to eliminate this warning.",
+            "https://tailwindcss.com/docs/upgrade-guide#configure-content-sources", 
         ]);
     }
     // Normalize the `safelist`
@@ -138,16 +155,16 @@ function normalizeConfig(config) {
         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.',
-            'https://tailwindcss.com/docs/upgrade-guide#prefix-cannot-be-a-function', 
+    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.",
+            "https://tailwindcss.com/docs/upgrade-guide#prefix-cannot-be-a-function", 
         ]);
-        config.prefix = '';
+        config.prefix = "";
     } else {
         var _prefix;
-        config.prefix = (_prefix = config.prefix) !== null && _prefix !== void 0 ? _prefix : '';
+        config.prefix = (_prefix = config.prefix) !== null && _prefix !== void 0 ? _prefix : "";
     }
     // Normalize the `content`
     config.content = {
@@ -186,7 +203,7 @@ function normalizeConfig(config) {
                 extractors.DEFAULT = defaultExtractor;
             }
             // Functions
-            if (typeof extract === 'function') {
+            if (typeof extract === "function") {
                 extractors.DEFAULT = extract;
             } else if (Array.isArray(extract)) {
                 for (let { extensions , extractor  } of extract !== null && extract !== void 0 ? extract : []){
@@ -194,7 +211,7 @@ function normalizeConfig(config) {
                         extractors[extension] = extractor;
                     }
                 }
-            } else if (typeof extract === 'object' && extract !== null) {
+            } else if (typeof extract === "object" && extract !== null) {
                 Object.assign(extractors, extract);
             }
             return extractors;
@@ -209,10 +226,10 @@ function normalizeConfig(config) {
                 return {};
             })();
             let transformers = {};
-            if (typeof transform === 'function') {
+            if (typeof transform === "function") {
                 transformers.DEFAULT = transform;
             }
-            if (typeof transform === 'object' && transform !== null) {
+            if (typeof transform === "object" && transform !== null) {
                 Object.assign(transformers, transform);
             }
             return transformers;
@@ -221,20 +238,13 @@ function normalizeConfig(config) {
     // Validate globs to prevent bogus globs.
     // E.g.: `./src/*.{html}` is invalid, the `{html}` should just be `html`
     for (let file of config.content.files){
-        if (typeof file === 'string' && /{([^,]*?)}/g.test(file)) {
-            _log.default.warn('invalid-glob-braces', [
+        if (typeof file === "string" && /{([^,]*?)}/g.test(file)) {
+            _log.default.warn("invalid-glob-braces", [
                 `The glob pattern ${(0, _log).dim(file)} in your Tailwind CSS configuration is invalid.`,
-                `Update it to ${(0, _log).dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`
+                `Update it to ${(0, _log).dim(file.replace(/{([^,]*?)}/g, "$1"))} to silence this warning.`
             ]);
             break;
         }
     }
-    if (config.content.files.length === 0) {
-        _log.default.warn('content-problems', [
-            'The `content` option in your Tailwind CSS configuration is missing or empty.',
-            'Configure your content sources or your generated CSS will be missing styles.',
-            'https://tailwindcss.com/docs/content-configuration', 
-        ]);
-    }
     return config;
 }

package/lib/util/normalizeScreens.js

@@ -7,9 +7,9 @@ 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`.');
+                throw new Error("The tuple syntax is not supported for `screens`.");
             }
-            if (typeof screen === 'string') {
+            if (typeof screen === "string") {
                 return {
                     name: screen.toString(),
                     values: [
@@ -22,7 +22,7 @@ function normalizeScreens(screens, root = true) {
             }
             let [name, options] = screen;
             name = name.toString();
-            if (typeof options === 'string') {
+            if (typeof options === "string") {
                 return {
                     name,
                     values: [
@@ -36,8 +36,7 @@ function normalizeScreens(screens, root = true) {
             if (Array.isArray(options)) {
                 return {
                     name,
-                    values: options.map((option)=>resolveValue(option)
-                    )
+                    values: options.map((option)=>resolveValue(option))
                 };
             }
             return {
@@ -50,7 +49,7 @@ function normalizeScreens(screens, root = true) {
     }
     return normalizeScreens(Object.entries(screens !== null && screens !== void 0 ? screens : {}), false);
 }
-function resolveValue({ 'min-width': _minWidth , min =_minWidth , max , raw  } = {}) {
+function resolveValue({ "min-width": _minWidth , min =_minWidth , max , raw  } = {}) {
     return {
         min,
         max,

package/lib/util/parseAnimationValue.js

@@ -3,44 +3,6 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = parseAnimationValue;
-const DIRECTIONS = new Set([
-    'normal',
-    'reverse',
-    'alternate',
-    'alternate-reverse'
-]);
-const PLAY_STATES = new Set([
-    'running',
-    'paused'
-]);
-const FILL_MODES = new Set([
-    'none',
-    'forwards',
-    'backwards',
-    'both'
-]);
-const ITERATION_COUNTS = new Set([
-    'infinite'
-]);
-const TIMINGS = new Set([
-    'linear',
-    'ease',
-    'ease-in',
-    'ease-out',
-    'ease-in-out',
-    'step-start',
-    'step-end', 
-]);
-const TIMING_FNS = [
-    'cubic-bezier',
-    'steps'
-];
-const COMMA = /\,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
-;
-const SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead.
-;
-const TIME = /^(-?[\d.]+m?s)$/;
-const DIGIT = /^(\d+)$/;
 function parseAnimationValue(input) {
     let animations = input.split(COMMA);
     return animations.map((animation)=>{
@@ -51,34 +13,33 @@ function parseAnimationValue(input) {
         let parts = value.split(SPACE);
         let seen = new Set();
         for (let part of parts){
-            if (!seen.has('DIRECTIONS') && DIRECTIONS.has(part)) {
+            if (!seen.has("DIRECTIONS") && DIRECTIONS.has(part)) {
                 result.direction = part;
-                seen.add('DIRECTIONS');
-            } else if (!seen.has('PLAY_STATES') && PLAY_STATES.has(part)) {
+                seen.add("DIRECTIONS");
+            } else if (!seen.has("PLAY_STATES") && PLAY_STATES.has(part)) {
                 result.playState = part;
-                seen.add('PLAY_STATES');
-            } else if (!seen.has('FILL_MODES') && FILL_MODES.has(part)) {
+                seen.add("PLAY_STATES");
+            } else if (!seen.has("FILL_MODES") && FILL_MODES.has(part)) {
                 result.fillMode = part;
-                seen.add('FILL_MODES');
-            } else if (!seen.has('ITERATION_COUNTS') && (ITERATION_COUNTS.has(part) || DIGIT.test(part))) {
+                seen.add("FILL_MODES");
+            } else if (!seen.has("ITERATION_COUNTS") && (ITERATION_COUNTS.has(part) || DIGIT.test(part))) {
                 result.iterationCount = part;
-                seen.add('ITERATION_COUNTS');
-            } else if (!seen.has('TIMING_FUNCTION') && TIMINGS.has(part)) {
+                seen.add("ITERATION_COUNTS");
+            } else if (!seen.has("TIMING_FUNCTION") && TIMINGS.has(part)) {
                 result.timingFunction = part;
-                seen.add('TIMING_FUNCTION');
-            } else if (!seen.has('TIMING_FUNCTION') && TIMING_FNS.some((f)=>part.startsWith(`${f}(`)
-            )) {
+                seen.add("TIMING_FUNCTION");
+            } else if (!seen.has("TIMING_FUNCTION") && TIMING_FNS.some((f)=>part.startsWith(`${f}(`))) {
                 result.timingFunction = part;
-                seen.add('TIMING_FUNCTION');
-            } else if (!seen.has('DURATION') && TIME.test(part)) {
+                seen.add("TIMING_FUNCTION");
+            } else if (!seen.has("DURATION") && TIME.test(part)) {
                 result.duration = part;
-                seen.add('DURATION');
-            } else if (!seen.has('DELAY') && TIME.test(part)) {
+                seen.add("DURATION");
+            } else if (!seen.has("DELAY") && TIME.test(part)) {
                 result.delay = part;
-                seen.add('DELAY');
-            } else if (!seen.has('NAME')) {
+                seen.add("DELAY");
+            } else if (!seen.has("NAME")) {
                 result.name = part;
-                seen.add('NAME');
+                seen.add("NAME");
             } else {
                 if (!result.unknown) result.unknown = [];
                 result.unknown.push(part);
@@ -87,3 +48,41 @@ function parseAnimationValue(input) {
         return result;
     });
 }
+const DIRECTIONS = new Set([
+    "normal",
+    "reverse",
+    "alternate",
+    "alternate-reverse"
+]);
+const PLAY_STATES = new Set([
+    "running",
+    "paused"
+]);
+const FILL_MODES = new Set([
+    "none",
+    "forwards",
+    "backwards",
+    "both"
+]);
+const ITERATION_COUNTS = new Set([
+    "infinite"
+]);
+const TIMINGS = new Set([
+    "linear",
+    "ease",
+    "ease-in",
+    "ease-out",
+    "ease-in-out",
+    "step-start",
+    "step-end", 
+]);
+const TIMING_FNS = [
+    "cubic-bezier",
+    "steps"
+];
+const COMMA = /\,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
+;
+const SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead.
+;
+const TIME = /^(-?[\d.]+m?s)$/;
+const DIGIT = /^(\d+)$/;

package/lib/util/parseBoxShadowValue.js

@@ -4,20 +4,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseBoxShadowValue = parseBoxShadowValue;
 exports.formatBoxShadowValue = formatBoxShadowValue;
+var _splitAtTopLevelOnly = require("./splitAtTopLevelOnly");
 let KEYWORDS = new Set([
-    'inset',
-    'inherit',
-    'initial',
-    'revert',
-    'unset'
+    "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+|\.\d+)(.*?)$/g;
 function parseBoxShadowValue(input) {
-    let shadows = input.split(COMMA);
+    let shadows = Array.from((0, _splitAtTopLevelOnly).splitAtTopLevelOnly(input, ","));
     return shadows.map((shadow)=>{
         let value = shadow.trim();
         let result = {
@@ -29,22 +28,22 @@ function parseBoxShadowValue(input) {
             // Reset index, since the regex is stateful.
             LENGTH.lastIndex = 0;
             // Keyword
-            if (!seen.has('KEYWORD') && KEYWORDS.has(part)) {
+            if (!seen.has("KEYWORD") && KEYWORDS.has(part)) {
                 result.keyword = part;
-                seen.add('KEYWORD');
+                seen.add("KEYWORD");
             } else if (LENGTH.test(part)) {
-                if (!seen.has('X')) {
+                if (!seen.has("X")) {
                     result.x = part;
-                    seen.add('X');
-                } else if (!seen.has('Y')) {
+                    seen.add("X");
+                } else if (!seen.has("Y")) {
                     result.y = part;
-                    seen.add('Y');
-                } else if (!seen.has('BLUR')) {
+                    seen.add("Y");
+                } else if (!seen.has("BLUR")) {
                     result.blur = part;
-                    seen.add('BLUR');
-                } else if (!seen.has('SPREAD')) {
+                    seen.add("BLUR");
+                } else if (!seen.has("SPREAD")) {
                     result.spread = part;
-                    seen.add('SPREAD');
+                    seen.add("SPREAD");
                 }
             } else {
                 if (!result.color) {
@@ -72,6 +71,6 @@ function formatBoxShadowValue(shadows) {
             shadow.blur,
             shadow.spread,
             shadow.color
-        ].filter(Boolean).join(' ');
-    }).join(', ');
+        ].filter(Boolean).join(" ");
+    }).join(", ");
 }

package/lib/util/parseDependency.js

@@ -6,58 +6,58 @@ exports.default = parseDependency;
 var _isGlob = _interopRequireDefault(require("is-glob"));
 var _globParent = _interopRequireDefault(require("glob-parent"));
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-// Based on `glob-base`
-// https://github.com/micromatch/glob-base/blob/master/index.js
-function parseGlob(pattern) {
-    let glob = pattern;
-    let base = (0, _globParent).default(pattern);
-    if (base !== '.') {
-        glob = pattern.substr(base.length);
-        if (glob.charAt(0) === '/') {
-            glob = glob.substr(1);
-        }
-    }
-    if (glob.substr(0, 2) === './') {
-        glob = glob.substr(2);
-    }
-    if (glob.charAt(0) === '/') {
-        glob = glob.substr(1);
-    }
-    return {
-        base,
-        glob
-    };
-}
 function parseDependency(normalizedFileOrGlob) {
-    if (normalizedFileOrGlob.startsWith('!')) {
+    if (normalizedFileOrGlob.startsWith("!")) {
         return null;
     }
     let message;
     if ((0, _isGlob).default(normalizedFileOrGlob)) {
         let { base , glob  } = parseGlob(normalizedFileOrGlob);
         message = {
-            type: 'dir-dependency',
+            type: "dir-dependency",
             dir: _path.default.resolve(base),
             glob
         };
     } else {
         message = {
-            type: 'dependency',
+            type: "dependency",
             file: _path.default.resolve(normalizedFileOrGlob)
         };
     }
     // rollup-plugin-postcss does not support dir-dependency messages
     // but directories can be watched in the same way as files
-    if (message.type === 'dir-dependency' && process.env.ROLLUP_WATCH === 'true') {
+    if (message.type === "dir-dependency" && process.env.ROLLUP_WATCH === "true") {
         message = {
-            type: 'dependency',
+            type: "dependency",
             file: message.dir
         };
     }
     return message;
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+// Based on `glob-base`
+// https://github.com/micromatch/glob-base/blob/master/index.js
+function parseGlob(pattern) {
+    let glob = pattern;
+    let base = (0, _globParent).default(pattern);
+    if (base !== ".") {
+        glob = pattern.substr(base.length);
+        if (glob.charAt(0) === "/") {
+            glob = glob.substr(1);
+        }
+    }
+    if (glob.substr(0, 2) === "./") {
+        glob = glob.substr(2);
+    }
+    if (glob.charAt(0) === "/") {
+        glob = glob.substr(1);
+    }
+    return {
+        base,
+        glob
+    };
+}

package/lib/util/parseObjectStyles.js

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