From 944dd0016056c7415347a75b6f50aa71f47a2e7e Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 24 Nov 2017 12:08:43 -0500
Subject: [PATCH] Move modules key out of options and up to top level

---
 defaultConfig.stub.js                         | 98 +++++++++++--------
 src/lib/substituteTailwindUtilitiesAtRules.js |  6 +-
 2 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 691745127..5abf34d7d 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -757,6 +757,61 @@ module.exports = {
   },
 
 
+  /*
+  |-----------------------------------------------------------------------------
+  | Modules
+  |-----------------------------------------------------------------------------
+  |
+  | Here is where you control which modules are generated and what variants are
+  | generated for each of those modules.
+  |
+  */
+
+  modules: {
+    appearance: ['responsive'],
+    backgroundColors: ['responsive', 'hover'],
+    backgroundPosition: ['responsive'],
+    backgroundSize: ['responsive'],
+    borderColors: ['responsive', 'hover'],
+    borderRadius: ['responsive'],
+    borderStyle: ['responsive'],
+    borderWidths: ['responsive'],
+    cursor: ['responsive'],
+    display: ['responsive'],
+    flexbox: ['responsive'],
+    float: ['responsive'],
+    fonts: ['responsive'],
+    fontWeights: ['responsive', 'hover'],
+    height: ['responsive'],
+    leading: ['responsive'],
+    lists: ['responsive'],
+    margin: ['responsive'],
+    maxHeight: ['responsive'],
+    maxWidth: ['responsive'],
+    minHeight: ['responsive'],
+    minWidth: ['responsive'],
+    negativeMargin: ['responsive'],
+    opacity: ['responsive'],
+    overflow: ['responsive'],
+    padding: ['responsive'],
+    pointerEvents: ['responsive'],
+    position: ['responsive'],
+    resize: ['responsive'],
+    shadows: ['responsive'],
+    textAlign: ['responsive'],
+    textColors: ['responsive', 'hover'],
+    textSizes: ['responsive'],
+    textStyle: ['responsive', 'hover'],
+    tracking: ['responsive'],
+    userSelect: ['responsive'],
+    verticalAlign: ['responsive'],
+    visibility: ['responsive'],
+    whitespace: ['responsive'],
+    width: ['responsive'],
+    zIndex: ['responsive'],
+  },
+
+
   /*
   |-----------------------------------------------------------------------------
   | Options                  https://tailwindcss.com/docs/configuration#options
@@ -770,49 +825,6 @@ module.exports = {
   options: {
     prefix: '',
     important: false,
-    modules: {
-      appearance: ['responsive'],
-      backgroundColors: ['responsive', 'hover'],
-      backgroundPosition: ['responsive'],
-      backgroundSize: ['responsive'],
-      borderColors: ['responsive', 'hover'],
-      borderRadius: ['responsive'],
-      borderStyle: ['responsive'],
-      borderWidths: ['responsive'],
-      cursor: ['responsive'],
-      display: ['responsive'],
-      flexbox: ['responsive'],
-      float: ['responsive'],
-      fonts: ['responsive'],
-      fontWeights: ['responsive', 'hover'],
-      height: ['responsive'],
-      leading: ['responsive'],
-      lists: ['responsive'],
-      margin: ['responsive'],
-      maxHeight: ['responsive'],
-      maxWidth: ['responsive'],
-      minHeight: ['responsive'],
-      minWidth: ['responsive'],
-      negativeMargin: ['responsive'],
-      opacity: ['responsive'],
-      overflow: ['responsive'],
-      padding: ['responsive'],
-      pointerEvents: ['responsive'],
-      position: ['responsive'],
-      resize: ['responsive'],
-      shadows: ['responsive'],
-      textAlign: ['responsive'],
-      textColors: ['responsive', 'hover'],
-      textSizes: ['responsive'],
-      textStyle: ['responsive', 'hover'],
-      tracking: ['responsive'],
-      userSelect: ['responsive'],
-      verticalAlign: ['responsive'],
-      visibility: ['responsive'],
-      whitespace: ['responsive'],
-      width: ['responsive'],
-      zIndex: ['responsive'],
-    }
   },
 
 }
diff --git a/src/lib/substituteTailwindUtilitiesAtRules.js b/src/lib/substituteTailwindUtilitiesAtRules.js
index 67207a188..eb423cb7c 100644
--- a/src/lib/substituteTailwindUtilitiesAtRules.js
+++ b/src/lib/substituteTailwindUtilitiesAtRules.js
@@ -14,11 +14,7 @@ export default function(config) {
         return
       }
 
-      const utilities = generateModules(
-        utilityModules,
-        unwrappedConfig.options.modules,
-        unwrappedConfig
-      )
+      const utilities = generateModules(utilityModules, unwrappedConfig.modules, unwrappedConfig)
 
       if (_.get(unwrappedConfig, 'options.important', false)) {
         utilities.walkDecls(decl => (decl.important = true))