tailwindcss 0.0.0-insiders.bd4dddd → 0.0.0-insiders.bda8421
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/LICENSE +1 -2
- package/README.md +13 -10
- package/colors.d.ts +3 -0
- package/defaultConfig.d.ts +3 -0
- package/defaultTheme.d.ts +4 -0
- package/lib/cli/build/deps.js +62 -0
- package/lib/cli/build/index.js +54 -0
- package/lib/cli/build/plugin.js +371 -0
- package/lib/cli/build/utils.js +88 -0
- package/lib/cli/build/watching.js +182 -0
- package/lib/cli/help/index.js +73 -0
- package/lib/cli/index.js +230 -0
- package/lib/cli/init/index.js +63 -0
- package/lib/cli-peer-dependencies.js +28 -7
- package/lib/cli.js +1 -741
- package/lib/corePluginList.js +17 -4
- package/lib/corePlugins.js +2503 -1839
- package/lib/css/preflight.css +32 -13
- package/lib/featureFlags.js +45 -28
- package/lib/index.js +1 -29
- package/lib/lib/cacheInvalidation.js +92 -0
- package/lib/lib/collapseAdjacentRules.js +30 -10
- package/lib/lib/collapseDuplicateDeclarations.js +13 -8
- package/lib/lib/content.js +214 -0
- package/lib/lib/defaultExtractor.js +240 -31
- package/lib/lib/evaluateTailwindFunctions.js +117 -50
- package/lib/lib/expandApplyAtRules.js +466 -230
- package/lib/lib/expandTailwindAtRules.js +156 -135
- package/lib/lib/findAtConfigPath.js +46 -0
- package/lib/lib/generateRules.js +554 -200
- package/lib/lib/getModuleDependencies.js +88 -37
- package/lib/lib/load-config.js +57 -0
- package/lib/lib/normalizeTailwindDirectives.js +39 -33
- package/lib/lib/offsets.js +355 -0
- package/lib/lib/partitionApplyAtRules.js +58 -0
- package/lib/lib/regex.js +74 -0
- package/lib/lib/remap-bitfield.js +89 -0
- package/lib/lib/resolveDefaultsAtRules.js +97 -69
- package/lib/lib/setupContextUtils.js +796 -341
- package/lib/lib/setupTrackingContext.js +66 -71
- package/lib/lib/sharedState.js +45 -14
- package/lib/lib/substituteScreenAtRules.js +14 -10
- package/lib/plugin.js +48 -0
- package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
- package/lib/postcss-plugins/nesting/index.js +21 -0
- package/lib/postcss-plugins/nesting/plugin.js +89 -0
- package/lib/processTailwindFeatures.js +37 -27
- package/lib/public/colors.js +272 -246
- package/lib/public/create-plugin.js +9 -5
- package/lib/public/default-config.js +10 -6
- package/lib/public/default-theme.js +10 -6
- package/lib/public/load-config.js +12 -0
- package/lib/public/resolve-config.js +11 -6
- package/lib/util/applyImportantSelector.js +36 -0
- package/lib/util/bigSign.js +6 -1
- package/lib/util/buildMediaQuery.js +13 -6
- package/lib/util/cloneDeep.js +9 -6
- package/lib/util/cloneNodes.js +44 -4
- package/lib/util/color.js +70 -53
- package/lib/util/colorNames.js +752 -0
- package/lib/util/configurePlugins.js +7 -2
- package/lib/util/createPlugin.js +8 -6
- package/lib/util/createUtilityPlugin.js +16 -16
- package/lib/util/dataTypes.js +295 -113
- package/lib/util/defaults.js +12 -7
- package/lib/util/escapeClassName.js +13 -8
- package/lib/util/escapeCommas.js +7 -2
- package/lib/util/flattenColorPalette.js +11 -12
- package/lib/util/formatVariantSelector.js +235 -151
- package/lib/util/getAllConfigs.js +33 -12
- package/lib/util/hashConfig.js +9 -4
- package/lib/util/isKeyframeRule.js +7 -2
- package/lib/util/isPlainObject.js +8 -3
- package/lib/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +25 -15
- package/lib/util/log.js +25 -15
- package/lib/util/nameClass.js +27 -10
- package/lib/util/negateValue.js +25 -8
- package/lib/util/normalizeConfig.js +127 -82
- package/lib/util/normalizeScreens.js +128 -11
- package/lib/util/parseAnimationValue.js +44 -40
- package/lib/util/parseBoxShadowValue.js +34 -23
- package/lib/util/parseDependency.js +39 -55
- package/lib/util/parseGlob.js +36 -0
- package/lib/util/parseObjectStyles.js +15 -10
- package/lib/util/pluginUtils.js +172 -69
- package/lib/util/prefixSelector.js +30 -12
- package/lib/util/pseudoElements.js +212 -0
- package/lib/util/removeAlphaVariables.js +31 -0
- package/lib/util/resolveConfig.js +101 -87
- package/lib/util/resolveConfigPath.js +30 -12
- package/lib/util/responsive.js +11 -6
- package/lib/util/splitAtTopLevelOnly.js +51 -0
- package/lib/util/tap.js +6 -1
- package/lib/util/toColorValue.js +7 -3
- package/lib/util/toPath.js +22 -4
- package/lib/util/transformThemeValue.js +40 -30
- package/lib/util/validateConfig.js +37 -0
- package/lib/util/validateFormalSyntax.js +26 -0
- package/lib/util/withAlphaVariable.js +27 -15
- package/lib/value-parser/LICENSE +22 -0
- package/lib/value-parser/README.md +3 -0
- package/lib/value-parser/index.d.js +2 -0
- package/lib/value-parser/index.js +22 -0
- package/lib/value-parser/parse.js +259 -0
- package/lib/value-parser/stringify.js +38 -0
- package/lib/value-parser/unit.js +86 -0
- package/lib/value-parser/walk.js +16 -0
- package/loadConfig.d.ts +4 -0
- package/loadConfig.js +2 -0
- package/nesting/index.d.ts +4 -0
- package/nesting/index.js +2 -12
- package/package.json +60 -55
- package/peers/index.js +75503 -55095
- package/plugin.d.ts +11 -0
- package/resolveConfig.d.ts +31 -0
- package/scripts/generate-types.js +104 -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 +437 -0
- package/src/cli/build/utils.js +76 -0
- package/src/cli/build/watching.js +229 -0
- package/src/cli/help/index.js +70 -0
- package/src/cli/index.js +216 -0
- package/src/cli/init/index.js +79 -0
- package/src/cli-peer-dependencies.js +7 -1
- package/src/cli.js +1 -811
- package/src/corePluginList.js +1 -1
- package/src/corePlugins.js +849 -243
- package/src/css/preflight.css +32 -13
- package/src/featureFlags.js +13 -9
- package/src/index.js +1 -28
- package/src/lib/cacheInvalidation.js +52 -0
- package/src/lib/collapseAdjacentRules.js +21 -2
- package/src/lib/content.js +249 -0
- package/src/lib/defaultExtractor.js +215 -33
- package/src/lib/evaluateTailwindFunctions.js +82 -8
- package/src/lib/expandApplyAtRules.js +512 -224
- package/src/lib/expandTailwindAtRules.js +102 -87
- package/src/lib/findAtConfigPath.js +48 -0
- package/src/lib/generateRules.js +541 -146
- package/src/lib/getModuleDependencies.js +70 -30
- package/src/lib/load-config.ts +44 -0
- package/src/lib/normalizeTailwindDirectives.js +1 -0
- package/src/lib/offsets.js +432 -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 +55 -30
- package/src/lib/setupContextUtils.js +720 -190
- package/src/lib/setupTrackingContext.js +47 -61
- package/src/lib/sharedState.js +15 -4
- package/src/plugin.js +47 -0
- 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 +11 -4
- package/src/public/colors.js +22 -0
- package/src/public/default-config.js +1 -1
- package/src/public/default-theme.js +2 -2
- package/src/public/load-config.js +2 -0
- package/src/util/applyImportantSelector.js +27 -0
- package/src/util/buildMediaQuery.js +5 -3
- package/src/util/cloneNodes.js +40 -2
- package/src/util/color.js +39 -20
- package/src/util/colorNames.js +150 -0
- package/src/util/dataTypes.js +184 -26
- package/src/util/formatVariantSelector.js +272 -144
- package/src/util/getAllConfigs.js +21 -2
- package/src/util/isPlainObject.js +1 -1
- package/src/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +1 -1
- package/src/util/log.js +8 -8
- package/src/util/nameClass.js +4 -0
- package/src/util/negateValue.js +11 -3
- package/src/util/normalizeConfig.js +45 -6
- package/src/util/normalizeScreens.js +99 -4
- package/src/util/parseBoxShadowValue.js +4 -3
- package/src/util/parseDependency.js +37 -42
- package/src/util/parseGlob.js +24 -0
- package/src/util/pluginUtils.js +139 -24
- package/src/util/prefixSelector.js +31 -10
- package/src/util/pseudoElements.js +171 -0
- package/src/util/removeAlphaVariables.js +24 -0
- package/src/util/resolveConfig.js +70 -32
- package/src/util/resolveConfigPath.js +12 -1
- package/src/util/splitAtTopLevelOnly.js +52 -0
- package/src/util/toPath.js +1 -1
- package/src/util/transformThemeValue.js +13 -3
- package/src/util/validateConfig.js +26 -0
- package/src/util/validateFormalSyntax.js +34 -0
- package/src/util/withAlphaVariable.js +1 -1
- package/src/value-parser/LICENSE +22 -0
- package/src/value-parser/README.md +3 -0
- package/src/value-parser/index.d.ts +177 -0
- package/src/value-parser/index.js +28 -0
- package/src/value-parser/parse.js +303 -0
- package/src/value-parser/stringify.js +41 -0
- package/src/value-parser/unit.js +118 -0
- package/src/value-parser/walk.js +18 -0
- package/stubs/.gitignore +1 -0
- package/stubs/.prettierrc.json +6 -0
- package/stubs/{defaultConfig.stub.js → config.full.js} +290 -178
- package/stubs/postcss.config.js +6 -0
- package/stubs/tailwind.config.cjs +2 -0
- package/stubs/tailwind.config.js +2 -0
- package/stubs/tailwind.config.ts +3 -0
- package/types/config.d.ts +376 -0
- package/types/generated/.gitkeep +0 -0
- package/types/generated/colors.d.ts +298 -0
- package/types/generated/corePluginList.d.ts +1 -0
- package/types/generated/default-theme.d.ts +397 -0
- package/types/index.d.ts +11 -0
- package/CHANGELOG.md +0 -1959
- package/lib/constants.js +0 -37
- package/lib/lib/detectNesting.js +0 -34
- package/nesting/plugin.js +0 -41
- package/scripts/install-integrations.js +0 -27
- package/scripts/rebuildFixtures.js +0 -68
- package/src/constants.js +0 -17
- package/src/lib/detectNesting.js +0 -39
- /package/stubs/{simpleConfig.stub.js → config.simple.js} +0 -0
- /package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -0
package/src/util/cloneNodes.js
CHANGED
|
@@ -1,11 +1,49 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @param {import('postcss').Container[]} nodes
|
|
3
|
+
* @param {any} source
|
|
4
|
+
* @param {any} raws
|
|
5
|
+
* @returns {import('postcss').Container[]}
|
|
6
|
+
*/
|
|
7
|
+
export default function cloneNodes(nodes, source = undefined, raws = undefined) {
|
|
2
8
|
return nodes.map((node) => {
|
|
3
9
|
let cloned = node.clone()
|
|
4
10
|
|
|
11
|
+
if (raws !== undefined) {
|
|
12
|
+
cloned.raws.tailwind = {
|
|
13
|
+
...cloned.raws.tailwind,
|
|
14
|
+
...raws,
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
5
18
|
if (source !== undefined) {
|
|
6
|
-
cloned
|
|
19
|
+
traverse(cloned, (node) => {
|
|
20
|
+
// Do not traverse nodes that have opted
|
|
21
|
+
// to preserve their original source
|
|
22
|
+
let shouldPreserveSource = node.raws.tailwind?.preserveSource === true && node.source
|
|
23
|
+
if (shouldPreserveSource) {
|
|
24
|
+
return false
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
// Otherwise we can safely replace the source
|
|
28
|
+
// And continue traversing
|
|
29
|
+
node.source = source
|
|
30
|
+
})
|
|
7
31
|
}
|
|
8
32
|
|
|
9
33
|
return cloned
|
|
10
34
|
})
|
|
11
35
|
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Traverse a tree of nodes and don't traverse children if the callback
|
|
39
|
+
* returns false. Ideally we'd use Container#walk instead of this
|
|
40
|
+
* function but it stops traversing siblings too.
|
|
41
|
+
*
|
|
42
|
+
* @param {import('postcss').Container} node
|
|
43
|
+
* @param {(node: import('postcss').Container) => boolean} onNode
|
|
44
|
+
*/
|
|
45
|
+
function traverse(node, onNode) {
|
|
46
|
+
if (onNode(node) !== false) {
|
|
47
|
+
node.each?.((child) => traverse(child, onNode))
|
|
48
|
+
}
|
|
49
|
+
}
|
package/src/util/color.js
CHANGED
|
@@ -1,18 +1,22 @@
|
|
|
1
|
-
import namedColors from '
|
|
1
|
+
import namedColors from './colorNames'
|
|
2
2
|
|
|
3
3
|
let HEX = /^#([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?$/i
|
|
4
4
|
let SHORT_HEX = /^#([a-f\d])([a-f\d])([a-f\d])([a-f\d])?$/i
|
|
5
|
-
let VALUE =
|
|
6
|
-
let SEP =
|
|
7
|
-
let ALPHA_SEP =
|
|
5
|
+
let VALUE = /(?:\d+|\d*\.\d+)%?/
|
|
6
|
+
let SEP = /(?:\s*,\s*|\s+)/
|
|
7
|
+
let ALPHA_SEP = /\s*[,/]\s*/
|
|
8
|
+
let CUSTOM_PROPERTY = /var\(--(?:[^ )]*?)(?:,(?:[^ )]*?|var\(--[^ )]*?\)))?\)/
|
|
9
|
+
|
|
8
10
|
let RGB = new RegExp(
|
|
9
|
-
`^rgba
|
|
11
|
+
`^(rgba?)\\(\\s*(${VALUE.source}|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`
|
|
10
12
|
)
|
|
11
13
|
let HSL = new RegExp(
|
|
12
|
-
`^hsla
|
|
14
|
+
`^(hsla?)\\(\\s*((?:${VALUE.source})(?:deg|rad|grad|turn)?|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`
|
|
13
15
|
)
|
|
14
16
|
|
|
15
|
-
|
|
17
|
+
// In "loose" mode the color may contain fewer than 3 parts, as long as at least
|
|
18
|
+
// one of the parts is variable.
|
|
19
|
+
export function parseColor(value, { loose = false } = {}) {
|
|
16
20
|
if (typeof value !== 'string') {
|
|
17
21
|
return null
|
|
18
22
|
}
|
|
@@ -40,30 +44,45 @@ export function parseColor(value) {
|
|
|
40
44
|
}
|
|
41
45
|
}
|
|
42
46
|
|
|
43
|
-
let
|
|
47
|
+
let match = value.match(RGB) ?? value.match(HSL)
|
|
44
48
|
|
|
45
|
-
if (
|
|
46
|
-
return
|
|
47
|
-
mode: 'rgb',
|
|
48
|
-
color: [rgbMatch[1], rgbMatch[2], rgbMatch[3]].map((v) => v.toString()),
|
|
49
|
-
alpha: rgbMatch[4]?.toString?.(),
|
|
50
|
-
}
|
|
49
|
+
if (match === null) {
|
|
50
|
+
return null
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
let
|
|
53
|
+
let color = [match[2], match[3], match[4]].filter(Boolean).map((v) => v.toString())
|
|
54
54
|
|
|
55
|
-
|
|
55
|
+
// rgba(var(--my-color), 0.1)
|
|
56
|
+
// hsla(var(--my-color), 0.1)
|
|
57
|
+
if (color.length === 2 && color[0].startsWith('var(')) {
|
|
56
58
|
return {
|
|
57
|
-
mode:
|
|
58
|
-
color: [
|
|
59
|
-
alpha:
|
|
59
|
+
mode: match[1],
|
|
60
|
+
color: [color[0]],
|
|
61
|
+
alpha: color[1],
|
|
60
62
|
}
|
|
61
63
|
}
|
|
62
64
|
|
|
63
|
-
|
|
65
|
+
if (!loose && color.length !== 3) {
|
|
66
|
+
return null
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
if (color.length < 3 && !color.some((part) => /^var\(.*?\)$/.test(part))) {
|
|
70
|
+
return null
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return {
|
|
74
|
+
mode: match[1],
|
|
75
|
+
color,
|
|
76
|
+
alpha: match[5]?.toString?.(),
|
|
77
|
+
}
|
|
64
78
|
}
|
|
65
79
|
|
|
66
80
|
export function formatColor({ mode, color, alpha }) {
|
|
67
81
|
let hasAlpha = alpha !== undefined
|
|
82
|
+
|
|
83
|
+
if (mode === 'rgba' || mode === 'hsla') {
|
|
84
|
+
return `${mode}(${color.join(', ')}${hasAlpha ? `, ${alpha}` : ''})`
|
|
85
|
+
}
|
|
86
|
+
|
|
68
87
|
return `${mode}(${color.join(' ')}${hasAlpha ? ` / ${alpha}` : ''})`
|
|
69
88
|
}
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
export default {
|
|
2
|
+
aliceblue: [240, 248, 255],
|
|
3
|
+
antiquewhite: [250, 235, 215],
|
|
4
|
+
aqua: [0, 255, 255],
|
|
5
|
+
aquamarine: [127, 255, 212],
|
|
6
|
+
azure: [240, 255, 255],
|
|
7
|
+
beige: [245, 245, 220],
|
|
8
|
+
bisque: [255, 228, 196],
|
|
9
|
+
black: [0, 0, 0],
|
|
10
|
+
blanchedalmond: [255, 235, 205],
|
|
11
|
+
blue: [0, 0, 255],
|
|
12
|
+
blueviolet: [138, 43, 226],
|
|
13
|
+
brown: [165, 42, 42],
|
|
14
|
+
burlywood: [222, 184, 135],
|
|
15
|
+
cadetblue: [95, 158, 160],
|
|
16
|
+
chartreuse: [127, 255, 0],
|
|
17
|
+
chocolate: [210, 105, 30],
|
|
18
|
+
coral: [255, 127, 80],
|
|
19
|
+
cornflowerblue: [100, 149, 237],
|
|
20
|
+
cornsilk: [255, 248, 220],
|
|
21
|
+
crimson: [220, 20, 60],
|
|
22
|
+
cyan: [0, 255, 255],
|
|
23
|
+
darkblue: [0, 0, 139],
|
|
24
|
+
darkcyan: [0, 139, 139],
|
|
25
|
+
darkgoldenrod: [184, 134, 11],
|
|
26
|
+
darkgray: [169, 169, 169],
|
|
27
|
+
darkgreen: [0, 100, 0],
|
|
28
|
+
darkgrey: [169, 169, 169],
|
|
29
|
+
darkkhaki: [189, 183, 107],
|
|
30
|
+
darkmagenta: [139, 0, 139],
|
|
31
|
+
darkolivegreen: [85, 107, 47],
|
|
32
|
+
darkorange: [255, 140, 0],
|
|
33
|
+
darkorchid: [153, 50, 204],
|
|
34
|
+
darkred: [139, 0, 0],
|
|
35
|
+
darksalmon: [233, 150, 122],
|
|
36
|
+
darkseagreen: [143, 188, 143],
|
|
37
|
+
darkslateblue: [72, 61, 139],
|
|
38
|
+
darkslategray: [47, 79, 79],
|
|
39
|
+
darkslategrey: [47, 79, 79],
|
|
40
|
+
darkturquoise: [0, 206, 209],
|
|
41
|
+
darkviolet: [148, 0, 211],
|
|
42
|
+
deeppink: [255, 20, 147],
|
|
43
|
+
deepskyblue: [0, 191, 255],
|
|
44
|
+
dimgray: [105, 105, 105],
|
|
45
|
+
dimgrey: [105, 105, 105],
|
|
46
|
+
dodgerblue: [30, 144, 255],
|
|
47
|
+
firebrick: [178, 34, 34],
|
|
48
|
+
floralwhite: [255, 250, 240],
|
|
49
|
+
forestgreen: [34, 139, 34],
|
|
50
|
+
fuchsia: [255, 0, 255],
|
|
51
|
+
gainsboro: [220, 220, 220],
|
|
52
|
+
ghostwhite: [248, 248, 255],
|
|
53
|
+
gold: [255, 215, 0],
|
|
54
|
+
goldenrod: [218, 165, 32],
|
|
55
|
+
gray: [128, 128, 128],
|
|
56
|
+
green: [0, 128, 0],
|
|
57
|
+
greenyellow: [173, 255, 47],
|
|
58
|
+
grey: [128, 128, 128],
|
|
59
|
+
honeydew: [240, 255, 240],
|
|
60
|
+
hotpink: [255, 105, 180],
|
|
61
|
+
indianred: [205, 92, 92],
|
|
62
|
+
indigo: [75, 0, 130],
|
|
63
|
+
ivory: [255, 255, 240],
|
|
64
|
+
khaki: [240, 230, 140],
|
|
65
|
+
lavender: [230, 230, 250],
|
|
66
|
+
lavenderblush: [255, 240, 245],
|
|
67
|
+
lawngreen: [124, 252, 0],
|
|
68
|
+
lemonchiffon: [255, 250, 205],
|
|
69
|
+
lightblue: [173, 216, 230],
|
|
70
|
+
lightcoral: [240, 128, 128],
|
|
71
|
+
lightcyan: [224, 255, 255],
|
|
72
|
+
lightgoldenrodyellow: [250, 250, 210],
|
|
73
|
+
lightgray: [211, 211, 211],
|
|
74
|
+
lightgreen: [144, 238, 144],
|
|
75
|
+
lightgrey: [211, 211, 211],
|
|
76
|
+
lightpink: [255, 182, 193],
|
|
77
|
+
lightsalmon: [255, 160, 122],
|
|
78
|
+
lightseagreen: [32, 178, 170],
|
|
79
|
+
lightskyblue: [135, 206, 250],
|
|
80
|
+
lightslategray: [119, 136, 153],
|
|
81
|
+
lightslategrey: [119, 136, 153],
|
|
82
|
+
lightsteelblue: [176, 196, 222],
|
|
83
|
+
lightyellow: [255, 255, 224],
|
|
84
|
+
lime: [0, 255, 0],
|
|
85
|
+
limegreen: [50, 205, 50],
|
|
86
|
+
linen: [250, 240, 230],
|
|
87
|
+
magenta: [255, 0, 255],
|
|
88
|
+
maroon: [128, 0, 0],
|
|
89
|
+
mediumaquamarine: [102, 205, 170],
|
|
90
|
+
mediumblue: [0, 0, 205],
|
|
91
|
+
mediumorchid: [186, 85, 211],
|
|
92
|
+
mediumpurple: [147, 112, 219],
|
|
93
|
+
mediumseagreen: [60, 179, 113],
|
|
94
|
+
mediumslateblue: [123, 104, 238],
|
|
95
|
+
mediumspringgreen: [0, 250, 154],
|
|
96
|
+
mediumturquoise: [72, 209, 204],
|
|
97
|
+
mediumvioletred: [199, 21, 133],
|
|
98
|
+
midnightblue: [25, 25, 112],
|
|
99
|
+
mintcream: [245, 255, 250],
|
|
100
|
+
mistyrose: [255, 228, 225],
|
|
101
|
+
moccasin: [255, 228, 181],
|
|
102
|
+
navajowhite: [255, 222, 173],
|
|
103
|
+
navy: [0, 0, 128],
|
|
104
|
+
oldlace: [253, 245, 230],
|
|
105
|
+
olive: [128, 128, 0],
|
|
106
|
+
olivedrab: [107, 142, 35],
|
|
107
|
+
orange: [255, 165, 0],
|
|
108
|
+
orangered: [255, 69, 0],
|
|
109
|
+
orchid: [218, 112, 214],
|
|
110
|
+
palegoldenrod: [238, 232, 170],
|
|
111
|
+
palegreen: [152, 251, 152],
|
|
112
|
+
paleturquoise: [175, 238, 238],
|
|
113
|
+
palevioletred: [219, 112, 147],
|
|
114
|
+
papayawhip: [255, 239, 213],
|
|
115
|
+
peachpuff: [255, 218, 185],
|
|
116
|
+
peru: [205, 133, 63],
|
|
117
|
+
pink: [255, 192, 203],
|
|
118
|
+
plum: [221, 160, 221],
|
|
119
|
+
powderblue: [176, 224, 230],
|
|
120
|
+
purple: [128, 0, 128],
|
|
121
|
+
rebeccapurple: [102, 51, 153],
|
|
122
|
+
red: [255, 0, 0],
|
|
123
|
+
rosybrown: [188, 143, 143],
|
|
124
|
+
royalblue: [65, 105, 225],
|
|
125
|
+
saddlebrown: [139, 69, 19],
|
|
126
|
+
salmon: [250, 128, 114],
|
|
127
|
+
sandybrown: [244, 164, 96],
|
|
128
|
+
seagreen: [46, 139, 87],
|
|
129
|
+
seashell: [255, 245, 238],
|
|
130
|
+
sienna: [160, 82, 45],
|
|
131
|
+
silver: [192, 192, 192],
|
|
132
|
+
skyblue: [135, 206, 235],
|
|
133
|
+
slateblue: [106, 90, 205],
|
|
134
|
+
slategray: [112, 128, 144],
|
|
135
|
+
slategrey: [112, 128, 144],
|
|
136
|
+
snow: [255, 250, 250],
|
|
137
|
+
springgreen: [0, 255, 127],
|
|
138
|
+
steelblue: [70, 130, 180],
|
|
139
|
+
tan: [210, 180, 140],
|
|
140
|
+
teal: [0, 128, 128],
|
|
141
|
+
thistle: [216, 191, 216],
|
|
142
|
+
tomato: [255, 99, 71],
|
|
143
|
+
turquoise: [64, 224, 208],
|
|
144
|
+
violet: [238, 130, 238],
|
|
145
|
+
wheat: [245, 222, 179],
|
|
146
|
+
white: [255, 255, 255],
|
|
147
|
+
whitesmoke: [245, 245, 245],
|
|
148
|
+
yellow: [255, 255, 0],
|
|
149
|
+
yellowgreen: [154, 205, 50],
|
|
150
|
+
}
|
package/src/util/dataTypes.js
CHANGED
|
@@ -1,16 +1,46 @@
|
|
|
1
1
|
import { parseColor } from './color'
|
|
2
2
|
import { parseBoxShadowValue } from './parseBoxShadowValue'
|
|
3
|
+
import { splitAtTopLevelOnly } from './splitAtTopLevelOnly'
|
|
3
4
|
|
|
4
5
|
let cssFunctions = ['min', 'max', 'clamp', 'calc']
|
|
5
6
|
|
|
6
7
|
// Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Types
|
|
7
8
|
|
|
8
|
-
|
|
9
|
-
|
|
9
|
+
function isCSSFunction(value) {
|
|
10
|
+
return cssFunctions.some((fn) => new RegExp(`^${fn}\\(.*\\)`).test(value))
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
// These properties accept a `<dashed-ident>` as one of the values. This means that you can use them
|
|
14
|
+
// as: `timeline-scope: --tl;`
|
|
15
|
+
//
|
|
16
|
+
// Without the `var(--tl)`, in these cases we don't want to normalize the value, and you should add
|
|
17
|
+
// the `var()` yourself.
|
|
18
|
+
//
|
|
19
|
+
// More info:
|
|
20
|
+
// - https://drafts.csswg.org/scroll-animations/#propdef-timeline-scope
|
|
21
|
+
// - https://developer.mozilla.org/en-US/docs/Web/CSS/timeline-scope#dashed-ident
|
|
22
|
+
//
|
|
23
|
+
const AUTO_VAR_INJECTION_EXCEPTIONS = new Set([
|
|
24
|
+
// Concrete properties
|
|
25
|
+
'scroll-timeline-name',
|
|
26
|
+
'timeline-scope',
|
|
27
|
+
'view-timeline-name',
|
|
28
|
+
'font-palette',
|
|
29
|
+
|
|
30
|
+
// Shorthand properties
|
|
31
|
+
'scroll-timeline',
|
|
32
|
+
'animation-timeline',
|
|
33
|
+
'view-timeline',
|
|
34
|
+
])
|
|
10
35
|
|
|
11
36
|
// This is not a data type, but rather a function that can normalize the
|
|
12
37
|
// correct values.
|
|
13
|
-
export function normalize(value, isRoot = true) {
|
|
38
|
+
export function normalize(value, context = null, isRoot = true) {
|
|
39
|
+
let isVarException = context && AUTO_VAR_INJECTION_EXCEPTIONS.has(context.property)
|
|
40
|
+
if (value.startsWith('--') && !isVarException) {
|
|
41
|
+
return `var(${value})`
|
|
42
|
+
}
|
|
43
|
+
|
|
14
44
|
// Keep raw strings if it starts with `url(`
|
|
15
45
|
if (value.includes('url(')) {
|
|
16
46
|
return value
|
|
@@ -21,7 +51,7 @@ export function normalize(value, isRoot = true) {
|
|
|
21
51
|
return part
|
|
22
52
|
}
|
|
23
53
|
|
|
24
|
-
return normalize(part, false)
|
|
54
|
+
return normalize(part, context, false)
|
|
25
55
|
})
|
|
26
56
|
.join('')
|
|
27
57
|
}
|
|
@@ -40,12 +70,123 @@ export function normalize(value, isRoot = true) {
|
|
|
40
70
|
value = value.trim()
|
|
41
71
|
}
|
|
42
72
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return value
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
73
|
+
value = normalizeMathOperatorSpacing(value)
|
|
74
|
+
|
|
75
|
+
return value
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Add spaces around operators inside math functions
|
|
80
|
+
* like calc() that do not follow an operator, '(', or `,`.
|
|
81
|
+
*
|
|
82
|
+
* @param {string} value
|
|
83
|
+
* @returns {string}
|
|
84
|
+
*/
|
|
85
|
+
function normalizeMathOperatorSpacing(value) {
|
|
86
|
+
let preventFormattingInFunctions = ['theme']
|
|
87
|
+
let preventFormattingKeywords = [
|
|
88
|
+
'min-content',
|
|
89
|
+
'max-content',
|
|
90
|
+
'fit-content',
|
|
91
|
+
|
|
92
|
+
// Env
|
|
93
|
+
'safe-area-inset-top',
|
|
94
|
+
'safe-area-inset-right',
|
|
95
|
+
'safe-area-inset-bottom',
|
|
96
|
+
'safe-area-inset-left',
|
|
97
|
+
|
|
98
|
+
'titlebar-area-x',
|
|
99
|
+
'titlebar-area-y',
|
|
100
|
+
'titlebar-area-width',
|
|
101
|
+
'titlebar-area-height',
|
|
102
|
+
|
|
103
|
+
'keyboard-inset-top',
|
|
104
|
+
'keyboard-inset-right',
|
|
105
|
+
'keyboard-inset-bottom',
|
|
106
|
+
'keyboard-inset-left',
|
|
107
|
+
'keyboard-inset-width',
|
|
108
|
+
'keyboard-inset-height',
|
|
109
|
+
|
|
110
|
+
'radial-gradient',
|
|
111
|
+
'linear-gradient',
|
|
112
|
+
'conic-gradient',
|
|
113
|
+
'repeating-radial-gradient',
|
|
114
|
+
'repeating-linear-gradient',
|
|
115
|
+
'repeating-conic-gradient',
|
|
116
|
+
]
|
|
117
|
+
|
|
118
|
+
return value.replace(/(calc|min|max|clamp)\(.+\)/g, (match) => {
|
|
119
|
+
let result = ''
|
|
120
|
+
|
|
121
|
+
function lastChar() {
|
|
122
|
+
let char = result.trimEnd()
|
|
123
|
+
return char[char.length - 1]
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
for (let i = 0; i < match.length; i++) {
|
|
127
|
+
function peek(word) {
|
|
128
|
+
return word.split('').every((char, j) => match[i + j] === char)
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
function consumeUntil(chars) {
|
|
132
|
+
let minIndex = Infinity
|
|
133
|
+
for (let char of chars) {
|
|
134
|
+
let index = match.indexOf(char, i)
|
|
135
|
+
if (index !== -1 && index < minIndex) {
|
|
136
|
+
minIndex = index
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
let result = match.slice(i, minIndex)
|
|
141
|
+
i += result.length - 1
|
|
142
|
+
return result
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
let char = match[i]
|
|
146
|
+
|
|
147
|
+
// Handle `var(--variable)`
|
|
148
|
+
if (peek('var')) {
|
|
149
|
+
// When we consume until `)`, then we are dealing with this scenario:
|
|
150
|
+
// `var(--example)`
|
|
151
|
+
//
|
|
152
|
+
// When we consume until `,`, then we are dealing with this scenario:
|
|
153
|
+
// `var(--example, 1rem)`
|
|
154
|
+
//
|
|
155
|
+
// In this case we do want to "format", the default value as well
|
|
156
|
+
result += consumeUntil([')', ','])
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
// Skip formatting of known keywords
|
|
160
|
+
else if (preventFormattingKeywords.some((keyword) => peek(keyword))) {
|
|
161
|
+
let keyword = preventFormattingKeywords.find((keyword) => peek(keyword))
|
|
162
|
+
result += keyword
|
|
163
|
+
i += keyword.length - 1
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
// Skip formatting inside known functions
|
|
167
|
+
else if (preventFormattingInFunctions.some((fn) => peek(fn))) {
|
|
168
|
+
result += consumeUntil([')'])
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
// Don't break CSS grid track names
|
|
172
|
+
else if (peek('[')) {
|
|
173
|
+
result += consumeUntil([']'])
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
// Handle operators
|
|
177
|
+
else if (
|
|
178
|
+
['+', '-', '*', '/'].includes(char) &&
|
|
179
|
+
!['(', '+', '-', '*', '/', ','].includes(lastChar())
|
|
180
|
+
) {
|
|
181
|
+
result += ` ${char} `
|
|
182
|
+
} else {
|
|
183
|
+
result += char
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
// Simplify multiple spaces
|
|
188
|
+
return result.replace(/\s+/g, ' ')
|
|
189
|
+
})
|
|
49
190
|
}
|
|
50
191
|
|
|
51
192
|
export function url(value) {
|
|
@@ -53,13 +194,16 @@ export function url(value) {
|
|
|
53
194
|
}
|
|
54
195
|
|
|
55
196
|
export function number(value) {
|
|
56
|
-
return !isNaN(Number(value)) ||
|
|
197
|
+
return !isNaN(Number(value)) || isCSSFunction(value)
|
|
57
198
|
}
|
|
58
199
|
|
|
59
200
|
export function percentage(value) {
|
|
60
|
-
return
|
|
201
|
+
return (value.endsWith('%') && number(value.slice(0, -1))) || isCSSFunction(value)
|
|
61
202
|
}
|
|
62
203
|
|
|
204
|
+
// Please refer to MDN when updating this list:
|
|
205
|
+
// https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Values_and_units
|
|
206
|
+
// https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Container_Queries#container_query_length_units
|
|
63
207
|
let lengthUnits = [
|
|
64
208
|
'cm',
|
|
65
209
|
'mm',
|
|
@@ -73,20 +217,33 @@ let lengthUnits = [
|
|
|
73
217
|
'ch',
|
|
74
218
|
'rem',
|
|
75
219
|
'lh',
|
|
220
|
+
'rlh',
|
|
76
221
|
'vw',
|
|
77
222
|
'vh',
|
|
78
223
|
'vmin',
|
|
79
224
|
'vmax',
|
|
225
|
+
'vb',
|
|
226
|
+
'vi',
|
|
227
|
+
'svw',
|
|
228
|
+
'svh',
|
|
229
|
+
'lvw',
|
|
230
|
+
'lvh',
|
|
231
|
+
'dvw',
|
|
232
|
+
'dvh',
|
|
233
|
+
'cqw',
|
|
234
|
+
'cqh',
|
|
235
|
+
'cqi',
|
|
236
|
+
'cqb',
|
|
237
|
+
'cqmin',
|
|
238
|
+
'cqmax',
|
|
80
239
|
]
|
|
81
240
|
let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`
|
|
82
241
|
export function length(value) {
|
|
83
|
-
return
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
)
|
|
89
|
-
})
|
|
242
|
+
return (
|
|
243
|
+
value === '0' ||
|
|
244
|
+
new RegExp(`^[+-]?[0-9]*\.?[0-9]+(?:[eE][+-]?[0-9]+)?${lengthUnitsPattern}$`).test(value) ||
|
|
245
|
+
isCSSFunction(value)
|
|
246
|
+
)
|
|
90
247
|
}
|
|
91
248
|
|
|
92
249
|
let lineWidths = new Set(['thin', 'medium', 'thick'])
|
|
@@ -109,11 +266,11 @@ export function shadow(value) {
|
|
|
109
266
|
export function color(value) {
|
|
110
267
|
let colors = 0
|
|
111
268
|
|
|
112
|
-
let result = value
|
|
269
|
+
let result = splitAtTopLevelOnly(value, '_').every((part) => {
|
|
113
270
|
part = normalize(part)
|
|
114
271
|
|
|
115
272
|
if (part.startsWith('var(')) return true
|
|
116
|
-
if (parseColor(part) !== null) return colors++, true
|
|
273
|
+
if (parseColor(part, { loose: true }) !== null) return colors++, true
|
|
117
274
|
|
|
118
275
|
return false
|
|
119
276
|
})
|
|
@@ -124,7 +281,7 @@ export function color(value) {
|
|
|
124
281
|
|
|
125
282
|
export function image(value) {
|
|
126
283
|
let images = 0
|
|
127
|
-
let result = value
|
|
284
|
+
let result = splitAtTopLevelOnly(value, ',').every((part) => {
|
|
128
285
|
part = normalize(part)
|
|
129
286
|
|
|
130
287
|
if (part.startsWith('var(')) return true
|
|
@@ -145,11 +302,12 @@ export function image(value) {
|
|
|
145
302
|
}
|
|
146
303
|
|
|
147
304
|
let gradientTypes = new Set([
|
|
305
|
+
'conic-gradient',
|
|
148
306
|
'linear-gradient',
|
|
149
307
|
'radial-gradient',
|
|
308
|
+
'repeating-conic-gradient',
|
|
150
309
|
'repeating-linear-gradient',
|
|
151
310
|
'repeating-radial-gradient',
|
|
152
|
-
'conic-gradient',
|
|
153
311
|
])
|
|
154
312
|
export function gradient(value) {
|
|
155
313
|
value = normalize(value)
|
|
@@ -165,7 +323,7 @@ export function gradient(value) {
|
|
|
165
323
|
let validPositions = new Set(['center', 'top', 'right', 'bottom', 'left'])
|
|
166
324
|
export function position(value) {
|
|
167
325
|
let positions = 0
|
|
168
|
-
let result = value
|
|
326
|
+
let result = splitAtTopLevelOnly(value, '_').every((part) => {
|
|
169
327
|
part = normalize(part)
|
|
170
328
|
|
|
171
329
|
if (part.startsWith('var(')) return true
|
|
@@ -183,7 +341,7 @@ export function position(value) {
|
|
|
183
341
|
|
|
184
342
|
export function familyName(value) {
|
|
185
343
|
let fonts = 0
|
|
186
|
-
let result = value
|
|
344
|
+
let result = splitAtTopLevelOnly(value, ',').every((part) => {
|
|
187
345
|
part = normalize(part)
|
|
188
346
|
|
|
189
347
|
if (part.startsWith('var(')) return true
|
|
@@ -235,7 +393,7 @@ let absoluteSizes = new Set([
|
|
|
235
393
|
'medium',
|
|
236
394
|
'large',
|
|
237
395
|
'x-large',
|
|
238
|
-
'
|
|
396
|
+
'xx-large',
|
|
239
397
|
'xxx-large',
|
|
240
398
|
])
|
|
241
399
|
export function absoluteSize(value) {
|