tailwindcss 0.0.0-insiders.ea139f2 → 0.0.0-insiders.ea4e1cd

package/lib/util/log.js

@@ -2,25 +2,40 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _chalk = _interopRequireDefault(require("chalk"));
-function _interopRequireDefault(obj) {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    dim: function() {
+        return dim;
+    },
+    default: function() {
+        return _default;
+    }
+});
+const _picocolors = /*#__PURE__*/ _interop_require_default(require("picocolors"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 let alreadyShown = new Set();
-function log(chalk, messages, key) {
-    if (process.env.JEST_WORKER_ID !== undefined) return;
+function log(type, messages, key) {
+    if (typeof process !== "undefined" && process.env.JEST_WORKER_ID) return;
     if (key && alreadyShown.has(key)) return;
     if (key) alreadyShown.add(key);
-    console.warn('');
-    messages.forEach((message)=>console.warn(chalk, '-', message)
-    );
+    console.warn("");
+    messages.forEach((message)=>console.warn(type, "-", message));
+}
+function dim(input) {
+    return _picocolors.default.dim(input);
 }
-var _default = {
+const _default = {
     info (key, messages) {
-        log(_chalk.default.bold.cyan('info'), ...Array.isArray(key) ? [
+        log(_picocolors.default.bold(_picocolors.default.cyan("info")), ...Array.isArray(key) ? [
             key
         ] : [
             messages,
@@ -28,7 +43,7 @@ var _default = {
         ]);
     },
     warn (key, messages) {
-        log(_chalk.default.bold.yellow('warn'), ...Array.isArray(key) ? [
+        log(_picocolors.default.bold(_picocolors.default.yellow("warn")), ...Array.isArray(key) ? [
             key
         ] : [
             messages,
@@ -36,7 +51,7 @@ var _default = {
         ]);
     },
     risk (key, messages) {
-        log(_chalk.default.bold.magenta('risk'), ...Array.isArray(key) ? [
+        log(_picocolors.default.bold(_picocolors.default.magenta("risk")), ...Array.isArray(key) ? [
             key
         ] : [
             messages,
@@ -44,4 +59,3 @@ var _default = {
         ]);
     }
 };
-exports.default = _default;

package/lib/util/nameClass.js

@@ -2,31 +2,48 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.asClass = asClass;
-exports.default = nameClass;
-exports.formatClass = formatClass;
-var _escapeClassName = _interopRequireDefault(require("./escapeClassName"));
-var _escapeCommas = _interopRequireDefault(require("./escapeCommas"));
-function _interopRequireDefault(obj) {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    asClass: function() {
+        return asClass;
+    },
+    default: function() {
+        return nameClass;
+    },
+    formatClass: function() {
+        return formatClass;
+    }
+});
+const _escapeClassName = /*#__PURE__*/ _interop_require_default(require("./escapeClassName"));
+const _escapeCommas = /*#__PURE__*/ _interop_require_default(require("./escapeCommas"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function asClass(name) {
-    return (0, _escapeCommas).default(`.${(0, _escapeClassName).default(name)}`);
+    return (0, _escapeCommas.default)(`.${(0, _escapeClassName.default)(name)}`);
 }
 function nameClass(classPrefix, key) {
     return asClass(formatClass(classPrefix, key));
 }
 function formatClass(classPrefix, key) {
-    if (key === 'DEFAULT') {
+    if (key === "DEFAULT") {
         return classPrefix;
     }
-    if (key === '-' || key === '-DEFAULT') {
+    if (key === "-" || key === "-DEFAULT") {
         return `-${classPrefix}`;
     }
-    if (key.startsWith('-')) {
+    if (key.startsWith("-")) {
         return `-${classPrefix}${key}`;
     }
+    if (key.startsWith("/")) {
+        return `${classPrefix}${key}`;
+    }
     return `${classPrefix}-${key}`;
 }

package/lib/util/negateValue.js

@@ -2,18 +2,35 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-function _default(value) {
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return negateValue;
+    }
+});
+function negateValue(value) {
     value = `${value}`;
-    if (value === '0') {
-        return '0';
+    if (value === "0") {
+        return "0";
     }
     // Flip sign of numbers
     if (/^[+-]?(\d+|\d*\.\d+)(e[+-]?\d+)?(%|\w+)?$/.test(value)) {
-        return value.replace(/^[+-]?/, (sign)=>sign === '-' ? '' : '-'
-        );
+        return value.replace(/^[+-]?/, (sign)=>sign === "-" ? "" : "-");
     }
-    if (value.includes('var(') || value.includes('calc(')) {
-        return `calc(${value} * -1)`;
+    // What functions we support negating numeric values for
+    // var() isn't inherently a numeric function but we support it anyway
+    // The trigonometric functions are omitted because you'll need to use calc(…) with them _anyway_
+    // to produce generally useful results and that will be covered already
+    let numericFunctions = [
+        "var",
+        "calc",
+        "min",
+        "max",
+        "clamp"
+    ];
+    for (const fn of numericFunctions){
+        if (value.includes(`${fn}(`)) {
+            return `calc(${value} * -1)`;
+        }
     }
 }

package/lib/util/normalizeConfig.js

@@ -2,12 +2,52 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.normalizeConfig = normalizeConfig;
-var _log = _interopRequireDefault(require("./log"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
+Object.defineProperty(exports, "normalizeConfig", {
+    enumerable: true,
+    get: function() {
+        return normalizeConfig;
+    }
+});
+const _featureFlags = require("../featureFlags");
+const _log = /*#__PURE__*/ _interop_require_wildcard(require("./log"));
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && 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;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 function normalizeConfig(config) {
     // Quick structure validation
@@ -34,45 +74,45 @@ 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) {
-            // Only `files`, `extract` and `transform` can exist in `config.content`
+        if (typeof config.content === "object" && config.content !== null) {
+            // Only `files`, `relative`, `extract`, and `transform` can exist in `config.content`
             if (Object.keys(config.content).some((key)=>![
-                    'files',
-                    'extract',
-                    'transform'
-                ].includes(key)
-            )) {
+                    "files",
+                    "relative",
+                    "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;
@@ -80,23 +120,27 @@ 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;
+                }
+                // `config.content.relative` is optional and can be a boolean
+                if (typeof config.content.relative !== "boolean" && typeof config.content.relative !== "undefined") {
                     return false;
                 }
             }
@@ -105,34 +149,57 @@ 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.'
+        _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`
     config.safelist = (()=>{
-        var ref;
+        var _purge_options;
         let { content , purge , safelist  } = config;
         if (Array.isArray(safelist)) return safelist;
         if (Array.isArray(content === null || content === void 0 ? void 0 : content.safelist)) return content.safelist;
         if (Array.isArray(purge === null || purge === void 0 ? void 0 : purge.safelist)) return purge.safelist;
-        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;
+        if (Array.isArray(purge === null || purge === void 0 ? void 0 : (_purge_options = purge.options) === null || _purge_options === void 0 ? void 0 : _purge_options.safelist)) return purge.options.safelist;
+        return [];
+    })();
+    // Normalize the `blocklist`
+    config.blocklist = (()=>{
+        let { blocklist  } = config;
+        if (Array.isArray(blocklist)) {
+            if (blocklist.every((item)=>typeof item === "string")) {
+                return blocklist;
+            }
+            _log.default.warn("blocklist-invalid", [
+                "The `blocklist` option must be an array of strings.",
+                "https://tailwindcss.com/docs/content-configuration#discarding-classes"
+            ]);
+        }
         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.'
+    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 : '';
+        var _config_prefix;
+        config.prefix = (_config_prefix = config.prefix) !== null && _config_prefix !== void 0 ? _config_prefix : "";
     }
     // Normalize the `content`
     config.content = {
+        relative: (()=>{
+            let { content  } = config;
+            if (content === null || content === void 0 ? void 0 : content.relative) {
+                return content.relative;
+            }
+            return (0, _featureFlags.flagEnabled)(config, "relativeContentPathsByDefault");
+        })(),
         files: (()=>{
             let { content , purge  } = config;
             if (Array.isArray(purge)) return purge;
@@ -144,24 +211,22 @@ function normalizeConfig(config) {
         })(),
         extract: (()=>{
             let extract = (()=>{
-                var ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9;
-                if ((ref = config.purge) === null || ref === void 0 ? void 0 : ref.extract) return config.purge.extract;
-                if ((ref1 = config.content) === null || ref1 === void 0 ? void 0 : ref1.extract) return config.content.extract;
-                if ((ref2 = config.purge) === null || ref2 === void 0 ? void 0 : (ref3 = ref2.extract) === null || ref3 === void 0 ? void 0 : ref3.DEFAULT) return config.purge.extract.DEFAULT;
-                if ((ref4 = config.content) === null || ref4 === void 0 ? void 0 : (ref5 = ref4.extract) === null || ref5 === void 0 ? void 0 : ref5.DEFAULT) return config.content.extract.DEFAULT;
-                if ((ref6 = config.purge) === null || ref6 === void 0 ? void 0 : (ref7 = ref6.options) === null || ref7 === void 0 ? void 0 : ref7.extractors) return config.purge.options.extractors;
-                if ((ref8 = config.content) === null || ref8 === void 0 ? void 0 : (ref9 = ref8.options) === null || ref9 === void 0 ? void 0 : ref9.extractors) return config.content.options.extractors;
-                return {
-                };
+                var _config_purge, _config_content, _config_purge1, _config_purge_extract, _config_content1, _config_content_extract, _config_purge2, _config_purge_options, _config_content2, _config_content_options;
+                if ((_config_purge = config.purge) === null || _config_purge === void 0 ? void 0 : _config_purge.extract) return config.purge.extract;
+                if ((_config_content = config.content) === null || _config_content === void 0 ? void 0 : _config_content.extract) return config.content.extract;
+                if ((_config_purge1 = config.purge) === null || _config_purge1 === void 0 ? void 0 : (_config_purge_extract = _config_purge1.extract) === null || _config_purge_extract === void 0 ? void 0 : _config_purge_extract.DEFAULT) return config.purge.extract.DEFAULT;
+                if ((_config_content1 = config.content) === null || _config_content1 === void 0 ? void 0 : (_config_content_extract = _config_content1.extract) === null || _config_content_extract === void 0 ? void 0 : _config_content_extract.DEFAULT) return config.content.extract.DEFAULT;
+                if ((_config_purge2 = config.purge) === null || _config_purge2 === void 0 ? void 0 : (_config_purge_options = _config_purge2.options) === null || _config_purge_options === void 0 ? void 0 : _config_purge_options.extractors) return config.purge.options.extractors;
+                if ((_config_content2 = config.content) === null || _config_content2 === void 0 ? void 0 : (_config_content_options = _config_content2.options) === null || _config_content_options === void 0 ? void 0 : _config_content_options.extractors) return config.content.options.extractors;
+                return {};
             })();
-            let extractors = {
-            };
+            let extractors = {};
             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) {
+                var _config_purge, _config_purge_options, _config_content, _config_content_options;
+                if ((_config_purge = config.purge) === null || _config_purge === void 0 ? void 0 : (_config_purge_options = _config_purge.options) === null || _config_purge_options === void 0 ? void 0 : _config_purge_options.defaultExtractor) {
                     return config.purge.options.defaultExtractor;
                 }
-                if ((ref11 = config.content) === null || ref11 === void 0 ? void 0 : (ref12 = ref11.options) === null || ref12 === void 0 ? void 0 : ref12.defaultExtractor) {
+                if ((_config_content = config.content) === null || _config_content === void 0 ? void 0 : (_config_content_options = _config_content.options) === null || _config_content_options === void 0 ? void 0 : _config_content_options.defaultExtractor) {
                     return config.content.options.defaultExtractor;
                 }
                 return undefined;
@@ -170,7 +235,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 : []){
@@ -178,31 +243,40 @@ 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;
         })(),
         transform: (()=>{
             let transform = (()=>{
-                var ref, ref13, ref14, ref15, ref16, ref17;
-                if ((ref = config.purge) === null || ref === void 0 ? void 0 : ref.transform) return config.purge.transform;
-                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 {
-                };
+                var _config_purge, _config_content, _config_purge1, _config_purge_transform, _config_content1, _config_content_transform;
+                if ((_config_purge = config.purge) === null || _config_purge === void 0 ? void 0 : _config_purge.transform) return config.purge.transform;
+                if ((_config_content = config.content) === null || _config_content === void 0 ? void 0 : _config_content.transform) return config.content.transform;
+                if ((_config_purge1 = config.purge) === null || _config_purge1 === void 0 ? void 0 : (_config_purge_transform = _config_purge1.transform) === null || _config_purge_transform === void 0 ? void 0 : _config_purge_transform.DEFAULT) return config.purge.transform.DEFAULT;
+                if ((_config_content1 = config.content) === null || _config_content1 === void 0 ? void 0 : (_config_content_transform = _config_content1.transform) === null || _config_content_transform === void 0 ? void 0 : _config_content_transform.DEFAULT) return config.content.transform.DEFAULT;
+                return {};
             })();
-            let transformers = {
-            };
-            if (typeof transform === 'function') {
+            let transformers = {};
+            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;
         })()
     };
+    // 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", [
+                `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.`
+            ]);
+            break;
+        }
+    }
     return config;
 }