tailwindcss 0.0.0-insiders.7b94fea → 0.0.0-insiders.7d8eb21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +588 -3
- package/LICENSE +1 -2
- package/README.md +15 -7
- package/colors.d.ts +3 -0
- package/colors.js +2 -1
- package/defaultConfig.d.ts +3 -0
- package/defaultConfig.js +2 -1
- package/defaultTheme.d.ts +4 -0
- package/defaultTheme.js +2 -1
- package/lib/cli/build/deps.js +54 -0
- package/lib/cli/build/index.js +48 -0
- package/lib/cli/build/plugin.js +362 -0
- package/lib/cli/build/utils.js +78 -0
- package/lib/cli/build/watching.js +178 -0
- package/lib/cli/help/index.js +71 -0
- package/lib/cli/index.js +18 -0
- package/lib/cli/init/index.js +46 -0
- package/lib/cli/shared.js +12 -0
- package/lib/cli-peer-dependencies.js +20 -7
- package/lib/cli.js +108 -571
- package/lib/constants.js +27 -20
- package/lib/corePluginList.js +15 -4
- package/lib/corePlugins.js +2229 -1868
- package/lib/css/preflight.css +22 -9
- package/lib/featureFlags.js +39 -25
- package/lib/index.js +28 -12
- package/lib/lib/cacheInvalidation.js +90 -0
- package/lib/lib/collapseAdjacentRules.js +28 -10
- package/lib/lib/collapseDuplicateDeclarations.js +83 -0
- package/lib/lib/content.js +177 -0
- package/lib/lib/defaultExtractor.js +241 -0
- package/lib/lib/detectNesting.js +27 -3
- package/lib/lib/evaluateTailwindFunctions.js +117 -50
- package/lib/lib/expandApplyAtRules.js +457 -159
- package/lib/lib/expandTailwindAtRules.js +130 -127
- package/lib/lib/findAtConfigPath.js +44 -0
- package/lib/lib/generateRules.js +610 -141
- package/lib/lib/getModuleDependencies.js +11 -8
- package/lib/lib/normalizeTailwindDirectives.js +43 -32
- package/lib/lib/offsets.js +285 -0
- package/lib/lib/partitionApplyAtRules.js +56 -0
- package/lib/lib/regex.js +60 -0
- package/lib/lib/remap-bitfield.js +87 -0
- package/lib/lib/resolveDefaultsAtRules.js +114 -81
- package/lib/lib/setupContextUtils.js +718 -323
- package/lib/lib/setupTrackingContext.js +43 -71
- package/lib/lib/sharedState.js +50 -9
- package/lib/lib/substituteScreenAtRules.js +13 -8
- package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
- package/lib/postcss-plugins/nesting/index.js +19 -0
- package/lib/postcss-plugins/nesting/plugin.js +87 -0
- package/lib/processTailwindFeatures.js +36 -21
- package/lib/public/colors.js +247 -245
- package/lib/public/create-plugin.js +6 -4
- package/lib/public/default-config.js +7 -5
- package/lib/public/default-theme.js +7 -5
- package/lib/public/resolve-config.js +8 -5
- package/lib/util/bigSign.js +4 -1
- package/lib/util/buildMediaQuery.js +18 -24
- package/lib/util/cloneDeep.js +7 -6
- package/lib/util/cloneNodes.js +21 -3
- package/lib/util/color.js +54 -40
- package/lib/util/configurePlugins.js +5 -2
- package/lib/util/createPlugin.js +6 -6
- package/lib/util/createUtilityPlugin.js +12 -14
- package/lib/util/dataTypes.js +164 -100
- package/lib/util/defaults.js +12 -3
- package/lib/util/escapeClassName.js +9 -6
- package/lib/util/escapeCommas.js +5 -2
- package/lib/util/flattenColorPalette.js +9 -12
- package/lib/util/formatVariantSelector.js +353 -0
- package/lib/util/getAllConfigs.js +29 -10
- package/lib/util/hashConfig.js +6 -3
- package/lib/util/isKeyframeRule.js +5 -2
- package/lib/util/isPlainObject.js +5 -2
- package/lib/util/isSyntacticallyValidPropertyValue.js +72 -0
- package/lib/util/log.js +22 -12
- package/lib/util/nameClass.js +20 -8
- package/lib/util/negateValue.js +23 -6
- package/lib/util/normalizeConfig.js +147 -60
- package/lib/util/normalizeScreens.js +170 -0
- package/lib/util/parseAnimationValue.js +42 -40
- package/lib/util/parseBoxShadowValue.js +84 -0
- package/lib/util/parseDependency.js +38 -56
- package/lib/util/parseGlob.js +34 -0
- package/lib/util/parseObjectStyles.js +11 -8
- package/lib/util/pluginUtils.js +182 -181
- package/lib/util/prefixSelector.js +27 -13
- package/lib/util/removeAlphaVariables.js +29 -0
- package/lib/util/resolveConfig.js +97 -73
- package/lib/util/resolveConfigPath.js +11 -9
- package/lib/util/responsive.js +8 -5
- package/lib/util/splitAtTopLevelOnly.js +43 -0
- package/lib/util/tap.js +4 -1
- package/lib/util/toColorValue.js +5 -3
- package/lib/util/toPath.js +24 -3
- package/lib/util/transformThemeValue.js +49 -31
- package/lib/util/validateConfig.js +24 -0
- package/lib/util/validateFormalSyntax.js +24 -0
- package/lib/util/withAlphaVariable.js +23 -15
- package/nesting/index.js +2 -12
- package/package.json +51 -50
- package/peers/index.js +15019 -12583
- package/plugin.d.ts +11 -0
- package/plugin.js +2 -1
- package/resolveConfig.d.ts +12 -0
- package/resolveConfig.js +2 -1
- package/scripts/generate-types.js +105 -0
- package/scripts/release-channel.js +18 -0
- package/scripts/release-notes.js +21 -0
- package/scripts/type-utils.js +27 -0
- package/src/cli/build/deps.js +56 -0
- package/src/cli/build/index.js +49 -0
- package/src/cli/build/plugin.js +434 -0
- package/src/cli/build/utils.js +76 -0
- package/src/cli/build/watching.js +227 -0
- package/src/cli/help/index.js +70 -0
- package/src/cli/index.js +3 -0
- package/src/cli/init/index.js +50 -0
- package/src/cli/shared.js +5 -0
- package/src/cli-peer-dependencies.js +7 -1
- package/src/cli.js +50 -577
- package/src/corePluginList.js +1 -1
- package/src/corePlugins.js +886 -598
- package/src/css/preflight.css +22 -9
- package/src/featureFlags.js +24 -8
- package/src/index.js +19 -6
- package/src/lib/cacheInvalidation.js +52 -0
- package/src/lib/collapseAdjacentRules.js +21 -2
- package/src/lib/collapseDuplicateDeclarations.js +93 -0
- package/src/lib/content.js +213 -0
- package/src/lib/defaultExtractor.js +217 -0
- package/src/lib/detectNesting.js +30 -3
- package/src/lib/evaluateTailwindFunctions.js +84 -10
- package/src/lib/expandApplyAtRules.js +508 -153
- package/src/lib/expandTailwindAtRules.js +82 -79
- package/src/lib/findAtConfigPath.js +48 -0
- package/src/lib/generateRules.js +625 -111
- package/src/lib/normalizeTailwindDirectives.js +7 -1
- package/src/lib/offsets.js +351 -0
- package/src/lib/partitionApplyAtRules.js +52 -0
- package/src/lib/regex.js +74 -0
- package/src/lib/remap-bitfield.js +82 -0
- package/src/lib/resolveDefaultsAtRules.js +98 -60
- package/src/lib/setupContextUtils.js +666 -168
- package/src/lib/setupTrackingContext.js +16 -52
- package/src/lib/sharedState.js +44 -4
- package/src/lib/substituteScreenAtRules.js +6 -3
- package/src/postcss-plugins/nesting/README.md +42 -0
- package/src/postcss-plugins/nesting/index.js +13 -0
- package/src/postcss-plugins/nesting/plugin.js +80 -0
- package/src/processTailwindFeatures.js +17 -2
- package/src/util/buildMediaQuery.js +14 -16
- package/src/util/cloneNodes.js +19 -2
- package/src/util/color.js +31 -14
- package/src/util/createUtilityPlugin.js +2 -2
- package/src/util/dataTypes.js +86 -21
- package/src/util/defaults.js +6 -0
- package/src/util/formatVariantSelector.js +412 -0
- package/src/util/getAllConfigs.js +19 -0
- package/src/util/isSyntacticallyValidPropertyValue.js +61 -0
- package/src/util/log.js +11 -7
- package/src/util/nameClass.js +6 -2
- package/src/util/negateValue.js +14 -4
- package/src/util/normalizeConfig.js +72 -5
- package/src/util/normalizeScreens.js +140 -0
- package/src/util/parseBoxShadowValue.js +72 -0
- package/src/util/parseDependency.js +37 -42
- package/src/util/parseGlob.js +24 -0
- package/src/util/pluginUtils.js +169 -143
- package/src/util/prefixSelector.js +30 -13
- package/src/util/removeAlphaVariables.js +24 -0
- package/src/util/resolveConfig.js +81 -27
- package/src/util/splitAtTopLevelOnly.js +45 -0
- package/src/util/toPath.js +23 -1
- package/src/util/transformThemeValue.js +33 -8
- package/src/util/validateConfig.js +13 -0
- package/src/util/validateFormalSyntax.js +34 -0
- package/src/util/withAlphaVariable.js +1 -1
- package/stubs/defaultConfig.stub.js +246 -213
- package/stubs/simpleConfig.stub.js +1 -0
- package/types/config.d.ts +363 -0
- package/types/generated/.gitkeep +0 -0
- package/types/generated/colors.d.ts +276 -0
- package/types/generated/corePluginList.d.ts +1 -0
- package/types/generated/default-theme.d.ts +342 -0
- package/types/index.d.ts +7 -0
- package/lib/lib/setupWatchingContext.js +0 -284
- package/nesting/plugin.js +0 -41
- package/src/lib/setupWatchingContext.js +0 -304
package/src/util/log.js
CHANGED
|
@@ -1,25 +1,29 @@
|
|
|
1
|
-
import
|
|
1
|
+
import colors from 'picocolors'
|
|
2
2
|
|
|
3
3
|
let alreadyShown = new Set()
|
|
4
4
|
|
|
5
|
-
function log(
|
|
6
|
-
if (process.env.JEST_WORKER_ID
|
|
5
|
+
function log(type, messages, key) {
|
|
6
|
+
if (typeof process !== 'undefined' && process.env.JEST_WORKER_ID) return
|
|
7
7
|
|
|
8
8
|
if (key && alreadyShown.has(key)) return
|
|
9
9
|
if (key) alreadyShown.add(key)
|
|
10
10
|
|
|
11
11
|
console.warn('')
|
|
12
|
-
messages.forEach((message) => console.warn(
|
|
12
|
+
messages.forEach((message) => console.warn(type, '-', message))
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function dim(input) {
|
|
16
|
+
return colors.dim(input)
|
|
13
17
|
}
|
|
14
18
|
|
|
15
19
|
export default {
|
|
16
20
|
info(key, messages) {
|
|
17
|
-
log(
|
|
21
|
+
log(colors.bold(colors.cyan('info')), ...(Array.isArray(key) ? [key] : [messages, key]))
|
|
18
22
|
},
|
|
19
23
|
warn(key, messages) {
|
|
20
|
-
log(
|
|
24
|
+
log(colors.bold(colors.yellow('warn')), ...(Array.isArray(key) ? [key] : [messages, key]))
|
|
21
25
|
},
|
|
22
26
|
risk(key, messages) {
|
|
23
|
-
log(
|
|
27
|
+
log(colors.bold(colors.magenta('risk')), ...(Array.isArray(key) ? [key] : [messages, key]))
|
|
24
28
|
},
|
|
25
29
|
}
|
package/src/util/nameClass.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import escapeClassName from './escapeClassName'
|
|
2
2
|
import escapeCommas from './escapeCommas'
|
|
3
3
|
|
|
4
|
-
function asClass(name) {
|
|
4
|
+
export function asClass(name) {
|
|
5
5
|
return escapeCommas(`.${escapeClassName(name)}`)
|
|
6
6
|
}
|
|
7
7
|
|
|
@@ -14,7 +14,7 @@ export function formatClass(classPrefix, key) {
|
|
|
14
14
|
return classPrefix
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
if (key === '-') {
|
|
17
|
+
if (key === '-' || key === '-DEFAULT') {
|
|
18
18
|
return `-${classPrefix}`
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -22,5 +22,9 @@ export function formatClass(classPrefix, key) {
|
|
|
22
22
|
return `-${classPrefix}${key}`
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
+
if (key.startsWith('/')) {
|
|
26
|
+
return `${classPrefix}${key}`
|
|
27
|
+
}
|
|
28
|
+
|
|
25
29
|
return `${classPrefix}-${key}`
|
|
26
30
|
}
|
package/src/util/negateValue.js
CHANGED
|
@@ -1,14 +1,24 @@
|
|
|
1
1
|
export default function (value) {
|
|
2
2
|
value = `${value}`
|
|
3
3
|
|
|
4
|
+
if (value === '0') {
|
|
5
|
+
return '0'
|
|
6
|
+
}
|
|
7
|
+
|
|
4
8
|
// Flip sign of numbers
|
|
5
9
|
if (/^[+-]?(\d+|\d*\.\d+)(e[+-]?\d+)?(%|\w+)?$/.test(value)) {
|
|
6
10
|
return value.replace(/^[+-]?/, (sign) => (sign === '-' ? '' : '-'))
|
|
7
11
|
}
|
|
8
12
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
// What functions we support negating numeric values for
|
|
14
|
+
// var() isn't inherently a numeric function but we support it anyway
|
|
15
|
+
// The trigonometric functions are omitted because you'll need to use calc(…) with them _anyway_
|
|
16
|
+
// to produce generally useful results and that will be covered already
|
|
17
|
+
let numericFunctions = ['var', 'calc', 'min', 'max', 'clamp']
|
|
12
18
|
|
|
13
|
-
|
|
19
|
+
for (const fn of numericFunctions) {
|
|
20
|
+
if (value.includes(`${fn}(`)) {
|
|
21
|
+
return `calc(${value} * -1)`
|
|
22
|
+
}
|
|
23
|
+
}
|
|
14
24
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import log from './log'
|
|
1
|
+
import log, { dim } from './log'
|
|
2
2
|
|
|
3
3
|
export function normalizeConfig(config) {
|
|
4
4
|
// Quick structure validation
|
|
@@ -56,9 +56,11 @@ export function normalizeConfig(config) {
|
|
|
56
56
|
|
|
57
57
|
// When `config.content` is an object
|
|
58
58
|
if (typeof config.content === 'object' && config.content !== null) {
|
|
59
|
-
// Only `files`, `extract
|
|
59
|
+
// Only `files`, `relative`, `extract`, and `transform` can exist in `config.content`
|
|
60
60
|
if (
|
|
61
|
-
Object.keys(config.content).some(
|
|
61
|
+
Object.keys(config.content).some(
|
|
62
|
+
(key) => !['files', 'relative', 'extract', 'transform'].includes(key)
|
|
63
|
+
)
|
|
62
64
|
) {
|
|
63
65
|
return false
|
|
64
66
|
}
|
|
@@ -112,6 +114,14 @@ export function normalizeConfig(config) {
|
|
|
112
114
|
) {
|
|
113
115
|
return false
|
|
114
116
|
}
|
|
117
|
+
|
|
118
|
+
// `config.content.relative` is optional and can be a boolean
|
|
119
|
+
if (
|
|
120
|
+
typeof config.content.relative !== 'boolean' &&
|
|
121
|
+
typeof config.content.relative !== 'undefined'
|
|
122
|
+
) {
|
|
123
|
+
return false
|
|
124
|
+
}
|
|
115
125
|
}
|
|
116
126
|
|
|
117
127
|
return true
|
|
@@ -124,7 +134,7 @@ export function normalizeConfig(config) {
|
|
|
124
134
|
log.warn('purge-deprecation', [
|
|
125
135
|
'The `purge`/`content` options have changed in Tailwind CSS v3.0.',
|
|
126
136
|
'Update your configuration file to eliminate this warning.',
|
|
127
|
-
|
|
137
|
+
'https://tailwindcss.com/docs/upgrade-guide#configure-content-sources',
|
|
128
138
|
])
|
|
129
139
|
}
|
|
130
140
|
|
|
@@ -140,8 +150,48 @@ export function normalizeConfig(config) {
|
|
|
140
150
|
return []
|
|
141
151
|
})()
|
|
142
152
|
|
|
153
|
+
// Normalize the `blocklist`
|
|
154
|
+
config.blocklist = (() => {
|
|
155
|
+
let { blocklist } = config
|
|
156
|
+
|
|
157
|
+
if (Array.isArray(blocklist)) {
|
|
158
|
+
if (blocklist.every((item) => typeof item === 'string')) {
|
|
159
|
+
return blocklist
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
log.warn('blocklist-invalid', [
|
|
163
|
+
'The `blocklist` option must be an array of strings.',
|
|
164
|
+
'https://tailwindcss.com/docs/content-configuration#discarding-classes',
|
|
165
|
+
])
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
return []
|
|
169
|
+
})()
|
|
170
|
+
|
|
171
|
+
// Normalize prefix option
|
|
172
|
+
if (typeof config.prefix === 'function') {
|
|
173
|
+
log.warn('prefix-function', [
|
|
174
|
+
'As of Tailwind CSS v3.0, `prefix` cannot be a function.',
|
|
175
|
+
'Update `prefix` in your configuration to be a string to eliminate this warning.',
|
|
176
|
+
'https://tailwindcss.com/docs/upgrade-guide#prefix-cannot-be-a-function',
|
|
177
|
+
])
|
|
178
|
+
config.prefix = ''
|
|
179
|
+
} else {
|
|
180
|
+
config.prefix = config.prefix ?? ''
|
|
181
|
+
}
|
|
182
|
+
|
|
143
183
|
// Normalize the `content`
|
|
144
184
|
config.content = {
|
|
185
|
+
relative: (() => {
|
|
186
|
+
let { content } = config
|
|
187
|
+
|
|
188
|
+
if (content?.relative) {
|
|
189
|
+
return content.relative
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
return config.future?.relativeContentPathsByDefault ?? false
|
|
193
|
+
})(),
|
|
194
|
+
|
|
145
195
|
files: (() => {
|
|
146
196
|
let { content, purge } = config
|
|
147
197
|
|
|
@@ -170,7 +220,7 @@ export function normalizeConfig(config) {
|
|
|
170
220
|
|
|
171
221
|
let extractors = {}
|
|
172
222
|
|
|
173
|
-
|
|
223
|
+
let defaultExtractor = (() => {
|
|
174
224
|
if (config.purge?.options?.defaultExtractor) {
|
|
175
225
|
return config.purge.options.defaultExtractor
|
|
176
226
|
}
|
|
@@ -182,6 +232,10 @@ export function normalizeConfig(config) {
|
|
|
182
232
|
return undefined
|
|
183
233
|
})()
|
|
184
234
|
|
|
235
|
+
if (defaultExtractor !== undefined) {
|
|
236
|
+
extractors.DEFAULT = defaultExtractor
|
|
237
|
+
}
|
|
238
|
+
|
|
185
239
|
// Functions
|
|
186
240
|
if (typeof extract === 'function') {
|
|
187
241
|
extractors.DEFAULT = extract
|
|
@@ -229,5 +283,18 @@ export function normalizeConfig(config) {
|
|
|
229
283
|
})(),
|
|
230
284
|
}
|
|
231
285
|
|
|
286
|
+
// Validate globs to prevent bogus globs.
|
|
287
|
+
// E.g.: `./src/*.{html}` is invalid, the `{html}` should just be `html`
|
|
288
|
+
for (let file of config.content.files) {
|
|
289
|
+
if (typeof file === 'string' && /{([^,]*?)}/g.test(file)) {
|
|
290
|
+
log.warn('invalid-glob-braces', [
|
|
291
|
+
`The glob pattern ${dim(file)} in your Tailwind CSS configuration is invalid.`,
|
|
292
|
+
`Update it to ${dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`,
|
|
293
|
+
// TODO: Add https://tw.wtf/invalid-glob-braces
|
|
294
|
+
])
|
|
295
|
+
break
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
232
299
|
return config
|
|
233
300
|
}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @typedef {object} ScreenValue
|
|
3
|
+
* @property {number|undefined} min
|
|
4
|
+
* @property {number|undefined} max
|
|
5
|
+
* @property {string|undefined} raw
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* @typedef {object} Screen
|
|
10
|
+
* @property {string} name
|
|
11
|
+
* @property {boolean} not
|
|
12
|
+
* @property {ScreenValue[]} values
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* A function that normalizes the various forms that the screens object can be
|
|
17
|
+
* provided in.
|
|
18
|
+
*
|
|
19
|
+
* Input(s):
|
|
20
|
+
* - ['100px', '200px'] // Raw strings
|
|
21
|
+
* - { sm: '100px', md: '200px' } // Object with string values
|
|
22
|
+
* - { sm: { min: '100px' }, md: { max: '100px' } } // Object with object values
|
|
23
|
+
* - { sm: [{ min: '100px' }, { max: '200px' }] } // Object with object array (multiple values)
|
|
24
|
+
*
|
|
25
|
+
* Output(s):
|
|
26
|
+
* - [{ name: 'sm', values: [{ min: '100px', max: '200px' }] }] // List of objects, that contains multiple values
|
|
27
|
+
*
|
|
28
|
+
* @returns {Screen[]}
|
|
29
|
+
*/
|
|
30
|
+
export function normalizeScreens(screens, root = true) {
|
|
31
|
+
if (Array.isArray(screens)) {
|
|
32
|
+
return screens.map((screen) => {
|
|
33
|
+
if (root && Array.isArray(screen)) {
|
|
34
|
+
throw new Error('The tuple syntax is not supported for `screens`.')
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (typeof screen === 'string') {
|
|
38
|
+
return { name: screen.toString(), not: false, values: [{ min: screen, max: undefined }] }
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
let [name, options] = screen
|
|
42
|
+
name = name.toString()
|
|
43
|
+
|
|
44
|
+
if (typeof options === 'string') {
|
|
45
|
+
return { name, not: false, values: [{ min: options, max: undefined }] }
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (Array.isArray(options)) {
|
|
49
|
+
return { name, not: false, values: options.map((option) => resolveValue(option)) }
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return { name, not: false, values: [resolveValue(options)] }
|
|
53
|
+
})
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return normalizeScreens(Object.entries(screens ?? {}), false)
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* @param {Screen} screen
|
|
61
|
+
* @returns {{result: false, reason: string} | {result: true, reason: null}}
|
|
62
|
+
*/
|
|
63
|
+
export function isScreenSortable(screen) {
|
|
64
|
+
if (screen.values.length !== 1) {
|
|
65
|
+
return { result: false, reason: 'multiple-values' }
|
|
66
|
+
} else if (screen.values[0].raw !== undefined) {
|
|
67
|
+
return { result: false, reason: 'raw-values' }
|
|
68
|
+
} else if (screen.values[0].min !== undefined && screen.values[0].max !== undefined) {
|
|
69
|
+
return { result: false, reason: 'min-and-max' }
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
return { result: true, reason: null }
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* @param {'min' | 'max'} type
|
|
77
|
+
* @param {Screen | 'string'} a
|
|
78
|
+
* @param {Screen | 'string'} z
|
|
79
|
+
* @returns {number}
|
|
80
|
+
*/
|
|
81
|
+
export function compareScreens(type, a, z) {
|
|
82
|
+
let aScreen = toScreen(a, type)
|
|
83
|
+
let zScreen = toScreen(z, type)
|
|
84
|
+
|
|
85
|
+
let aSorting = isScreenSortable(aScreen)
|
|
86
|
+
let bSorting = isScreenSortable(zScreen)
|
|
87
|
+
|
|
88
|
+
// These cases should never happen and indicate a bug in Tailwind CSS itself
|
|
89
|
+
if (aSorting.reason === 'multiple-values' || bSorting.reason === 'multiple-values') {
|
|
90
|
+
throw new Error(
|
|
91
|
+
'Attempted to sort a screen with multiple values. This should never happen. Please open a bug report.'
|
|
92
|
+
)
|
|
93
|
+
} else if (aSorting.reason === 'raw-values' || bSorting.reason === 'raw-values') {
|
|
94
|
+
throw new Error(
|
|
95
|
+
'Attempted to sort a screen with raw values. This should never happen. Please open a bug report.'
|
|
96
|
+
)
|
|
97
|
+
} else if (aSorting.reason === 'min-and-max' || bSorting.reason === 'min-and-max') {
|
|
98
|
+
throw new Error(
|
|
99
|
+
'Attempted to sort a screen with both min and max values. This should never happen. Please open a bug report.'
|
|
100
|
+
)
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
// Let the sorting begin
|
|
104
|
+
let { min: aMin, max: aMax } = aScreen.values[0]
|
|
105
|
+
let { min: zMin, max: zMax } = zScreen.values[0]
|
|
106
|
+
|
|
107
|
+
// Negating screens flip their behavior. Basically `not min-width` is `max-width`
|
|
108
|
+
if (a.not) [aMin, aMax] = [aMax, aMin]
|
|
109
|
+
if (z.not) [zMin, zMax] = [zMax, zMin]
|
|
110
|
+
|
|
111
|
+
aMin = aMin === undefined ? aMin : parseFloat(aMin)
|
|
112
|
+
aMax = aMax === undefined ? aMax : parseFloat(aMax)
|
|
113
|
+
zMin = zMin === undefined ? zMin : parseFloat(zMin)
|
|
114
|
+
zMax = zMax === undefined ? zMax : parseFloat(zMax)
|
|
115
|
+
|
|
116
|
+
let [aValue, zValue] = type === 'min' ? [aMin, zMin] : [zMax, aMax]
|
|
117
|
+
|
|
118
|
+
return aValue - zValue
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
*
|
|
123
|
+
* @param {PartialScreen> | string} value
|
|
124
|
+
* @param {'min' | 'max'} type
|
|
125
|
+
* @returns {Screen}
|
|
126
|
+
*/
|
|
127
|
+
export function toScreen(value, type) {
|
|
128
|
+
if (typeof value === 'object') {
|
|
129
|
+
return value
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
return {
|
|
133
|
+
name: 'arbitrary-screen',
|
|
134
|
+
values: [{ [type]: value }],
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
function resolveValue({ 'min-width': _minWidth, min = _minWidth, max, raw } = {}) {
|
|
139
|
+
return { min, max, raw }
|
|
140
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { splitAtTopLevelOnly } from './splitAtTopLevelOnly'
|
|
2
|
+
|
|
3
|
+
let KEYWORDS = new Set(['inset', 'inherit', 'initial', 'revert', 'unset'])
|
|
4
|
+
let SPACE = /\ +(?![^(]*\))/g // Similar to the one above, but with spaces instead.
|
|
5
|
+
let LENGTH = /^-?(\d+|\.\d+)(.*?)$/g
|
|
6
|
+
|
|
7
|
+
export function parseBoxShadowValue(input) {
|
|
8
|
+
let shadows = splitAtTopLevelOnly(input, ',')
|
|
9
|
+
return shadows.map((shadow) => {
|
|
10
|
+
let value = shadow.trim()
|
|
11
|
+
let result = { raw: value }
|
|
12
|
+
let parts = value.split(SPACE)
|
|
13
|
+
let seen = new Set()
|
|
14
|
+
|
|
15
|
+
for (let part of parts) {
|
|
16
|
+
// Reset index, since the regex is stateful.
|
|
17
|
+
LENGTH.lastIndex = 0
|
|
18
|
+
|
|
19
|
+
// Keyword
|
|
20
|
+
if (!seen.has('KEYWORD') && KEYWORDS.has(part)) {
|
|
21
|
+
result.keyword = part
|
|
22
|
+
seen.add('KEYWORD')
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
// Length value
|
|
26
|
+
else if (LENGTH.test(part)) {
|
|
27
|
+
if (!seen.has('X')) {
|
|
28
|
+
result.x = part
|
|
29
|
+
seen.add('X')
|
|
30
|
+
} else if (!seen.has('Y')) {
|
|
31
|
+
result.y = part
|
|
32
|
+
seen.add('Y')
|
|
33
|
+
} else if (!seen.has('BLUR')) {
|
|
34
|
+
result.blur = part
|
|
35
|
+
seen.add('BLUR')
|
|
36
|
+
} else if (!seen.has('SPREAD')) {
|
|
37
|
+
result.spread = part
|
|
38
|
+
seen.add('SPREAD')
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
// Color or unknown
|
|
43
|
+
else {
|
|
44
|
+
if (!result.color) {
|
|
45
|
+
result.color = part
|
|
46
|
+
} else {
|
|
47
|
+
if (!result.unknown) result.unknown = []
|
|
48
|
+
result.unknown.push(part)
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Check if valid
|
|
54
|
+
result.valid = result.x !== undefined && result.y !== undefined
|
|
55
|
+
|
|
56
|
+
return result
|
|
57
|
+
})
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function formatBoxShadowValue(shadows) {
|
|
61
|
+
return shadows
|
|
62
|
+
.map((shadow) => {
|
|
63
|
+
if (!shadow.valid) {
|
|
64
|
+
return shadow.raw
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return [shadow.keyword, shadow.x, shadow.y, shadow.blur, shadow.spread, shadow.color]
|
|
68
|
+
.filter(Boolean)
|
|
69
|
+
.join(' ')
|
|
70
|
+
})
|
|
71
|
+
.join(', ')
|
|
72
|
+
}
|
|
@@ -1,49 +1,44 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
if (glob.substr(0, 2) === './') {
|
|
19
|
-
glob = glob.substr(2)
|
|
20
|
-
}
|
|
21
|
-
if (glob.charAt(0) === '/') {
|
|
22
|
-
glob = glob.substr(1)
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* @typedef {{type: 'dependency', file: string} | {type: 'dir-dependency', dir: string, glob: string}} Dependency
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @param {import('../lib/content.js').ContentPath} contentPath
|
|
10
|
+
* @returns {Dependency[]}
|
|
11
|
+
*/
|
|
12
|
+
export default function parseDependency(contentPath) {
|
|
13
|
+
if (contentPath.ignore) {
|
|
14
|
+
return []
|
|
23
15
|
}
|
|
24
16
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
let message
|
|
34
|
-
|
|
35
|
-
if (isGlob(normalizedFileOrGlob)) {
|
|
36
|
-
let { base, glob } = parseGlob(normalizedFileOrGlob)
|
|
37
|
-
message = { type: 'dir-dependency', dir: path.resolve(base), glob }
|
|
38
|
-
} else {
|
|
39
|
-
message = { type: 'dependency', file: path.resolve(normalizedFileOrGlob) }
|
|
17
|
+
if (!contentPath.glob) {
|
|
18
|
+
return [
|
|
19
|
+
{
|
|
20
|
+
type: 'dependency',
|
|
21
|
+
file: contentPath.base,
|
|
22
|
+
},
|
|
23
|
+
]
|
|
40
24
|
}
|
|
41
25
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
26
|
+
if (process.env.ROLLUP_WATCH === 'true') {
|
|
27
|
+
// rollup-plugin-postcss does not support dir-dependency messages
|
|
28
|
+
// but directories can be watched in the same way as files
|
|
29
|
+
return [
|
|
30
|
+
{
|
|
31
|
+
type: 'dependency',
|
|
32
|
+
file: contentPath.base,
|
|
33
|
+
},
|
|
34
|
+
]
|
|
46
35
|
}
|
|
47
36
|
|
|
48
|
-
return
|
|
37
|
+
return [
|
|
38
|
+
{
|
|
39
|
+
type: 'dir-dependency',
|
|
40
|
+
dir: contentPath.base,
|
|
41
|
+
glob: contentPath.glob,
|
|
42
|
+
},
|
|
43
|
+
]
|
|
49
44
|
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import globParent from 'glob-parent'
|
|
2
|
+
|
|
3
|
+
// Based on `glob-base`
|
|
4
|
+
// https://github.com/micromatch/glob-base/blob/master/index.js
|
|
5
|
+
export function parseGlob(pattern) {
|
|
6
|
+
let glob = pattern
|
|
7
|
+
let base = globParent(pattern)
|
|
8
|
+
|
|
9
|
+
if (base !== '.') {
|
|
10
|
+
glob = pattern.substr(base.length)
|
|
11
|
+
if (glob.charAt(0) === '/') {
|
|
12
|
+
glob = glob.substr(1)
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
if (glob.substr(0, 2) === './') {
|
|
17
|
+
glob = glob.substr(2)
|
|
18
|
+
}
|
|
19
|
+
if (glob.charAt(0) === '/') {
|
|
20
|
+
glob = glob.substr(1)
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return { base, glob }
|
|
24
|
+
}
|