tailwindcss 3.0.9 → 3.0.13

package/lib/css/preflight.css

@@ -9,7 +9,7 @@
   box-sizing: border-box; /* 1 */
   border-width: 0; /* 2 */
   border-style: solid; /* 2 */
-  border-color: currentColor; /* 2 */
+  border-color: theme('borderColor.DEFAULT', 'currentColor'); /* 2 */
 }
 
 ::before,

package/lib/featureFlags.js

@@ -13,9 +13,7 @@ function _interopRequireDefault(obj) {
     };
 }
 let defaults = {
-    // TODO: Drop this once we can safely rely on optimizeUniversalDefaults being
-    // the default.
-    optimizeUniversalDefaults: process.env.NODE_ENV === 'test' ? true : false
+    optimizeUniversalDefaults: false
 };
 let featureFlags = {
     future: [],
@@ -41,8 +39,7 @@ function experimentalFlagsEnabled(config) {
         return featureFlags.experimental;
     }
     var ref;
-    return Object.keys((ref = config === null || config === void 0 ? void 0 : config.experimental) !== null && ref !== void 0 ? ref : {
-    }).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]
+    return Object.keys((ref = config === null || config === void 0 ? void 0 : config.experimental) !== null && ref !== void 0 ? ref : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]
     );
 }
 function issueFlagNotices(config) {

package/lib/lib/expandApplyAtRules.js

@@ -75,45 +75,6 @@ function extractApplyCandidates(params) {
         false
     ];
 }
-function partitionApplyParents(root) {
-    let applyParents = new Set();
-    root.walkAtRules('apply', (rule)=>{
-        applyParents.add(rule.parent);
-    });
-    for (let rule1 of applyParents){
-        let nodeGroups = [];
-        let lastGroup = [];
-        for (let node of rule1.nodes){
-            if (node.type === 'atrule' && node.name === 'apply') {
-                if (lastGroup.length > 0) {
-                    nodeGroups.push(lastGroup);
-                    lastGroup = [];
-                }
-                nodeGroups.push([
-                    node
-                ]);
-            } else {
-                lastGroup.push(node);
-            }
-        }
-        if (lastGroup.length > 0) {
-            nodeGroups.push(lastGroup);
-        }
-        if (nodeGroups.length === 1) {
-            continue;
-        }
-        for (let group of [
-            ...nodeGroups
-        ].reverse()){
-            let newParent = rule1.clone({
-                nodes: []
-            });
-            newParent.append(group);
-            rule1.after(newParent);
-        }
-        rule1.remove();
-    }
-}
 function processApply(root, context) {
     let applyCandidates = new Set();
     // Collect all @apply rules and candidates
@@ -311,7 +272,6 @@ function processApply(root, context) {
 }
 function expandApplyAtRules(context) {
     return (root)=>{
-        partitionApplyParents(root);
         processApply(root, context);
     };
 }

package/lib/lib/expandTailwindAtRules.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = expandTailwindAtRules;
-exports.DEFAULTS_LAYER = void 0;
 var _quickLru = _interopRequireDefault(require("quick-lru"));
 var sharedState = _interopRequireWildcard(require("./sharedState"));
 var _generateRules = require("./generateRules");
@@ -19,13 +18,11 @@ function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
     } else {
-        var newObj = {
-        };
+        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) : {
-                    };
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
                     if (desc.get || desc.set) {
                         Object.defineProperty(newObj, key, desc);
                     } else {
@@ -133,8 +130,6 @@ function buildStylesheet(rules, context) {
     }
     return returnValue;
 }
