Skip to content

Commit

Permalink
Don't import corePlugins in resolveConfig (#2548)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamwathan committed Oct 13, 2020
1 parent e0462ce commit ac82484
Show file tree
Hide file tree
Showing 5 changed files with 236 additions and 235 deletions.
4 changes: 2 additions & 2 deletions __tests__/resolveConfig.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { corePluginList } from '../src/corePlugins'
import { corePluginList } from '../src/corePluginList'
import resolveConfig from '../src/util/resolveConfig'

test('prefix key overrides default prefix', () => {
Expand Down Expand Up @@ -1821,7 +1821,7 @@ test('core plugin configuration builds on the default list when starting with an
separator: ':',
theme: {},
variants: {},
corePlugins: Object.keys(corePluginList).filter(c => c !== 'display'),
corePlugins: corePluginList.filter(c => c !== 'display'),
})
})

Expand Down
115 changes: 115 additions & 0 deletions src/corePluginList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
export const corePluginList = [
'preflight',
'container',
'space',
'divideWidth',
'divideColor',
'divideStyle',
'divideOpacity',
'accessibility',
'appearance',
'backgroundAttachment',
'backgroundClip',
'backgroundColor',
'backgroundImage',
'gradientColorStops',
'backgroundOpacity',
'backgroundPosition',
'backgroundRepeat',
'backgroundSize',
'borderCollapse',
'borderColor',
'borderOpacity',
'borderRadius',
'borderStyle',
'borderWidth',
'boxSizing',
'cursor',
'display',
'flexDirection',
'flexWrap',
'placeItems',
'placeContent',
'placeSelf',
'alignItems',
'alignContent',
'alignSelf',
'justifyItems',
'justifyContent',
'justifySelf',
'flex',
'flexGrow',
'flexShrink',
'order',
'float',
'clear',
'fontFamily',
'fontWeight',
'height',
'fontSize',
'lineHeight',
'listStylePosition',
'listStyleType',
'margin',
'maxHeight',
'maxWidth',
'minHeight',
'minWidth',
'objectFit',
'objectPosition',
'opacity',
'outline',
'overflow',
'overscrollBehavior',
'padding',
'placeholderColor',
'placeholderOpacity',
'pointerEvents',
'position',
'inset',
'resize',
'boxShadow',
'fill',
'stroke',
'strokeWidth',
'tableLayout',
'textAlign',
'textColor',
'textOpacity',
'fontStyle',
'textTransform',
'textDecoration',
'fontSmoothing',
'fontVariantNumeric',
'letterSpacing',
'userSelect',
'verticalAlign',
'visibility',
'whitespace',
'wordBreak',
'width',
'zIndex',
'gap',
'gridAutoFlow',
'gridTemplateColumns',
'gridAutoColumns',
'gridColumn',
'gridColumnStart',
'gridColumnEnd',
'gridTemplateRows',
'gridAutoRows',
'gridRow',
'gridRowStart',
'gridRowEnd',
'transform',
'transformOrigin',
'scale',
'rotate',
'translate',
'skew',
'transitionProperty',
'transitionTimingFunction',
'transitionDuration',
'transitionDelay',
'animation',
]
235 changes: 4 additions & 231 deletions src/corePlugins.js
Original file line number Diff line number Diff line change
@@ -1,237 +1,10 @@
import preflight from './plugins/preflight'
import container from './plugins/container'
import space from './plugins/space'
import divideWidth from './plugins/divideWidth'
import divideColor from './plugins/divideColor'
import divideStyle from './plugins/divideStyle'
import accessibility from './plugins/accessibility'
import appearance from './plugins/appearance'
import backgroundAttachment from './plugins/backgroundAttachment'
import backgroundClip from './plugins/backgroundClip'
import backgroundColor from './plugins/backgroundColor'
import backgroundImage from './plugins/backgroundImage'
import gradientColorStops from './plugins/gradientColorStops'
import backgroundPosition from './plugins/backgroundPosition'
import backgroundRepeat from './plugins/backgroundRepeat'
import backgroundSize from './plugins/backgroundSize'
import borderCollapse from './plugins/borderCollapse'
import borderColor from './plugins/borderColor'
import borderRadius from './plugins/borderRadius'
import borderStyle from './plugins/borderStyle'
import borderWidth from './plugins/borderWidth'
import boxSizing from './plugins/boxSizing'
import cursor from './plugins/cursor'
import display from './plugins/display'
import flexDirection from './plugins/flexDirection'
import flexWrap from './plugins/flexWrap'
import placeItems from './plugins/placeItems'
import placeContent from './plugins/placeContent'
import placeSelf from './plugins/placeSelf'
import alignItems from './plugins/alignItems'
import alignContent from './plugins/alignContent'
import alignSelf from './plugins/alignSelf'
import justifyItems from './plugins/justifyItems'
import justifyContent from './plugins/justifyContent'
import justifySelf from './plugins/justifySelf'
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 clear from './plugins/clear'
import fontFamily from './plugins/fontFamily'
import fontWeight from './plugins/fontWeight'
import height from './plugins/height'
import lineHeight from './plugins/lineHeight'
import listStylePosition from './plugins/listStylePosition'
import listStyleType from './plugins/listStyleType'
import margin from './plugins/margin'
import maxHeight from './plugins/maxHeight'
import maxWidth from './plugins/maxWidth'
import minHeight from './plugins/minHeight'
import minWidth from './plugins/minWidth'
import objectFit from './plugins/objectFit'
import objectPosition from './plugins/objectPosition'
import opacity from './plugins/opacity'
import outline from './plugins/outline'
import overflow from './plugins/overflow'
import overscrollBehavior from './plugins/overscrollBehavior'
import padding from './plugins/padding'
import placeholderColor from './plugins/placeholderColor'
import pointerEvents from './plugins/pointerEvents'
import position from './plugins/position'
import inset from './plugins/inset'
import resize from './plugins/resize'
import boxShadow from './plugins/boxShadow'
import fill from './plugins/fill'
import stroke from './plugins/stroke'
import strokeWidth from './plugins/strokeWidth'
import tableLayout from './plugins/tableLayout'
import textAlign from './plugins/textAlign'
import textColor from './plugins/textColor'
import fontSize from './plugins/fontSize'
import fontStyle from './plugins/fontStyle'
import textTransform from './plugins/textTransform'
import textDecoration from './plugins/textDecoration'
import fontSmoothing from './plugins/fontSmoothing'
import fontVariantNumeric from './plugins/fontVariantNumeric'
import letterSpacing from './plugins/letterSpacing'
import userSelect from './plugins/userSelect'
import verticalAlign from './plugins/verticalAlign'
import visibility from './plugins/visibility'
import whitespace from './plugins/whitespace'
import wordBreak from './plugins/wordBreak'
import width from './plugins/width'
import zIndex from './plugins/zIndex'
import gap from './plugins/gap'
import gridAutoFlow from './plugins/gridAutoFlow'
import gridTemplateColumns from './plugins/gridTemplateColumns'
import gridAutoColumns from './plugins/gridAutoColumns'
import gridColumn from './plugins/gridColumn'
import gridColumnStart from './plugins/gridColumnStart'
import gridColumnEnd from './plugins/gridColumnEnd'
import gridTemplateRows from './plugins/gridTemplateRows'
import gridAutoRows from './plugins/gridAutoRows'
import gridRow from './plugins/gridRow'
import gridRowStart from './plugins/gridRowStart'
import gridRowEnd from './plugins/gridRowEnd'
import transform from './plugins/transform'
import transformOrigin from './plugins/transformOrigin'
import scale from './plugins/scale'
import rotate from './plugins/rotate'
import translate from './plugins/translate'
import skew from './plugins/skew'
import transitionProperty from './plugins/transitionProperty'
import transitionTimingFunction from './plugins/transitionTimingFunction'
import transitionDuration from './plugins/transitionDuration'
import transitionDelay from './plugins/transitionDelay'
import divideOpacity from './plugins/divideOpacity'
import backgroundOpacity from './plugins/backgroundOpacity'
import borderOpacity from './plugins/borderOpacity'
import textOpacity from './plugins/textOpacity'
import placeholderOpacity from './plugins/placeholderOpacity'
import animation from './plugins/animation'
import { corePluginList } from './corePluginList.js'
import * as plugins from './plugins/index.js'

