Fix style

adamwathan · adamwathan · commit d541742774a4 · 2021-04-02T14:34:50.000-04:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,7 +3,7 @@
     "jest": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": 2020,
     "sourceType": "module"
   },
   "extends": ["prettier"],
diff --git a/jit/corePlugins/animation.js b/jit/corePlugins/animation.js
@@ -2,9 +2,9 @@ const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('../../lib/util/transformThemeValue').default
 const parseAnimationValue = require('../../lib/util/parseAnimationValue').default
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities, theme }) {
   let keyframes = Object.fromEntries(
-    Object.entries(theme.keyframes).map(([key, value]) => {
+    Object.entries(theme('keyframes')).map(([key, value]) => {
       return [
         key,
         [
diff --git a/jit/corePlugins/backgroundColor.js b/jit/corePlugins/backgroundColor.js
@@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
 const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.backgroundColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('backgroundColor'))
 
   matchUtilities({
     bg: (modifier) => {
diff --git a/jit/corePlugins/backgroundImage.js b/jit/corePlugins/backgroundImage.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     bg: (modifier, { theme }) => {
       let value = theme.backgroundImage[modifier]
diff --git a/jit/corePlugins/backgroundOpacity.js b/jit/corePlugins/backgroundOpacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme, addVariant, e } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'bg-opacity': (modifier, { theme }) => {
       let value = asValue(modifier, theme.backgroundOpacity)
diff --git a/jit/corePlugins/backgroundPosition.js b/jit/corePlugins/backgroundPosition.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     bg: (modifier, { theme }) => {
       let value = theme.backgroundPosition[modifier]
diff --git a/jit/corePlugins/backgroundSize.js b/jit/corePlugins/backgroundSize.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     bg: (modifier, { theme }) => {
       let value = theme.backgroundSize[modifier]
diff --git a/jit/corePlugins/borderColor.js b/jit/corePlugins/borderColor.js
@@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
 const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.borderColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('borderColor'))
 
   matchUtilities({
     border: (modifier) => {
diff --git a/jit/corePlugins/borderOpacity.js b/jit/corePlugins/borderOpacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'border-opacity': (modifier, { theme }) => {
       let value = asValue(modifier, theme.borderOpacity)
diff --git a/jit/corePlugins/borderRadius.js b/jit/corePlugins/borderRadius.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     rounded: (modifier, { theme }) => {
       let value = asLength(modifier, theme['borderRadius'])
diff --git a/jit/corePlugins/borderWidth.js b/jit/corePlugins/borderWidth.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     border: (modifier, { theme }) => {
       let value = asLength(modifier, theme['borderWidth'])
diff --git a/jit/corePlugins/cursor.js b/jit/corePlugins/cursor.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     cursor: (modifier, { theme }) => {
       let value = asValue(modifier, theme.cursor)
diff --git a/jit/corePlugins/divideColor.js b/jit/corePlugins/divideColor.js
@@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
 const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.divideColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('divideColor'))
 
   // TODO: Make sure there is no issue with DEFAULT here
   matchUtilities({
diff --git a/jit/corePlugins/divideOpacity.js b/jit/corePlugins/divideOpacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'divide-opacity': (modifier, { theme }) => {
       let value = asValue(modifier, theme.divideOpacity)
diff --git a/jit/corePlugins/divideWidth.js b/jit/corePlugins/divideWidth.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ addUtilities, matchUtilities, jit: { theme } }) {
+module.exports = function ({ addUtilities, matchUtilities }) {
   matchUtilities({
     'divide-x': (modifier, { theme }) => {
       let value = asLength(modifier, theme['divideWidth'])
diff --git a/jit/corePlugins/fill.js b/jit/corePlugins/fill.js
@@ -1,13 +1,12 @@
 const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
-const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
 const toColorValue = require('../../lib/util/toColorValue').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.fill)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('fill'))
 
   matchUtilities({
-    fill: (modifier, { theme }) => {
+    fill: (modifier) => {
       let value = asColor(modifier, colorPalette)
 
       if (value === undefined) {
diff --git a/jit/corePlugins/flexGrow.js b/jit/corePlugins/flexGrow.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'flex-grow': (modifier, { theme }) => {
       let value = asValue(modifier, theme.flexGrow)
diff --git a/jit/corePlugins/flexShrink.js b/jit/corePlugins/flexShrink.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'flex-shrink': (modifier, { theme }) => {
       let value = asValue(modifier, theme.flexShrink)
diff --git a/jit/corePlugins/fontSize.js b/jit/corePlugins/fontSize.js
@@ -1,7 +1,7 @@
 const { asLength, nameClass } = require('../pluginUtils')
 const { isPlainObject } = require('../lib/utils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     text: (modifier, { theme }) => {
       let value = theme.fontSize[modifier]
diff --git a/jit/corePlugins/gap.js b/jit/corePlugins/gap.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     gap: (modifier, { theme }) => {
       let value = asLength(modifier, theme['gap'])
diff --git a/jit/corePlugins/gridAutoColumns.js b/jit/corePlugins/gridAutoColumns.js
@@ -1,6 +1,6 @@
 const { asList, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'auto-cols': (modifier, { theme }) => {
       let value = asList(modifier, theme.gridAutoColumns)
diff --git a/jit/corePlugins/gridAutoRows.js b/jit/corePlugins/gridAutoRows.js
@@ -1,6 +1,6 @@
 const { asList, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'auto-rows': (modifier, { theme }) => {
       let value = asList(modifier, theme.gridAutoRows)
diff --git a/jit/corePlugins/gridRowEnd.js b/jit/corePlugins/gridRowEnd.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'row-end': (modifier, { theme }) => {
       let value = theme.gridRowEnd[modifier]
diff --git a/jit/corePlugins/gridRowStart.js b/jit/corePlugins/gridRowStart.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'row-start': (modifier, { theme }) => {
       let value = theme.gridRowStart[modifier]
diff --git a/jit/corePlugins/gridTemplateColumns.js b/jit/corePlugins/gridTemplateColumns.js
@@ -1,6 +1,6 @@
 const { asList, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'grid-cols': (modifier, { theme }) => {
       let value = asList(modifier, theme.gridTemplateColumns)
diff --git a/jit/corePlugins/gridTemplateRows.js b/jit/corePlugins/gridTemplateRows.js
@@ -1,6 +1,6 @@
 const { asList, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'grid-rows': (modifier, { theme }) => {
       let value = asList(modifier, theme.gridTemplateRows)
diff --git a/jit/corePlugins/index.js b/jit/corePlugins/index.js
@@ -10,7 +10,7 @@ const {
 } = require('../pluginUtils')
 
 module.exports = {
-  pseudoClassVariants: function ({ config, theme, addVariant }) {
+  pseudoClassVariants: function ({ config, addVariant }) {
     let pseudoVariants = [
       ['first', 'first-child'],
       ['last', 'last-child'],
@@ -62,7 +62,7 @@ module.exports = {
       )
     }
   },
-  directionVariants: function ({ config, theme, addVariant }) {
+  directionVariants: function ({ config, addVariant }) {
     addVariant(
       'ltr',
       transformAllSelectors(
@@ -85,7 +85,7 @@ module.exports = {
       )
     )
   },
-  reducedMotionVariants: function ({ config, theme, addVariant }) {
+  reducedMotionVariants: function ({ config, addVariant }) {
     addVariant(
       'motion-safe',
       transformLastClasses(
@@ -106,7 +106,7 @@ module.exports = {
       )
     )
   },
-  darkVariants: function ({ config, theme, addVariant }) {
+  darkVariants: function ({ config, addVariant }) {
     if (config('darkMode') === 'class') {
       addVariant(
         'dark',
diff --git a/jit/corePlugins/letterSpacing.js b/jit/corePlugins/letterSpacing.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     tracking: (modifier, { theme }) => {
       let value = asLength(modifier, theme['letterSpacing'])
diff --git a/jit/corePlugins/lineHeight.js b/jit/corePlugins/lineHeight.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     leading: (modifier, { theme }) => {
       let value = asLength(modifier, theme['lineHeight'])
diff --git a/jit/corePlugins/opacity.js b/jit/corePlugins/opacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     opacity: (modifier, { theme }) => {
       let value = asValue(modifier, theme.opacity)
diff --git a/jit/corePlugins/order.js b/jit/corePlugins/order.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     order: (modifier, { theme }) => {
       let value = asValue(modifier, theme.order)
diff --git a/jit/corePlugins/outline.js b/jit/corePlugins/outline.js
@@ -1,6 +1,6 @@
 const { nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     outline: (modifier, { theme }) => {
       let value = theme.outline[modifier]
diff --git a/jit/corePlugins/padding.js b/jit/corePlugins/padding.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     p: (modifier, { theme }) => {
       let value = asValue(modifier, theme['padding'])
diff --git a/jit/corePlugins/placeholderColor.js b/jit/corePlugins/placeholderColor.js
@@ -1,13 +1,12 @@
 const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
 const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
-const toColorValue = require('../../lib/util/toColorValue').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.placeholderColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('placeholderColor'))
 
   matchUtilities({
-    placeholder: (modifier, { theme }) => {
+    placeholder: (modifier) => {
       let value = asColor(modifier, colorPalette)
 
       if (value === undefined) {
diff --git a/jit/corePlugins/placeholderOpacity.js b/jit/corePlugins/placeholderOpacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'placeholder-opacity': (modifier, { theme }) => {
       let value = asValue(modifier, theme.placeholderOpacity)
diff --git a/jit/corePlugins/ringColor.js b/jit/corePlugins/ringColor.js
@@ -1,13 +1,12 @@
 const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
 const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
-const toColorValue = require('../../lib/util/toColorValue').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.ringColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('ringColor'))
 
   matchUtilities({
-    ring: (modifier, { theme }) => {
+    ring: (modifier) => {
       if (modifier === 'DEFAULT') {
         return []
       }
diff --git a/jit/corePlugins/ringOffsetColor.js b/jit/corePlugins/ringOffsetColor.js
@@ -1,13 +1,12 @@
 const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
-const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
 const toColorValue = require('../../lib/util/toColorValue').default
 const { asColor, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
-  let colorPalette = flattenColorPalette(theme.ringOffsetColor)
+module.exports = function ({ matchUtilities, theme }) {
+  let colorPalette = flattenColorPalette(theme('ringOffsetColor'))
 
   matchUtilities({
-    'ring-offset': (modifier, { theme }) => {
+    'ring-offset': (modifier) => {
       let value = asColor(modifier, colorPalette)
 
       if (value === undefined) {
diff --git a/jit/corePlugins/ringOffsetWidth.js b/jit/corePlugins/ringOffsetWidth.js
@@ -1,6 +1,6 @@
 const { asLength, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'ring-offset': (modifier, { theme }) => {
       let value = asLength(modifier, theme['ringOffsetWidth'])
diff --git a/jit/corePlugins/ringOpacity.js b/jit/corePlugins/ringOpacity.js
@@ -1,6 +1,6 @@
 const { asValue, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     'ring-opacity': (modifier, { theme }) => {
       let value = asValue(modifier, theme['ringOpacity'])
diff --git a/jit/corePlugins/rotate.js b/jit/corePlugins/rotate.js
@@ -1,6 +1,6 @@
 const { asAngle, nameClass } = require('../pluginUtils')
 
-module.exports = function ({ matchUtilities, jit: { theme } }) {
+module.exports = function ({ matchUtilities }) {
   matchUtilities({
     rotate: (modifier, { theme }) => {
       let value = asAngle(modifier, theme.rotate)
diff --git a/jit/corePlugins/scale.js b/jit/corePlugins/scale.js
diff --git a/jit/corePlugins/skew.js b/jit/corePlugins/skew.js
diff --git a/jit/corePlugins/stroke.js b/jit/corePlugins/stroke.js
diff --git a/jit/corePlugins/textColor.js b/jit/corePlugins/textColor.js
diff --git a/jit/corePlugins/textOpacity.js b/jit/corePlugins/textOpacity.js
diff --git a/jit/corePlugins/transformOrigin.js b/jit/corePlugins/transformOrigin.js
diff --git a/jit/corePlugins/transitionDelay.js b/jit/corePlugins/transitionDelay.js
diff --git a/jit/corePlugins/transitionDuration.js b/jit/corePlugins/transitionDuration.js
diff --git a/jit/corePlugins/transitionProperty.js b/jit/corePlugins/transitionProperty.js
diff --git a/jit/corePlugins/transitionTimingFunction.js b/jit/corePlugins/transitionTimingFunction.js
diff --git a/jit/corePlugins/translate.js b/jit/corePlugins/translate.js
diff --git a/jit/corePlugins/zIndex.js b/jit/corePlugins/zIndex.js
diff --git a/jit/index.js b/jit/index.js
diff --git a/jit/lib/collapseAdjacentRules.js b/jit/lib/collapseAdjacentRules.js
diff --git a/jit/lib/generateRules.js b/jit/lib/generateRules.js
diff --git a/jit/lib/removeLayerAtRules.js b/jit/lib/removeLayerAtRules.js
diff --git a/jit/lib/setupContext.js b/jit/lib/setupContext.js
diff --git a/jit/pluginUtils.js b/jit/pluginUtils.js
diff --git a/jit/tests/modify-selectors.test.js b/jit/tests/modify-selectors.test.js
