From 476b60c70b1ac293695cbf879032ef3bb29ca450 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 24 Nov 2017 14:14:04 -0500
Subject: [PATCH 1/3] Rename test to be more clear

---
 __tests__/defaultConfig.test.js | 5 +++++
 __tests__/importsConfig.test.js | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 __tests__/defaultConfig.test.js
 delete mode 100644 __tests__/importsConfig.test.js

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())
-})

From fd41fd1cae89982e2989b024d38955f5ccb7d17f Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 24 Nov 2017 14:14:20 -0500
Subject: [PATCH 2/3] Add messaging to indicate options are considered advanced
 configuration

---
 defaultConfig.stub.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index d6197596d..37d9862d9 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.
   |
   */
 

From e20f340ba52a0a68b0203ea759a1d0c9668adbce Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 24 Nov 2017 14:15:11 -0500
Subject: [PATCH 3/3] Remove redundant default fallbacks

---
 src/lib/substituteTailwindUtilitiesAtRules.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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()