import configurePlugins from './util/configurePlugins'

export const corePluginList = {
preflight,
container,
space,
divideWidth,
divideColor,
divideStyle,
divideOpacity,
accessibility,
appearance,
backgroundAttachment,
backgroundClip,
backgroundColor,
backgroundImage,
gradientColorStops,
backgroundOpacity,
backgroundPosition,
backgroundRepeat,
backgroundSize,
borderCollapse,
borderColor,
borderOpacity,
borderRadius,
borderStyle,
borderWidth,
boxSizing,
cursor,
display,
flexDirection,
flexWrap,
placeItems,
placeContent,
placeSelf,
alignItems,
alignContent,
alignSelf,
justifyItems,
justifyContent,
justifySelf,
flex,
flexGrow,
flexShrink,
order,
float,
clear,
fontFamily,
fontWeight,
height,
fontSize,
lineHeight,
listStylePosition,
listStyleType,
margin,
maxHeight,
maxWidth,
minHeight,
minWidth,
objectFit,
objectPosition,
opacity,
outline,
overflow,
overscrollBehavior,
padding,
placeholderColor,
placeholderOpacity,
pointerEvents,
position,
inset,
resize,
boxShadow,
fill,
stroke,
strokeWidth,
tableLayout,
textAlign,
textColor,
textOpacity,
fontStyle,
textTransform,
textDecoration,
fontSmoothing,
fontVariantNumeric,
letterSpacing,
userSelect,
verticalAlign,
visibility,
whitespace,
wordBreak,
width,
zIndex,
gap,
gridAutoFlow,
gridTemplateColumns,
gridAutoColumns,
gridColumn,
gridColumnStart,
gridColumnEnd,
gridTemplateRows,
gridAutoRows,
gridRow,
gridRowStart,
gridRowEnd,
transform,
transformOrigin,
scale,
rotate,
translate,
skew,
transitionProperty,
transitionTimingFunction,
transitionDuration,
transitionDelay,
animation,
}

export default function({ corePlugins: corePluginConfig }) {
return configurePlugins(corePluginConfig, Object.keys(corePluginList)).map(pluginName => {
return corePluginList[pluginName]()
return configurePlugins(corePluginConfig, corePluginList).map(pluginName => {
return plugins[pluginName]()
})
}
Loading

0 comments on commit ac82484

Please sign in to comment.