Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ node_js:
- "8"
- "10"
- "12"
- "14"
- "15"

cache:
directories:
Expand Down
29 changes: 12 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
var _ = require('lodash')
var flatten = require('flat')

const _ = require('lodash')
const flatten = require('flat').flatten

const FLATTEN_CONFIG = { delimiter: '-', maxDepth: 2 }
const getName = name => name.split('-default').join('')


module.exports = function () {
return function ({
addUtilities, addComponents, addBase, addVariant,
e, prefix, theme, variants, config,
}) {
return function ({ addUtilities, e, theme, variants }) {
const buildConfig = (themeKey, ...fallbackKeys) => {
return buildConfigFromTheme(themeKey, ...fallbackKeys) || buildConfigFromArray(themeKey)
}
Expand Down Expand Up @@ -45,18 +40,18 @@ module.exports = function () {
}

const pluginUtilities = {
'col-count': buildConfig('columnCount'),
'col-gap': buildConfig('columnGap', 'gap', 'gridGap'),
'col-w': buildConfig('columnWidth'),
'col-rule-color': buildConfig('columnRuleColor', 'borderColor'),
'col-rule-width': buildConfig('columnRuleWidth', 'borderWidth'),
'col-rule-style': buildConfig('columnRuleStyle'),
'col-fill': buildConfig('columnFill'),
'col-span': buildConfig('columnSpan'),
'column-count': buildConfig('columnCount'),
'column-gap': buildConfig('columnGap', 'gap', 'gridGap'),
'column-width': buildConfig('columnWidth', 'gap', 'gridGap'),
'column-rule-color': buildConfig('columnRuleColor', 'borderColor'),
'column-rule-width': buildConfig('columnRuleWidth', 'borderWidth'),
'column-rule-style': buildConfig('columnRuleStyle'),
'column-fill': buildConfig('columnFill'),
'column-span': buildConfig('columnSpan'),
}

Object.entries(pluginUtilities)
.filter(([ modifier, values ]) => !_.isEmpty(values))
.filter(([ values ]) => !_.isEmpty(values))
.forEach(([ modifier, values ]) => {
const className = _.kebabCase(modifier).split('-').slice(0, 2).join('-')
const variantName = Object.keys(Object.entries(values)[0][1])[0]
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tailwindcss-multi-column",
"version": "1.0.2",
"version": "2.0.2",
"description": "Multi-Column utilities for Tailwind CSS.",
"keywords": [
"plugin",
Expand Down Expand Up @@ -29,13 +29,13 @@
"test": "jest"
},
"dependencies": {
"flat": "^5.0.0",
"lodash": "^4.17.11"
"flat": "^5.0.2",
"lodash": "^4.17.20"
},
"devDependencies": {
"jest": "^26.4.1",
"jest-matcher-css": "^1.0.3",
"postcss": "^8.0.9",
"tailwindcss": "^1.0.1"
"jest": "^26.6.3",
"jest-matcher-css": "^1.1.0",
"postcss": "^8.1.14",
"tailwindcss": "^2.0.1"
}
}
Loading