Skip to content

Commit 5f4b81a

Browse files
adamwathanadamwathan
committed
Unify utils
1 parent 47af2f1 commit 5f4b81a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+133
-190
lines changed

‎src/jit/corePlugins.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
transformAllSelectors,
1010
transformAllClasses,
1111
transformLastClasses,
12-
} from './pluginUtils'
12+
} from '../util/pluginUtils'
1313

1414
export default {
1515
pseudoClassVariants: function ({ config, addVariant }) {

‎src/jit/lib/expandApplyAtRules.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import postcss from 'postcss'
22
import { resolveMatches } from './generateRules'
3-
import { bigSign, escapeClassName } from './utils'
3+
import bigSign from '../../util/bigSign'
4+
import escapeClassName from '../../util/escapeClassName'
45

56
function buildApplyCache(applyCandidates, context) {
67
for (let candidate of applyCandidates) {

‎src/jit/lib/expandTailwindAtRules.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import fastGlob from 'fast-glob'
44
import parseGlob from 'parse-glob'
55
import * as sharedState from './sharedState'
66
import { generateRules } from './generateRules'
7-
import { bigSign, cloneNodes } from './utils'
7+
import bigSign from '../../util/bigSign'
8+
import cloneNodes from '../../util/cloneNodes'
89

910
let env = sharedState.env
1011
let contentMatchCache = sharedState.contentMatchCache

‎src/jit/lib/generateRules.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import postcss from 'postcss'
22
import selectorParser from 'postcss-selector-parser'
33
import parseObjectStyles from '../../util/parseObjectStyles'
4-
import { isPlainObject } from './utils'
4+
import isPlainObject from '../../util/isPlainObject'
55
import prefixSelector from '../../util/prefixSelector'
6-
import { updateAllClasses } from '../pluginUtils'
6+
import { updateAllClasses } from '../../util/pluginUtils'
77

88
let classNameParser = selectorParser((selectors) => {
99
return selectors.first.filter(({ type }) => type === 'class').pop().value

‎src/jit/lib/setupContext.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ import parseObjectStyles from '../../util/parseObjectStyles'
1616
import getModuleDependencies from '../../lib/getModuleDependencies'
1717
import prefixSelector from '../../util/prefixSelector'
1818

19-
const resolveConfig = require('../../../resolveConfig')
19+
import resolveConfig from '../../../resolveConfig'
2020

21-
import * as sharedState from './sharedState'
2221
import corePlugins from '../corePlugins'
23-
import { isPlainObject, escapeClassName } from './utils'
22+
import isPlainObject from '../../util/isPlainObject'
23+
import escapeClassName from '../../util/escapeClassName'
24+
25+
import * as sharedState from './sharedState'
2426

2527
let contextMap = sharedState.contextMap
2628
let configContextMap = sharedState.configContextMap

‎src/jit/lib/utils.js

-103
This file was deleted.

‎src/plugins/animation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import _ from 'lodash'
22
import parseAnimationValue from '../util/parseAnimationValue'
3-
import { nameClass } from '../jit/pluginUtils'
3+
import nameClass from '../util/nameClass'
44

55
export default function () {
66
return function ({ config, matchUtilities, addUtilities, theme, variants, prefix }) {

‎src/plugins/backdropBlur.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropBrightness.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropContrast.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropGrayscale.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropHueRotate.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropInvert.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropOpacity.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropSaturate.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backdropSepia.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/backgroundColor.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import _ from 'lodash'
22
import flattenColorPalette from '../util/flattenColorPalette'
33
import withAlphaVariable from '../util/withAlphaVariable'
44
import toColorValue from '../util/toColorValue'
5-
import { asColor, nameClass } from '../jit/pluginUtils'
5+
import nameClass from '../util/nameClass'
6+
import { asColor } from '../util/pluginUtils'
67

78
export default function () {
89
return function ({ config, matchUtilities, addUtilities, theme, variants, corePlugins }) {

‎src/plugins/backgroundImage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createUtilityPlugin from '../util/createUtilityPlugin'
2-
import { asLookupValue } from '../jit/pluginUtils'
2+
import { asLookupValue } from '../util/pluginUtils'
33

44
export default function () {
55
return createUtilityPlugin('backgroundImage', [['bg', ['background-image']]], {

‎src/plugins/backgroundPosition.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createUtilityPlugin from '../util/createUtilityPlugin'
2-
import { asLookupValue } from '../jit/pluginUtils'
2+
import { asLookupValue } from '../util/pluginUtils'
33

44
export default function () {
55
return createUtilityPlugin('backgroundPosition', [['bg', ['background-position']]], {

‎src/plugins/backgroundSize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createUtilityPlugin from '../util/createUtilityPlugin'
2-
import { asLookupValue } from '../jit/pluginUtils'
2+
import { asLookupValue } from '../util/pluginUtils'
33

44
export default function () {
55
return createUtilityPlugin('backgroundSize', [['bg', ['background-size']]], {

‎src/plugins/blur.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/borderColor.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import _ from 'lodash'
22
import flattenColorPalette from '../util/flattenColorPalette'
33
import toColorValue from '../util/toColorValue'
44
import withAlphaVariable from '../util/withAlphaVariable'
5-
import { nameClass, asColor } from '../jit/pluginUtils'
5+
import nameClass from '../util/nameClass'
6+
import { asColor } from '../util/pluginUtils'
67

78
export default function () {
89
return function ({ config, matchUtilities, addUtilities, theme, variants, corePlugins }) {

‎src/plugins/borderWidth.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { asLength } from '../jit/pluginUtils'
1+
import { asLength } from '../util/pluginUtils'
22
import createUtilityPlugin from '../util/createUtilityPlugin'
33

44
export default function () {

‎src/plugins/boxShadow.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import _ from 'lodash'
22
import transformThemeValue from '../util/transformThemeValue'
3-
import { nameClass } from '../jit/pluginUtils'
3+
import nameClass from '../util/nameClass'
44

55
let transformValue = transformThemeValue('boxShadow')
66
let shadowReset = {

‎src/plugins/brightness.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/contrast.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/divideColor.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import _ from 'lodash'
22
import flattenColorPalette from '../util/flattenColorPalette'
33
import toColorValue from '../util/toColorValue'
44
import withAlphaVariable from '../util/withAlphaVariable'
5-
import { nameClass, asColor } from '../jit/pluginUtils'
5+
import nameClass from '../util/nameClass'
6+
import { asColor } from '../util/pluginUtils'
67

78
export default function () {
89
return function ({ config, matchUtilities, addUtilities, theme, variants, corePlugins }) {

‎src/plugins/divideOpacity.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { nameClass, asValue } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/divideWidth.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { nameClass, asLength } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asLength } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/fill.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import _ from 'lodash'
22
import flattenColorPalette from '../util/flattenColorPalette'
33
import toColorValue from '../util/toColorValue'
4-
import { asValue, nameClass } from '../jit/pluginUtils'
4+
import nameClass from '../util/nameClass'
5+
import { asValue } from '../util/pluginUtils'
56

67
export default function () {
78
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/fontFamily.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createUtilityPlugin from '../util/createUtilityPlugin'
2-
import { asLookupValue } from '../jit/pluginUtils'
2+
import { asLookupValue } from '../util/pluginUtils'
33

44
export default function () {
55
return createUtilityPlugin('fontFamily', [['font', ['fontFamily']]], {

‎src/plugins/fontSize.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import _ from 'lodash'
2-
import { asLength, nameClass } from '../jit/pluginUtils'
3-
import { isPlainObject } from '../jit/lib/utils'
2+
import nameClass from '../util/nameClass'
3+
import { asLength } from '../util/pluginUtils'
4+
import isPlainObject from '../util/isPlainObject'
45

56
export default function () {
67
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

‎src/plugins/fontWeight.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import createUtilityPlugin from '../util/createUtilityPlugin'
2-
import { asLookupValue } from '../jit/pluginUtils'
2+
import { asLookupValue } from '../util/pluginUtils'
33

44
export default function () {
55
return createUtilityPlugin('fontWeight', [['font', ['fontWeight']]], {

‎src/plugins/gradientColorStops.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import _ from 'lodash'
22
import flattenColorPalette from '../util/flattenColorPalette'
33
import toColorValue from '../util/toColorValue'
44
import { toRgba } from '../util/withAlphaVariable'
5-
import { asValue, nameClass } from '../jit/pluginUtils'
5+
import nameClass from '../util/nameClass'
6+
import { asValue } from '../util/pluginUtils'
67

78
function transparentTo(value) {
89
if (typeof value === 'function') {

‎src/plugins/grayscale.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from 'lodash'
2-
import { asValue, nameClass } from '../jit/pluginUtils'
2+
import nameClass from '../util/nameClass'
3+
import { asValue } from '../util/pluginUtils'
34

45
export default function () {
56
return function ({ config, matchUtilities, addUtilities, theme, variants }) {

0 commit comments

Comments
 (0)