Migrate borderColor

Author: adamwathan

src/corePlugins/borderColor.js

@@ -5,33 +5,28 @@ const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').defa
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
 const { asColor } = require('../pluginUtils')
 
-module.exports = function ({ jit: { theme, addUtilities, addVariant, e } }) {
+module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.borderColor)
 
-  addUtilities({
-    border: [
-      (modifier, { theme }) => {
-        if (modifier === 'DEFAULT') {
-          return []
-        }
+  matchUtilities({
+    border: (modifier, { theme }) => {
+      if (modifier === 'DEFAULT') {
+        return []
+      }
 
-        let value = asColor(modifier, colorPalette)
+      let value = asColor(modifier, colorPalette)
 
-        if (value === undefined) {
-          return []
-        }
+      if (value === undefined) {
+        return []
+      }
 
-        return [
-          [
-            nameClass('border', modifier),
-            withAlphaVariable({
-              color: colorPalette[modifier],
-              property: 'border-color',
-              variable: '--tw-border-opacity',
-            }),
-          ],
-        ]
-      },
-    ],
+      return {
+        [nameClass('border', modifier)]: withAlphaVariable({
+          color: colorPalette[modifier],
+          property: 'border-color',
+          variable: '--tw-border-opacity',
+        }),
+      }
+    },
   })
 }