diff --git a/__tests__/defaultConfig.test.js b/__tests__/defaultConfig.test.js new file mode 100644 index 000000000..4596b71b7 --- /dev/null +++ b/__tests__/defaultConfig.test.js @@ -0,0 +1,5 @@ +import config from '../defaultConfig.js' + +test('the default config matches the stub', () => { + expect(config()).toEqual(require('../defaultConfig.stub.js')) +}) diff --git a/__tests__/importsConfig.test.js b/__tests__/importsConfig.test.js deleted file mode 100644 index be7df8a4b..000000000 --- a/__tests__/importsConfig.test.js +++ /dev/null @@ -1,7 +0,0 @@ -import tailwind from '../src/index' -import config from '../defaultConfig.js' - -test('it can accept a config file', () => { - tailwind('./defaultConfig.js') - expect(require('../defaultConfig.stub.js')).toEqual(config()) -}) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index d4e516918..a6df15958 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -818,11 +818,11 @@ module.exports = { /* |----------------------------------------------------------------------------- - | Options https://tailwindcss.com/docs/configuration#options + | Advanced Options https://tailwindcss.com/docs/configuration#options |----------------------------------------------------------------------------- | - | Here is where you can set your Tailwind configuration options. For more - | details about these options, visit the configuration options documentation. + | Here is where you can tweak advanced configuration options. We recommend + | leaving these options alone unless you absolutely need to change them. | */ diff --git a/src/lib/substituteTailwindUtilitiesAtRules.js b/src/lib/substituteTailwindUtilitiesAtRules.js index eb423cb7c..73f8061e4 100644 --- a/src/lib/substituteTailwindUtilitiesAtRules.js +++ b/src/lib/substituteTailwindUtilitiesAtRules.js @@ -1,4 +1,3 @@ -import _ from 'lodash' import postcss from 'postcss' import applyClassPrefix from '../util/applyClassPrefix' import generateModules from '../util/generateModules' @@ -16,7 +15,7 @@ export default function(config) { const utilities = generateModules(utilityModules, unwrappedConfig.modules, unwrappedConfig) - if (_.get(unwrappedConfig, 'options.important', false)) { + if (unwrappedConfig.options.important) { utilities.walkDecls(decl => (decl.important = true)) } @@ -24,7 +23,7 @@ export default function(config) { nodes: [...container(unwrappedConfig), ...utilities.nodes], }) - applyClassPrefix(tailwindClasses, _.get(unwrappedConfig, 'options.prefix', '')) + applyClassPrefix(tailwindClasses, unwrappedConfig.options.prefix) atRule.before(tailwindClasses) atRule.remove()