tailwindcss 0.0.0-insiders.fda68f7 → 0.0.0-oxide.6bf5e56

package/lib/util/resolveConfig.js

@@ -1,289 +1,254 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = resolveConfig;
-
-var _negateValue = _interopRequireDefault(require("./negateValue"));
-
-var _corePluginList = _interopRequireDefault(require("../corePluginList"));
-
-var _configurePlugins = _interopRequireDefault(require("./configurePlugins"));
-
-var _defaultConfig = _interopRequireDefault(require("../../stubs/defaultConfig.stub"));
-
-var _colors = _interopRequireDefault(require("../../colors"));
-
-var _log = _interopRequireDefault(require("./log"));
-
-var _defaults = require("./defaults");
-
-var _toPath = require("./toPath");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function isFunction(input) {
-  return typeof input === 'function';
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>resolveConfig
+});
+const _negateValue = /*#__PURE__*/ _interopRequireDefault(require("./negateValue"));
+const _corePluginList = /*#__PURE__*/ _interopRequireDefault(require("../corePluginList"));
+const _configurePlugins = /*#__PURE__*/ _interopRequireDefault(require("./configurePlugins"));
+const _colors = /*#__PURE__*/ _interopRequireDefault(require("../public/colors"));
+const _defaults = require("./defaults");
+const _toPath = require("./toPath");
+const _normalizeConfig = require("./normalizeConfig");
+const _isPlainObject = /*#__PURE__*/ _interopRequireDefault(require("./isPlainObject"));
+const _cloneDeep = require("./cloneDeep");
+const _pluginUtils = require("./pluginUtils");
+const _withAlphaVariable = require("./withAlphaVariable");
+const _toColorValue = /*#__PURE__*/ _interopRequireDefault(require("./toColorValue"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
 }
-
-function isObject(input) {
-  return typeof input === 'object' && input !== null;
+function isFunction(input) {
+    return typeof input === "function";
 }
-
 function mergeWith(target, ...sources) {
-  let customizer = sources.pop();
-
-  for (let source of sources) {
-    for (let k in source) {
-      let merged = customizer(target[k], source[k]);
-
-      if (merged === undefined) {
-        if (isObject(target[k]) && isObject(source[k])) {
-          target[k] = mergeWith(target[k], source[k], customizer);
-        } else {
-          target[k] = source[k];
+    let customizer = sources.pop();
+    for (let source of sources){
+        for(let k in source){
+            let merged = customizer(target[k], source[k]);
+            if (merged === undefined) {
+                if ((0, _isPlainObject.default)(target[k]) && (0, _isPlainObject.default)(source[k])) {
+                    target[k] = mergeWith({}, target[k], source[k], customizer);
+                } else {
+                    target[k] = source[k];
+                }
+            } else {
+                target[k] = merged;
+            }
         }
-      } else {
-        target[k] = merged;
-      }
     }
-  }
-
-  return target;
+    return target;
 }
-
 const configUtils = {
-  colors: _colors.default,
-
-  negative(scale) {
-    return Object.keys(scale).filter(key => scale[key] !== '0').reduce((negativeScale, key) => ({ ...negativeScale,
-      [`-${key}`]: (0, _negateValue.default)(scale[key])
-    }), {});
-  },
-
-  breakpoints(screens) {
-    return Object.keys(screens).filter(key => typeof screens[key] === 'string').reduce((breakpoints, key) => ({ ...breakpoints,
-      [`screen-${key}`]: screens[key]
-    }), {});
-  }
-
+    colors: _colors.default,
+    negative (scale) {
+        // TODO: Log that this function isn't really needed anymore?
+        return Object.keys(scale).filter((key)=>scale[key] !== "0").reduce((negativeScale, key)=>{
+            let negativeValue = (0, _negateValue.default)(scale[key]);
+            if (negativeValue !== undefined) {
+                negativeScale[`-${key}`] = negativeValue;
+            }
+            return negativeScale;
+        }, {});
+    },
+    breakpoints (screens) {
+        return Object.keys(screens).filter((key)=>typeof screens[key] === "string").reduce((breakpoints, key)=>({
+                ...breakpoints,
+                [`screen-${key}`]: screens[key]
+            }), {});
+    }
 };
-
 function value(valueToResolve, ...args) {
-  return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve;
+    return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve;
 }
-
 function collectExtends(items) {
-  return items.reduce((merged, {
-    extend
-  }) => {
-    return mergeWith(merged, extend, (mergedValue, extendValue) => {
-      if (mergedValue === undefined) {
-        return [extendValue];
-      }
-
-      if (Array.isArray(mergedValue)) {
-        return [extendValue, ...mergedValue];
-      }
-
-      return [extendValue, mergedValue];
-    });
-  }, {});
+    return items.reduce((merged, { extend  })=>{
+        return mergeWith(merged, extend, (mergedValue, extendValue)=>{
+            if (mergedValue === undefined) {
+                return [
+                    extendValue
+                ];
+            }
+            if (Array.isArray(mergedValue)) {
+                return [
+                    extendValue,
+                    ...mergedValue
+                ];
+            }
+            return [
+                extendValue,
+                mergedValue
+            ];
+        });
+    }, {});
 }
-
 function mergeThemes(themes) {
-  return { ...themes.reduce((merged, theme) => (0, _defaults.defaults)(merged, theme), {}),
-    // In order to resolve n config objects, we combine all of their `extend` properties
-    // into arrays instead of objects so they aren't overridden.
-    extend: collectExtends(themes)
-  };
+    return {
+        ...themes.reduce((merged, theme)=>(0, _defaults.defaults)(merged, theme), {}),
+        // In order to resolve n config objects, we combine all of their `extend` properties
+        // into arrays instead of objects so they aren't overridden.
+        extend: collectExtends(themes)
+    };
 }
-
 function mergeExtensionCustomizer(merged, value) {
-  // When we have an array of objects, we do want to merge it
-  if (Array.isArray(merged) && isObject(merged[0])) {
-    return merged.concat(value);
-  } // When the incoming value is an array, and the existing config is an object, prepend the existing object
-
-
-  if (Array.isArray(value) && isObject(value[0]) && isObject(merged)) {
-    return [merged, ...value];
-  } // Override arrays (for example for font-families, box-shadows, ...)
-
-
-  if (Array.isArray(value)) {
-    return value;
-  } // Execute default behaviour
-
-
-  return undefined;
+    // When we have an array of objects, we do want to merge it
+    if (Array.isArray(merged) && (0, _isPlainObject.default)(merged[0])) {
+        return merged.concat(value);
+    }
+    // When the incoming value is an array, and the existing config is an object, prepend the existing object
+    if (Array.isArray(value) && (0, _isPlainObject.default)(value[0]) && (0, _isPlainObject.default)(merged)) {
+        return [
+            merged,
+            ...value
+        ];
+    }
+    // Override arrays (for example for font-families, box-shadows, ...)
+    if (Array.isArray(value)) {
+        return value;
+    }
+    // Execute default behaviour
+    return undefined;
+}
+function mergeExtensions({ extend , ...theme }) {
+    return mergeWith(theme, extend, (themeValue, extensions)=>{
+        // The `extend` property is an array, so we need to check if it contains any functions
+        if (!isFunction(themeValue) && !extensions.some(isFunction)) {
+            return mergeWith({}, themeValue, ...extensions, mergeExtensionCustomizer);
+        }
+        return (resolveThemePath, utils)=>mergeWith({}, ...[
+                themeValue,
+                ...extensions
+            ].map((e)=>value(e, resolveThemePath, utils)), mergeExtensionCustomizer);
+    });
 }
-
-function mergeExtensions({
-  extend,
-  ...theme
-}) {
-  return mergeWith(theme, extend, (themeValue, extensions) => {
-    // The `extend` property is an array, so we need to check if it contains any functions
-    if (!isFunction(themeValue) && !extensions.some(isFunction)) {
-      return mergeWith({}, themeValue, ...extensions, mergeExtensionCustomizer);
+/**
+ *
+ * @param {string} key
+ * @return {Iterable<string[] & {alpha: string | undefined}>}
+ */ function* toPaths(key) {
+    let path = (0, _toPath.toPath)(key);
+    if (path.length === 0) {
+        return;
+    }
+    yield path;
+    if (Array.isArray(key)) {
+        return;
+    }
+    let pattern = /^(.*?)\s*\/\s*([^/]+)$/;
+    let matches = key.match(pattern);
+    if (matches !== null) {
+        let [, prefix, alpha] = matches;
+        let newPath = (0, _toPath.toPath)(prefix);
+        newPath.alpha = alpha;
+        yield newPath;
     }
-
-    return (resolveThemePath, utils) => mergeWith({}, ...[themeValue, ...extensions].map(e => value(e, resolveThemePath, utils)), mergeExtensionCustomizer);
-  });
 }
-
 function resolveFunctionKeys(object) {
-  const resolvePath = (key, defaultValue) => {
-    const path = (0, _toPath.toPath)(key);
-    let index = 0;
-    let val = object;
-
-    while (val !== undefined && val !== null && index < path.length) {
-      val = val[path[index++]];
-      val = isFunction(val) ? val(resolvePath, configUtils) : val;
-    }
-
-    return val === undefined ? defaultValue : val;
-  };
-
-  resolvePath.theme = resolvePath;
-
-  for (let key in configUtils) {
-    resolvePath[key] = configUtils[key];
-  }
-
-  return Object.keys(object).reduce((resolved, key) => {
-    return { ...resolved,
-      [key]: isFunction(object[key]) ? object[key](resolvePath, configUtils) : object[key]
+    // theme('colors.red.500 / 0.5') -> ['colors', 'red', '500 / 0', '5]
+    const resolvePath = (key, defaultValue)=>{
+        for (const path of toPaths(key)){
+            let index = 0;
+            let val = object;
+            while(val !== undefined && val !== null && index < path.length){
+                val = val[path[index++]];
+                let shouldResolveAsFn = isFunction(val) && (path.alpha === undefined || index <= path.length - 1);
+                val = shouldResolveAsFn ? val(resolvePath, configUtils) : val;
+            }
+            if (val !== undefined) {
+                if (path.alpha !== undefined) {
+                    let normalized = (0, _pluginUtils.parseColorFormat)(val);
+                    return (0, _withAlphaVariable.withAlphaValue)(normalized, path.alpha, (0, _toColorValue.default)(normalized));
+                }
+                if ((0, _isPlainObject.default)(val)) {
+                    return (0, _cloneDeep.cloneDeep)(val);
+                }
+                return val;
+            }
+        }
+        return defaultValue;
     };
-  }, {});
+    Object.assign(resolvePath, {
+        theme: resolvePath,
+        ...configUtils
+    });
+    return Object.keys(object).reduce((resolved, key)=>{
+        resolved[key] = isFunction(object[key]) ? object[key](resolvePath, configUtils) : object[key];
+        return resolved;
+    }, {});
 }
-
 function extractPluginConfigs(configs) {
-  let allConfigs = [];
-  configs.forEach(config => {
-    var _config$plugins;
-
-    allConfigs = [...allConfigs, config];
-    const plugins = (_config$plugins = config === null || config === void 0 ? void 0 : config.plugins) !== null && _config$plugins !== void 0 ? _config$plugins : [];
-
-    if (plugins.length === 0) {
-      return;
-    }
-
-    plugins.forEach(plugin => {
-      var _plugin$config, _plugin;
-
-      if (plugin.__isOptionsFunction) {
-        plugin = plugin();
-      }
-
-      allConfigs = [...allConfigs, ...extractPluginConfigs([(_plugin$config = (_plugin = plugin) === null || _plugin === void 0 ? void 0 : _plugin.config) !== null && _plugin$config !== void 0 ? _plugin$config : {}])];
+    let allConfigs = [];
+    configs.forEach((config)=>{
+        allConfigs = [
+            ...allConfigs,
+            config
+        ];
+        var ref;
+        const plugins = (ref = config === null || config === void 0 ? void 0 : config.plugins) !== null && ref !== void 0 ? ref : [];
+        if (plugins.length === 0) {
+            return;
+        }
+        plugins.forEach((plugin)=>{
+            if (plugin.__isOptionsFunction) {
+                plugin = plugin();
+            }
+            var ref;
+            allConfigs = [
+                ...allConfigs,
+                ...extractPluginConfigs([
+                    (ref = plugin === null || plugin === void 0 ? void 0 : plugin.config) !== null && ref !== void 0 ? ref : {}
+                ])
+            ];
+        });
     });
-  });
-  return allConfigs;
+    return allConfigs;
 }
-
 function resolveCorePlugins(corePluginConfigs) {
-  const result = [...corePluginConfigs].reduceRight((resolved, corePluginConfig) => {
-    if (isFunction(corePluginConfig)) {
-      return corePluginConfig({
-        corePlugins: resolved
-      });
-    }
-
-    return (0, _configurePlugins.default)(corePluginConfig, resolved);
-  }, _corePluginList.default);
-  return result;
+    const result = [
+        ...corePluginConfigs
+    ].reduceRight((resolved, corePluginConfig)=>{
+        if (isFunction(corePluginConfig)) {
+            return corePluginConfig({
+                corePlugins: resolved
+            });
+        }
+        return (0, _configurePlugins.default)(corePluginConfig, resolved);
+    }, _corePluginList.default);
+    return result;
 }
-
 function resolvePluginLists(pluginLists) {
-  const result = [...pluginLists].reduceRight((resolved, pluginList) => {
-    return [...resolved, ...pluginList];
-  }, []);
-  return result;
+    const result = [
+        ...pluginLists
+    ].reduceRight((resolved, pluginList)=>{
+        return [
+            ...resolved,
+            ...pluginList
+        ];
+    }, []);
+    return result;
 }
-
 function resolveConfig(configs) {
-  let allConfigs = [...extractPluginConfigs(configs), {
-    prefix: '',
-    important: false,
-    separator: ':',
-    variantOrder: _defaultConfig.default.variantOrder
-  }];
-  return normalizeConfig((0, _defaults.defaults)({
-    theme: resolveFunctionKeys(mergeExtensions(mergeThemes(allConfigs.map(t => {
-      var _t$theme;
-
-      return (_t$theme = t === null || t === void 0 ? void 0 : t.theme) !== null && _t$theme !== void 0 ? _t$theme : {};
-    })))),
-    corePlugins: resolveCorePlugins(allConfigs.map(c => c.corePlugins)),
-    plugins: resolvePluginLists(configs.map(c => {
-      var _c$plugins;
-
-      return (_c$plugins = c === null || c === void 0 ? void 0 : c.plugins) !== null && _c$plugins !== void 0 ? _c$plugins : [];
-    }))
-  }, ...allConfigs));
-}
-
-let warnedAbout = new Set();
-
-function normalizeConfig(config) {
-  var _config$content, _config$purge, _config$content2, _config$purge2, _config$content3, _config$purge3;
-
-  if (!warnedAbout.has('purge-deprecation') && config.hasOwnProperty('purge')) {
-    _log.default.warn(['The `purge` option in your tailwind.config.js file has been deprecated.', 'Please rename this to `content` instead.']);
-
-    warnedAbout.add('purge-deprecation');
-  }
-
-  config.content = {
-    content: (() => {
-      let {
-        content,
-        purge
-      } = config;
-      if (Array.isArray(purge)) return purge;
-      if (Array.isArray(purge === null || purge === void 0 ? void 0 : purge.content)) return purge.content;
-      if (Array.isArray(content)) return content;
-      if (Array.isArray(content === null || content === void 0 ? void 0 : content.content)) return content.content;
-      return [];
-    })(),
-    safelist: (() => {
-      let {
-        content,
-        purge
-      } = config;
-
-      let [safelistKey, safelistPaths] = (() => {
-        var _purge$options;
-
-        if (Array.isArray(content === null || content === void 0 ? void 0 : content.safelist)) return ['content.safelist', content.safelist];
-        if (Array.isArray(purge === null || purge === void 0 ? void 0 : purge.safelist)) return ['purge.safelist', purge.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', purge.options.safelist];
-        return [null, []];
-      })();
-
-      return safelistPaths.map(content => {
-        if (typeof content === 'string') {
-          return {
-            raw: content,
-            extension: 'html'
-          };
-        }
-
-        if (content instanceof RegExp) {
-          throw new Error(`Values inside '${safelistKey}' can only be of type 'string', found 'regex'.`);
+    let allConfigs = [
+        ...extractPluginConfigs(configs),
+        {
+            prefix: "",
+            important: false,
+            separator: ":"
         }
-
-        throw new Error(`Values inside '${safelistKey}' can only be of type 'string', found '${typeof content}'.`);
-      });
-    })(),
-    extract: ((_config$content = config.content) === null || _config$content === void 0 ? void 0 : _config$content.extract) || ((_config$purge = config.purge) === null || _config$purge === void 0 ? void 0 : _config$purge.extract) || {},
-    options: ((_config$content2 = config.content) === null || _config$content2 === void 0 ? void 0 : _config$content2.options) || ((_config$purge2 = config.purge) === null || _config$purge2 === void 0 ? void 0 : _config$purge2.options) || {},
-    transform: ((_config$content3 = config.content) === null || _config$content3 === void 0 ? void 0 : _config$content3.transform) || ((_config$purge3 = config.purge) === null || _config$purge3 === void 0 ? void 0 : _config$purge3.transform) || {}
-  };
-  return config;
-}
+    ];
+    var ref, ref1;
+    return (0, _normalizeConfig.normalizeConfig)((0, _defaults.defaults)({
+        theme: resolveFunctionKeys(mergeExtensions(mergeThemes(allConfigs.map((t)=>{
+            return (ref = t === null || t === void 0 ? void 0 : t.theme) !== null && ref !== void 0 ? ref : {};
+        })))),
+        corePlugins: resolveCorePlugins(allConfigs.map((c)=>c.corePlugins)),
+        plugins: resolvePluginLists(configs.map((c)=>{
+            return (ref1 = c === null || c === void 0 ? void 0 : c.plugins) !== null && ref1 !== void 0 ? ref1 : [];
+        }))
+    }, ...allConfigs));
+}

package/lib/util/resolveConfigPath.js

@@ -1,59 +1,54 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = resolveConfigPath;
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>resolveConfigPath
+});
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function isObject(value) {
-  return typeof value === 'object' && value !== null;
+    return typeof value === "object" && value !== null;
 }
-
 function isEmpty(obj) {
-  return Object.keys(obj).length === 0;
+    return Object.keys(obj).length === 0;
 }
-
 function isString(value) {
-  return typeof value === 'string' || value instanceof String;
+    return typeof value === "string" || value instanceof String;
 }
-
 function resolveConfigPath(pathOrConfig) {
-  // require('tailwindcss')({ theme: ..., variants: ... })
-  if (isObject(pathOrConfig) && pathOrConfig.config === undefined && !isEmpty(pathOrConfig)) {
+    // require('tailwindcss')({ theme: ..., variants: ... })
+    if (isObject(pathOrConfig) && pathOrConfig.config === undefined && !isEmpty(pathOrConfig)) {
+        return null;
+    }
+    // require('tailwindcss')({ config: 'custom-config.js' })
+    if (isObject(pathOrConfig) && pathOrConfig.config !== undefined && isString(pathOrConfig.config)) {
+        return _path.default.resolve(pathOrConfig.config);
+    }
+    // require('tailwindcss')({ config: { theme: ..., variants: ... } })
+    if (isObject(pathOrConfig) && pathOrConfig.config !== undefined && isObject(pathOrConfig.config)) {
+        return null;
+    }
+    // require('tailwindcss')('custom-config.js')
+    if (isString(pathOrConfig)) {
+        return _path.default.resolve(pathOrConfig);
+    }
+    // require('tailwindcss')
+    for (const configFile of [
+        "./tailwind.config.js",
+        "./tailwind.config.cjs"
+    ]){
+        try {
+            const configPath = _path.default.resolve(configFile);
+            _fs.default.accessSync(configPath);
+            return configPath;
+        } catch (err) {}
+    }
     return null;
-  } // require('tailwindcss')({ config: 'custom-config.js' })
-
-
-  if (isObject(pathOrConfig) && pathOrConfig.config !== undefined && isString(pathOrConfig.config)) {
-    return _path.default.resolve(pathOrConfig.config);
-  } // require('tailwindcss')({ config: { theme: ..., variants: ... } })
-
-
-  if (isObject(pathOrConfig) && pathOrConfig.config !== undefined && isObject(pathOrConfig.config)) {
-    return null;
-  } // require('tailwindcss')('custom-config.js')
-
-
-  if (isString(pathOrConfig)) {
-    return _path.default.resolve(pathOrConfig);
-  } // require('tailwindcss')
-
-
-  for (const configFile of ['./tailwind.config.js', './tailwind.config.cjs']) {
-    try {
-      const configPath = _path.default.resolve(configFile);
-
-      _fs.default.accessSync(configPath);
-
-      return configPath;
-    } catch (err) {}
-  }
-
-  return null;
-}
+}

package/lib/util/responsive.js

@@ -1,18 +1,22 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = responsive;
-
-var _postcss = _interopRequireDefault(require("postcss"));
-
-var _cloneNodes = _interopRequireDefault(require("./cloneNodes"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>responsive
+});
+const _postcss = /*#__PURE__*/ _interopRequireDefault(require("postcss"));
+const _cloneNodes = /*#__PURE__*/ _interopRequireDefault(require("./cloneNodes"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function responsive(rules) {
-  return _postcss.default.atRule({
-    name: 'responsive'
-  }).append((0, _cloneNodes.default)(Array.isArray(rules) ? rules : [rules]));
-}
+    return _postcss.default.atRule({
+        name: "responsive"
+    }).append((0, _cloneNodes.default)(Array.isArray(rules) ? rules : [
+        rules
+    ]));
+}