From d969096c297f4ed7ce01d9f7b954e0eb99d76563 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Wed, 9 Jan 2019 21:34:04 -0500
Subject: [PATCH] Port borderStyle module to plugin

---
 src/defaultPlugins.js         |  2 ++
 src/generators/borderStyle.js | 18 ------------------
 src/plugins/borderStyle.js    | 18 ++++++++++++++++++
 src/utilityModules.js         |  2 --
 4 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 src/generators/borderStyle.js
 create mode 100644 src/plugins/borderStyle.js

diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index 540bbcde1..6d0285e02 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import borderStyle from './plugins/borderStyle'
 import borderWidths from './plugins/borderWidths'
 import cursor from './plugins/cursor'
 import display from './plugins/display'
@@ -40,6 +41,7 @@ import zIndex from './plugins/zIndex'
 
 export default function (config) {
   return [
+    config.modules.borderStyle === false ? () => {} : borderStyle(),
     config.modules.borderWidths === false ? () => {} : borderWidths(),
     config.modules.cursor === false ? () => {} : cursor(),
     config.modules.display === false ? () => {} : display(),
diff --git a/src/generators/borderStyle.js b/src/generators/borderStyle.js
deleted file mode 100644
index 3dfca388c..000000000
--- a/src/generators/borderStyle.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return defineClasses({
-    'border-solid': {
-      'border-style': 'solid',
-    },
-    'border-dashed': {
-      'border-style': 'dashed',
-    },
-    'border-dotted': {
-      'border-style': 'dotted',
-    },
-    'border-none': {
-      'border-style': 'none',
-    },
-  })
-}
diff --git a/src/plugins/borderStyle.js b/src/plugins/borderStyle.js
new file mode 100644
index 000000000..50134739c
--- /dev/null
+++ b/src/plugins/borderStyle.js
@@ -0,0 +1,18 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+      '.border-solid': {
+        'border-style': 'solid',
+      },
+      '.border-dashed': {
+        'border-style': 'dashed',
+      },
+      '.border-dotted': {
+        'border-style': 'dotted',
+      },
+      '.border-none': {
+        'border-style': 'none',
+      },
+    }, config('modules.borderStyle'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 44b35466c..302cba240 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -8,7 +8,6 @@ import backgroundSize from './generators/backgroundSize'
 import borderCollapse from './generators/borderCollapse'
 import borderColors from './generators/borderColors'
 import borderRadius from './generators/borderRadius'
-import borderStyle from './generators/borderStyle'
 
 export default [
   { name: 'lists', generator: lists },
@@ -21,5 +20,4 @@ export default [
   { name: 'borderCollapse', generator: borderCollapse },
   { name: 'borderColors', generator: borderColors },
   { name: 'borderRadius', generator: borderRadius },
-  { name: 'borderStyle', generator: borderStyle },
 ]