From 9dc51a8d5e0589ee25b0d4052521761f3471ed5c Mon Sep 17 00:00:00 2001
From: Florian Bouvot <florian@twee-b.fr>
Date: Wed, 27 Feb 2019 21:59:23 +0100
Subject: [PATCH 1/2] Add order utility

---
 defaultConfig.stub.js |  1 +
 defaultTheme.js       |  5 +++++
 src/corePlugins.js    |  1 +
 src/plugins/order.js  | 20 ++++++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 src/plugins/order.js

diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 7f3ad5edc..c36fb8610 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -28,6 +28,7 @@ module.exports = {
     flex: ['responsive'],
     flexGrow: ['responsive'],
     flexShrink: ['responsive'],
+    order: ['responsive'],
     float: ['responsive'],
     fontFamily: ['responsive'],
     fontWeight: ['responsive', 'hover', 'focus'],
diff --git a/defaultTheme.js b/defaultTheme.js
index b3d8d5fc7..97f7fbbce 100644
--- a/defaultTheme.js
+++ b/defaultTheme.js
@@ -322,5 +322,10 @@ module.exports = function() {
       '0': 0,
       default: 1,
     },
+    order: {
+      first: -1,
+      last: 1,
+      none: 0
+    },
   }
 }
diff --git a/src/corePlugins.js b/src/corePlugins.js
index a1a586194..4714d31c7 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -22,6 +22,7 @@ import alignContent from './plugins/alignContent'
 import flex from './plugins/flex'
 import flexGrow from './plugins/flexGrow'
 import flexShrink from './plugins/flexShrink'
+import order from './plugins/order'
 import float from './plugins/float'
 import fontFamily from './plugins/fontFamily'
 import fontWeight from './plugins/fontWeight'
diff --git a/src/plugins/order.js b/src/plugins/order.js
new file mode 100644
index 000000000..adaae9d28
--- /dev/null
+++ b/src/plugins/order.js
@@ -0,0 +1,20 @@
+import _ from 'lodash'
+
+export default function({ values, variants }) {
+  return function({ addUtilities, e }) {
+    addUtilities(
+      _.fromPairs(
+        _.map(values, (value, modifier) => {
+          const className = modifier === 'default' ? 'order' : `order-${modifier}`
+          return [
+            `.${e(className)}`,
+            {
+              'order': value,
+            },
+          ]
+        })
+      ),
+      variants
+    )
+  }
+}

From 3fa1a0054f547e32818746625480c51a0ded5e7e Mon Sep 17 00:00:00 2001
From: Florian Bouvot <florian@twee-b.fr>
Date: Wed, 27 Feb 2019 22:46:12 +0100
Subject: [PATCH 2/2] Fix order

---
 defaultTheme.js      |  2 +-
 src/corePlugins.js   |  1 +
 src/plugins/order.js | 26 ++++++++++++--------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/defaultTheme.js b/defaultTheme.js
index 97f7fbbce..62b0bce48 100644
--- a/defaultTheme.js
+++ b/defaultTheme.js
@@ -325,7 +325,7 @@ module.exports = function() {
     order: {
       first: -1,
       last: 1,
-      none: 0
+      none: 0,
     },
   }
 }
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 4714d31c7..a628e1325 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -105,6 +105,7 @@ export default function(config) {
     flex,
     flexGrow,
     flexShrink,
+    order,
     float,
     fontFamily,
     fontWeight,
diff --git a/src/plugins/order.js b/src/plugins/order.js
index adaae9d28..37d521d43 100644
--- a/src/plugins/order.js
+++ b/src/plugins/order.js
@@ -1,20 +1,18 @@
 import _ from 'lodash'
 
 export default function({ values, variants }) {
-  return function({ addUtilities, e }) {
-    addUtilities(
-      _.fromPairs(
-        _.map(values, (value, modifier) => {
-          const className = modifier === 'default' ? 'order' : `order-${modifier}`
-          return [
-            `.${e(className)}`,
-            {
-              'order': value,
-            },
-          ]
-        })
-      ),
-      variants
+  return function({ addUtilities }) {
+    const utilities = _.fromPairs(
+      _.map(values, (value, modifier) => {
+        return [
+          `.order-${modifier}`,
+          {
+            'order': value,
+          },
+        ]
+      })
     )
+
+    addUtilities(utilities, variants)
   }
 }