-const DEFAULTS_LAYER = Symbol('defaults-layer');
-exports.DEFAULTS_LAYER = DEFAULTS_LAYER;
 function expandTailwindAtRules(context) {
     return (root)=>{
         let layerNodes = {
@@ -143,13 +138,15 @@ function expandTailwindAtRules(context) {
             utilities: null,
             variants: null
         };
-        // Make sure this file contains Tailwind directives. If not, we can save
-        // a lot of work and bail early. Also we don't have to register our touch
-        // file as a dependency since the output of this CSS does not depend on
-        // the source of any templates. Think Vue <style> blocks for example.
-        root.walkAtRules('tailwind', (rule)=>{
-            if (Object.keys(layerNodes).includes(rule.params)) {
-                layerNodes[rule.params] = rule;
+        root.walkAtRules((rule)=>{
+            // Make sure this file contains Tailwind directives. If not, we can save
+            // a lot of work and bail early. Also we don't have to register our touch
+            // file as a dependency since the output of this CSS does not depend on
+            // the source of any templates. Think Vue <style> blocks for example.
+            if (rule.name === 'tailwind') {
+                if (Object.keys(layerNodes).includes(rule.params)) {
+                    layerNodes[rule.params] = rule;
+                }
             }
         });
         if (Object.values(layerNodes).every((n)=>n === null
@@ -168,6 +165,7 @@ function expandTailwindAtRules(context) {
             let extractor = getExtractor(context.tailwindConfig, extension);
             getClassCandidates(transformer(content), extractor, candidates, seen);
         }
+        env.DEBUG && console.timeEnd('Reading changed files');
         // ---
         // Generate the actual CSS
         let classCacheCount = context.classCache.size;
@@ -190,23 +188,10 @@ function expandTailwindAtRules(context) {
         // Replace any Tailwind directives with generated CSS
         if (layerNodes.base) {
             layerNodes.base.before((0, _cloneNodes).default([
-                ...baseNodes
+                ...baseNodes,
+                ...defaultNodes
             ], layerNodes.base.source));
         }
-        // @defaults rules are unconditionally added first to ensure that
-        // using any utility that relies on defaults will work even when
-        // compiled in an isolated environment like CSS modules
-        if (context.tailwindConfig[DEFAULTS_LAYER] !== false) {
-            if (layerNodes.base) {
-                layerNodes.base.after((0, _cloneNodes).default([
-                    ...defaultNodes
-                ], root.source));
-            } else {
-                root.prepend((0, _cloneNodes).default([
-                    ...defaultNodes
-                ], root.source));
-            }
-        }
         if (layerNodes.base) {
             layerNodes.base.remove();
         }

package/lib/lib/generateRules.js

@@ -233,8 +233,7 @@ function applyVariant(variant, matches, context) {
     }
     return [];
 }
-function parseRules(rule, cache, options = {
-}) {
+function parseRules(rule, cache, options = {}) {
     // PostCSS node
     if (!(0, _isPlainObject).default(rule) && !Array.isArray(rule)) {
         return [

package/lib/lib/normalizeTailwindDirectives.js

@@ -12,7 +12,11 @@ function _interopRequireDefault(obj) {
 function normalizeTailwindDirectives(root) {
     let tailwindDirectives = new Set();
     let layerDirectives = new Set();
+    let applyDirectives = new Set();
     root.walkAtRules((atRule)=>{
+        if (atRule.name === 'apply') {
+            applyDirectives.add(atRule);
+        }
         if (atRule.name === 'import') {
             if (atRule.params === '"tailwindcss/base"' || atRule.params === "'tailwindcss/base'") {
                 atRule.name = 'tailwind';
@@ -72,5 +76,8 @@ function normalizeTailwindDirectives(root) {
             }
         }
     }
-    return tailwindDirectives;
+    return {
+        tailwindDirectives,
+        applyDirectives
+    };
 }

package/lib/lib/partitionApplyAtRules.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = expandApplyAtRules;
+function partitionRules(root) {
+    if (!root.walkAtRules) return;
+    let applyParents = new Set();
+    root.walkAtRules('apply', (rule)=>{
+        applyParents.add(rule.parent);
+    });
+    if (applyParents.size === 0) {
+        return;
+    }
+    for (let rule1 of applyParents){
+        let nodeGroups = [];
+        let lastGroup = [];
+        for (let node of rule1.nodes){
+            if (node.type === 'atrule' && node.name === 'apply') {
+                if (lastGroup.length > 0) {
+                    nodeGroups.push(lastGroup);
+                    lastGroup = [];
+                }
+                nodeGroups.push([
+                    node
+                ]);
+            } else {
+                lastGroup.push(node);
+            }
+        }
+        if (lastGroup.length > 0) {
+            nodeGroups.push(lastGroup);
+        }
+        if (nodeGroups.length === 1) {
+            continue;
+        }
+        for (let group of [
+            ...nodeGroups
+        ].reverse()){
+            let clone = rule1.clone({
+                nodes: []
+            });
+            clone.append(group);
+            rule1.after(clone);
+        }
+        rule1.remove();
+    }
+}
+function expandApplyAtRules() {
+    return (root)=>{
+        partitionRules(root);
+    };
+}

package/lib/lib/resolveDefaultsAtRules.js

@@ -109,11 +109,11 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                     selectors.add(selector);
                 }
             }
-            if (selectorGroups.size === 0) {
-                universal.remove();
-                continue;
-            }
             if ((0, _featureFlags).flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
+                if (selectorGroups.size === 0) {
+                    universal.remove();
+                    continue;
+                }
                 for (let [, selectors] of selectorGroups){
                     let universalRule = _postcss.default.rule();
                     universalRule.selectors = [

package/lib/lib/setupContextUtils.js

@@ -33,13 +33,11 @@ function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
     } else {
-        var newObj = {
-        };
+        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) : {
-                    };
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
                     if (desc.get || desc.set) {
                         Object.defineProperty(newObj, key, desc);
                     } else {
@@ -76,8 +74,7 @@ function isBalanced(input) {
     }
     return count === 0;
 }
-function insertInto(list, value, { before =[]  } = {
-}) {
+function insertInto(list, value, { before =[]  } = {}) {
     before = [].concat(before);
     if (before.length <= 0) {
         list.push(value);
@@ -112,44 +109,49 @@ function getClasses(selector) {
     });
     return parser.transformSync(selector);
 }
-function extractCandidates(node) {
+function extractCandidates(node, state = {
+    containsNonOnDemandable: false
+}, depth = 0) {
     let classes = [];
+    // Handle normal rules
     if (node.type === 'rule') {
         for (let selector of node.selectors){
             let classCandidates = getClasses(selector);
             // At least one of the selectors contains non-"on-demandable" candidates.
-            if (classCandidates.length === 0) return [];
-            classes = [
-                ...classes,
-                ...classCandidates
-            ];
+            if (classCandidates.length === 0) {
+                state.containsNonOnDemandable = true;
+            }
+            for (let classCandidate of classCandidates){
+                classes.push(classCandidate);
+            }
         }
-        return classes;
-    }
-    if (node.type === 'atrule') {
+    } else if (node.type === 'atrule') {
         node.walkRules((rule)=>{
-            classes = [
-                ...classes,
-                ...rule.selectors.flatMap((selector)=>getClasses(selector)
-                )
-            ];
+            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector, state, depth + 1)
+            )){
+                classes.push(classCandidate);
+            }
         });
     }
+    if (depth === 0) {
+        return [
+            state.containsNonOnDemandable || classes.length === 0,
+            classes
+        ];
+    }
     return classes;
 }
 function withIdentifiers(styles) {
     return parseStyles(styles).flatMap((node)=>{
         let nodeMap = new Map();
-        let candidates = extractCandidates(node);
-        // If this isn't "on-demandable", assign it a universal candidate.
-        if (candidates.length === 0) {
-            return [
-                [
-                    '*',
-                    node
-                ]
-            ];
+        let [containsNonOnDemandableSelectors, candidates] = extractCandidates(node);
+        // If this isn't "on-demandable", assign it a universal candidate to always include it.
+        if (containsNonOnDemandableSelectors) {
+            candidates.unshift('*');
         }
+        // However, it could be that it also contains "on-demandable" candidates.
+        // E.g.: `span, .foo {}`, in that case it should still be possible to use
+        // `@apply foo` for example.
         return candidates.map((c)=>{
             if (!nodeMap.has(node)) {
                 nodeMap.set(node, node);
@@ -178,8 +180,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         return context.tailwindConfig.prefix + identifier;
     }
     return {
-        addVariant (variantName, variantFunctions, options = {
-        }) {
+        addVariant (variantName, variantFunctions, options = {}) {
             variantFunctions = [].concat(variantFunctions).map((variantFunction)=>{
                 if (typeof variantFunction !== 'string') {
                     // Safelist public API functions
@@ -256,8 +257,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         },
         addBase (base) {
             for (let [identifier, rule] of withIdentifiers(base)){
-                let prefixedIdentifier = prefixIdentifier(identifier, {
-                });
+                let prefixedIdentifier = prefixIdentifier(identifier, {});
                 let offset = offsets.base++;
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
@@ -279,15 +279,13 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 [`@defaults ${group}`]: declarations
             };
             for (let [identifier, rule] of withIdentifiers(groups)){
-                let prefixedIdentifier = prefixIdentifier(identifier, {
-                });
-                let offset = offsets.base++;
+                let prefixedIdentifier = prefixIdentifier(identifier, {});
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
-                        sort: offset,
+                        sort: offsets.base++,
                         layer: 'defaults'
                     },
                     rule
@@ -299,19 +297,16 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 respectPrefix: true,
                 respectImportant: false
             };
-            options = Object.assign({
-            }, defaultOptions, Array.isArray(options) ? {
-            } : options);
+            options = Object.assign({}, defaultOptions, Array.isArray(options) ? {} : options);
             for (let [identifier, rule] of withIdentifiers(components)){
                 let prefixedIdentifier = prefixIdentifier(identifier, options);
-                let offset = offsets.components++;
                 classList.add(prefixedIdentifier);
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
-                        sort: offset,
+                        sort: offsets.components++,
                         layer: 'components',
                         options
                     },
@@ -324,19 +319,16 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 respectPrefix: true,
                 respectImportant: true
             };
-            options = Object.assign({
-            }, defaultOptions, Array.isArray(options) ? {
-            } : options);
+            options = Object.assign({}, defaultOptions, Array.isArray(options) ? {} : options);
             for (let [identifier, rule] of withIdentifiers(utilities)){
                 let prefixedIdentifier = prefixIdentifier(identifier, options);
-                let offset = offsets.utilities++;
                 classList.add(prefixedIdentifier);
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
-                        sort: offset,
+                        sort: offsets.utilities++,
                         layer: 'utilities',
                         options
                     },
@@ -463,11 +455,17 @@ function getFileModifiedMap(context) {
 function trackModified(files, fileModifiedMap) {
     let changed = false;
     for (let file of files){
+        var ref;
         if (!file) continue;
         let parsed = _url.default.parse(file);
         let pathname = parsed.hash ? parsed.href.replace(parsed.hash, '') : parsed.href;
         pathname = parsed.search ? pathname.replace(parsed.search, '') : pathname;
-        let newModified = _fs.default.statSync(decodeURIComponent(pathname)).mtimeMs;
+        let newModified = (ref = _fs.default.statSync(decodeURIComponent(pathname), {
+            throwIfNoEntry: false
+        })) === null || ref === void 0 ? void 0 : ref.mtimeMs;
+        if (!newModified) {
+            continue;
+        }
         if (!fileModifiedMap.has(file) || newModified > fileModifiedMap.get(file)) {
             changed = true;
         }
@@ -678,8 +676,7 @@ function registerPlugins(plugins, context) {
                 let utils = Array.isArray(util) ? (()=>{
                     let [utilName, options] = util;
                     var ref;
-                    let classes = Object.keys((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {
-                    }).map((value)=>(0, _nameClass).formatClass(utilName, value)
+                    let classes = Object.keys((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {}).map((value)=>(0, _nameClass).formatClass(utilName, value)
                     );
                     if (options === null || options === void 0 ? void 0 : options.supportsNegativeValues) {
                         classes = [
@@ -733,8 +730,7 @@ function registerPlugins(plugins, context) {
                 let [utilName, options] = util;
                 let negativeClasses = [];
                 var ref;
-                for (let [key, value] of Object.entries((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {
-                })){
+                for (let [key, value] of Object.entries((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {})){
                     output.push((0, _nameClass).formatClass(utilName, key));
                     if ((options === null || options === void 0 ? void 0 : options.supportsNegativeValues) && (0, _negateValue).default(value)) {
                         negativeClasses.push((0, _nameClass).formatClass(utilName, `-${key}`));

package/lib/lib/setupTrackingContext.js

@@ -119,16 +119,17 @@ function resolveChangedFiles(candidateFiles, fileModifiedMap) {
     return changedFiles;
 }
 function setupTrackingContext(configOrPath) {
-    return ({ tailwindDirectives , registerDependency  })=>{
+    return ({ tailwindDirectives , registerDependency , applyDirectives  })=>{
         return (root, result)=>{
             let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] = getTailwindConfig(configOrPath);
             let contextDependencies = new Set(configDependencies);
-            // If there are no @tailwind rules, we don't consider this CSS file or it's dependencies
-            // to be dependencies of the context. Can reuse the context even if they change.
-            // We may want to think about `@layer` being part of this trigger too, but it's tough
-            // because it's impossible for a layer in one file to end up in the actual @tailwind rule
-            // in another file since independent sources are effectively isolated.
-            if (tailwindDirectives.size > 0) {
+            // If there are no @tailwind or @apply rules, we don't consider this CSS
+            // file or its dependencies to be dependencies of the context. Can reuse
+            // the context even if they change. We may want to think about `@layer`
+            // being part of this trigger too, but it's tough because it's impossible
+            // for a layer in one file to end up in the actual @tailwind rule in
+            // another file since independent sources are effectively isolated.
+            if (tailwindDirectives.size > 0 || applyDirectives.size > 0) {
                 // Add current css file as a context dependencies.
                 contextDependencies.add(result.opts.from);
                 // Add all css @import dependencies as context dependencies.
@@ -140,12 +141,12 @@ function setupTrackingContext(configOrPath) {
             }
             let [context] = (0, _setupContextUtils).getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
             let candidateFiles = getCandidateFiles(context, tailwindConfig);
-            // If there are no @tailwind rules, we don't consider this CSS file or it's dependencies
-            // to be dependencies of the context. Can reuse the context even if they change.
+            // If there are no @tailwind or @apply rules, we don't consider this CSS file or it's
+            // dependencies to be dependencies of the context. Can reuse the context even if they change.
             // We may want to think about `@layer` being part of this trigger too, but it's tough
             // because it's impossible for a layer in one file to end up in the actual @tailwind rule
             // in another file since independent sources are effectively isolated.
-            if (tailwindDirectives.size > 0) {
+            if (tailwindDirectives.size > 0 || applyDirectives.size > 0) {
                 let fileModifiedMap = (0, _setupContextUtils).getFileModifiedMap(context);
                 // Add template paths as postcss dependencies.
                 for (let fileOrGlob of candidateFiles){

package/lib/processTailwindFeatures.js

@@ -11,6 +11,7 @@ var _substituteScreenAtRules = _interopRequireDefault(require("./lib/substituteS
 var _resolveDefaultsAtRules = _interopRequireDefault(require("./lib/resolveDefaultsAtRules"));
 var _collapseAdjacentRules = _interopRequireDefault(require("./lib/collapseAdjacentRules"));
 var _collapseDuplicateDeclarations = _interopRequireDefault(require("./lib/collapseDuplicateDeclarations"));
+var _partitionApplyAtRules = _interopRequireDefault(require("./lib/partitionApplyAtRules"));
 var _detectNesting = _interopRequireDefault(require("./lib/detectNesting"));
 var _setupContextUtils = require("./lib/setupContextUtils");
 var _featureFlags = require("./featureFlags");
@@ -21,9 +22,12 @@ function _interopRequireDefault(obj) {
 }
 function processTailwindFeatures(setupContext) {
     return function(root, result) {
-        let tailwindDirectives = (0, _normalizeTailwindDirectives).default(root);
+        let { tailwindDirectives , applyDirectives  } = (0, _normalizeTailwindDirectives).default(root);
+        (0, _detectNesting).default()(root, result);
+        (0, _partitionApplyAtRules).default()(root, result);
         let context = setupContext({
             tailwindDirectives,
+            applyDirectives,
             registerDependency (dependency) {
                 result.messages.push({
                     plugin: 'tailwindcss',
@@ -39,7 +43,6 @@ function processTailwindFeatures(setupContext) {
             throw new Error("The '-' character cannot be used as a custom separator in JIT mode due to parsing ambiguity. Please use another character like '_' instead.");
         }
         (0, _featureFlags).issueFlagNotices(context.tailwindConfig);
-        (0, _detectNesting).default(context)(root, result);
         (0, _expandTailwindAtRules).default(context)(root, result);
         (0, _expandApplyAtRules).default(context)(root, result);
         (0, _evaluateTailwindFunctions).default(context)(root, result);

package/lib/util/createPlugin.js

@@ -9,8 +9,7 @@ function createPlugin(plugin, config) {
         config
     };
 }
-createPlugin.withOptions = function(pluginFunction, configFunction = ()=>({
-    })
+createPlugin.withOptions = function(pluginFunction, configFunction = ()=>({})
 ) {
     const optionsFunction = function(options) {
         return {

package/lib/util/createUtilityPlugin.js

@@ -16,8 +16,7 @@ function createUtilityPlugin(themeKey, utilityVariations = [
             themeKey
         ]
     ]
-], { filterDefault =false , ...options } = {
-}) {
+], { filterDefault =false , ...options } = {}) {
     let transformValue = (0, _transformThemeValue).default(themeKey);
     return function({ matchUtilities , theme  }) {
         for (let utilityVariation of utilityVariations){
@@ -37,15 +36,12 @@ function createUtilityPlugin(themeKey, utilityVariations = [
                             return Object.assign(obj, {
                                 [name]: transformValue(value)
                             });
-                        }, {
-                        });
+                        }, {});
                     }
                 });
-            }, {
-            }), {
+            }, {}), {
                 ...options,
-                values: filterDefault ? Object.fromEntries(Object.entries((ref = theme(themeKey)) !== null && ref !== void 0 ? ref : {
-                }).filter(([modifier])=>modifier !== 'DEFAULT'
+                values: filterDefault ? Object.fromEntries(Object.entries((ref = theme(themeKey)) !== null && ref !== void 0 ? ref : {}).filter(([modifier])=>modifier !== 'DEFAULT'
                 )) : theme(themeKey)
             });
         }

package/lib/util/flattenColorPalette.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = void 0;
-const flattenColorPalette = (colors)=>Object.assign({
-    }, ...Object.entries(colors !== null && colors !== void 0 ? colors : {
-    }).flatMap(([color, values])=>typeof values == 'object' ? Object.entries(flattenColorPalette(values)).map(([number, hex])=>({
+const flattenColorPalette = (colors)=>Object.assign({}, ...Object.entries(colors !== null && colors !== void 0 ? colors : {}).flatMap(([color, values])=>typeof values == 'object' ? Object.entries(flattenColorPalette(values)).map(([number, hex])=>({
                 [color + (number === 'DEFAULT' ? '' : `-${number}`)]: hex
             })
         ) : [