From 960275cc86bf62aabf69d9d3673575f1d12d5cb6 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 2 Mar 2018 10:46:19 -0500 Subject: [PATCH] Add container classes as utilities not components Just for now so that this feature can be introduced into the codebase without forcing a BC break. The container classes will eventually be moved to a built-in plugin that adds them as components. --- __tests__/fixtures/tailwind-input.css | 2 -- src/lib/substituteTailwindAtRules.js | 10 +--------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/__tests__/fixtures/tailwind-input.css b/__tests__/fixtures/tailwind-input.css index 53204f9fd..ac3999689 100644 --- a/__tests__/fixtures/tailwind-input.css +++ b/__tests__/fixtures/tailwind-input.css @@ -1,7 +1,5 @@ @tailwind preflight; -@tailwind components; - @tailwind utilities; @responsive { diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js index 374017d95..8fba3d8df 100644 --- a/src/lib/substituteTailwindAtRules.js +++ b/src/lib/substituteTailwindAtRules.js @@ -21,20 +21,12 @@ export default function(config) { } if (atRule.params === 'components') { - const tailwindComponentTree = postcss.root({ - nodes: container(unwrappedConfig), - }) - const pluginComponentTree = postcss.root({ nodes: pluginComponents, }) - prefixTree(tailwindComponentTree, unwrappedConfig.options.prefix) - - tailwindComponentTree.walk(node => (node.source = atRule.source)) pluginComponentTree.walk(node => (node.source = atRule.source)) - atRule.before(tailwindComponentTree) atRule.before(pluginComponentTree) atRule.remove() } @@ -47,7 +39,7 @@ export default function(config) { } const tailwindUtilityTree = postcss.root({ - nodes: utilities.nodes, + nodes: [...container(unwrappedConfig), ...utilities.nodes], }) const pluginUtilityTree = postcss.root({