From 24199b140f9be19f7b493c920d6d29d7808f2ec5 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Thu, 26 Oct 2017 09:29:23 -0400 Subject: [PATCH] Lazy load default config --- defaultConfig.js | 2 +- src/index.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaultConfig.js b/defaultConfig.js index db6736dbf..137b1a768 100644 --- a/defaultConfig.js +++ b/defaultConfig.js @@ -24,7 +24,7 @@ View the full documentation at https://tailwindcss.com. | */ -var defaultConfig = require('tailwindcss').defaultConfig +var defaultConfig = require('tailwindcss').defaultConfig() /* diff --git a/src/index.js b/src/index.js index 55881e16c..c431ef27d 100644 --- a/src/index.js +++ b/src/index.js @@ -5,8 +5,6 @@ import _ from 'lodash' import postcss from 'postcss' import stylefmt from 'stylefmt' -import defaultConfig from '../defaultConfig' - import substituteResetAtRule from './lib/substituteResetAtRule' import evaluateTailwindFunctions from './lib/evaluateTailwindFunctions' import generateUtilities from './lib/generateUtilities' @@ -16,7 +14,11 @@ import substituteResponsiveAtRules from './lib/substituteResponsiveAtRules' import substituteScreenAtRules from './lib/substituteScreenAtRules' import substituteClassApplyAtRules from './lib/substituteClassApplyAtRules' -const plugin = postcss.plugin('tailwind', (config = defaultConfig) => { +const plugin = postcss.plugin('tailwind', (config) => { + if (_.isUndefined(config)) { + config = require('../defaultConfig') + } + if (_.isString(config)) { config = require(path.resolve(config)) } @@ -34,6 +36,8 @@ const plugin = postcss.plugin('tailwind', (config = defaultConfig) => { ]) }) -plugin.defaultConfig = _.cloneDeep(defaultConfig) +plugin.defaultConfig = function () { + _.cloneDeep(require('../defaultConfig')) +} module.exports = plugin