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.
Files changed (224) hide show
  1. package/LICENSE +1 -2
  2. package/README.md +13 -10
  3. package/colors.d.ts +3 -0
  4. package/defaultConfig.d.ts +3 -0
  5. package/defaultTheme.d.ts +4 -0
  6. package/lib/cli/build/deps.js +62 -0
  7. package/lib/cli/build/index.js +54 -0
  8. package/lib/cli/build/plugin.js +371 -0
  9. package/lib/cli/build/utils.js +88 -0
  10. package/lib/cli/build/watching.js +182 -0
  11. package/lib/cli/help/index.js +73 -0
  12. package/lib/cli/index.js +230 -0
  13. package/lib/cli/init/index.js +63 -0
  14. package/lib/cli-peer-dependencies.js +28 -7
  15. package/lib/cli.js +1 -741
  16. package/lib/corePluginList.js +17 -4
  17. package/lib/corePlugins.js +2503 -1839
  18. package/lib/css/preflight.css +32 -13
  19. package/lib/featureFlags.js +45 -28
  20. package/lib/index.js +1 -29
  21. package/lib/lib/cacheInvalidation.js +92 -0
  22. package/lib/lib/collapseAdjacentRules.js +30 -10
  23. package/lib/lib/collapseDuplicateDeclarations.js +13 -8
  24. package/lib/lib/content.js +214 -0
  25. package/lib/lib/defaultExtractor.js +240 -31
  26. package/lib/lib/evaluateTailwindFunctions.js +117 -50
  27. package/lib/lib/expandApplyAtRules.js +466 -230
  28. package/lib/lib/expandTailwindAtRules.js +156 -135
  29. package/lib/lib/findAtConfigPath.js +46 -0
  30. package/lib/lib/generateRules.js +554 -200
  31. package/lib/lib/getModuleDependencies.js +88 -37
  32. package/lib/lib/load-config.js +57 -0
  33. package/lib/lib/normalizeTailwindDirectives.js +39 -33
  34. package/lib/lib/offsets.js +355 -0
  35. package/lib/lib/partitionApplyAtRules.js +58 -0
  36. package/lib/lib/regex.js +74 -0
  37. package/lib/lib/remap-bitfield.js +89 -0
  38. package/lib/lib/resolveDefaultsAtRules.js +97 -69
  39. package/lib/lib/setupContextUtils.js +796 -341
  40. package/lib/lib/setupTrackingContext.js +66 -71
  41. package/lib/lib/sharedState.js +45 -14
  42. package/lib/lib/substituteScreenAtRules.js +14 -10
  43. package/lib/plugin.js +48 -0
  44. package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
  45. package/lib/postcss-plugins/nesting/index.js +21 -0
  46. package/lib/postcss-plugins/nesting/plugin.js +89 -0
  47. package/lib/processTailwindFeatures.js +37 -27
  48. package/lib/public/colors.js +272 -246
  49. package/lib/public/create-plugin.js +9 -5
  50. package/lib/public/default-config.js +10 -6
  51. package/lib/public/default-theme.js +10 -6
  52. package/lib/public/load-config.js +12 -0
  53. package/lib/public/resolve-config.js +11 -6
  54. package/lib/util/applyImportantSelector.js +36 -0
  55. package/lib/util/bigSign.js +6 -1
  56. package/lib/util/buildMediaQuery.js +13 -6
  57. package/lib/util/cloneDeep.js +9 -6
  58. package/lib/util/cloneNodes.js +44 -4
  59. package/lib/util/color.js +70 -53
  60. package/lib/util/colorNames.js +752 -0
  61. package/lib/util/configurePlugins.js +7 -2
  62. package/lib/util/createPlugin.js +8 -6
  63. package/lib/util/createUtilityPlugin.js +16 -16
  64. package/lib/util/dataTypes.js +295 -113
  65. package/lib/util/defaults.js +12 -7
  66. package/lib/util/escapeClassName.js +13 -8
  67. package/lib/util/escapeCommas.js +7 -2
  68. package/lib/util/flattenColorPalette.js +11 -12
  69. package/lib/util/formatVariantSelector.js +235 -151
  70. package/lib/util/getAllConfigs.js +33 -12
  71. package/lib/util/hashConfig.js +9 -4
  72. package/lib/util/isKeyframeRule.js +7 -2
  73. package/lib/util/isPlainObject.js +8 -3
  74. package/lib/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +25 -15
  75. package/lib/util/log.js +25 -15
  76. package/lib/util/nameClass.js +27 -10
  77. package/lib/util/negateValue.js +25 -8
  78. package/lib/util/normalizeConfig.js +127 -82
  79. package/lib/util/normalizeScreens.js +128 -11
  80. package/lib/util/parseAnimationValue.js +44 -40
  81. package/lib/util/parseBoxShadowValue.js +34 -23
  82. package/lib/util/parseDependency.js +39 -55
  83. package/lib/util/parseGlob.js +36 -0
  84. package/lib/util/parseObjectStyles.js +15 -10
  85. package/lib/util/pluginUtils.js +172 -69
  86. package/lib/util/prefixSelector.js +30 -12
  87. package/lib/util/pseudoElements.js +212 -0
  88. package/lib/util/removeAlphaVariables.js +31 -0
  89. package/lib/util/resolveConfig.js +101 -87
  90. package/lib/util/resolveConfigPath.js +30 -12
  91. package/lib/util/responsive.js +11 -6
  92. package/lib/util/splitAtTopLevelOnly.js +51 -0
  93. package/lib/util/tap.js +6 -1
  94. package/lib/util/toColorValue.js +7 -3
  95. package/lib/util/toPath.js +22 -4
  96. package/lib/util/transformThemeValue.js +40 -30
  97. package/lib/util/validateConfig.js +37 -0
  98. package/lib/util/validateFormalSyntax.js +26 -0
  99. package/lib/util/withAlphaVariable.js +27 -15
  100. package/lib/value-parser/LICENSE +22 -0
  101. package/lib/value-parser/README.md +3 -0
  102. package/lib/value-parser/index.d.js +2 -0
  103. package/lib/value-parser/index.js +22 -0
  104. package/lib/value-parser/parse.js +259 -0
  105. package/lib/value-parser/stringify.js +38 -0
  106. package/lib/value-parser/unit.js +86 -0
  107. package/lib/value-parser/walk.js +16 -0
  108. package/loadConfig.d.ts +4 -0
  109. package/loadConfig.js +2 -0
  110. package/nesting/index.d.ts +4 -0
  111. package/nesting/index.js +2 -12
  112. package/package.json +60 -55
  113. package/peers/index.js +75503 -55095
  114. package/plugin.d.ts +11 -0
  115. package/resolveConfig.d.ts +31 -0
  116. package/scripts/generate-types.js +104 -0
  117. package/scripts/release-channel.js +18 -0
  118. package/scripts/release-notes.js +21 -0
  119. package/scripts/type-utils.js +27 -0
  120. package/src/cli/build/deps.js +56 -0
  121. package/src/cli/build/index.js +49 -0
  122. package/src/cli/build/plugin.js +437 -0
  123. package/src/cli/build/utils.js +76 -0
  124. package/src/cli/build/watching.js +229 -0
  125. package/src/cli/help/index.js +70 -0
  126. package/src/cli/index.js +216 -0
  127. package/src/cli/init/index.js +79 -0
  128. package/src/cli-peer-dependencies.js +7 -1
  129. package/src/cli.js +1 -811
  130. package/src/corePluginList.js +1 -1
  131. package/src/corePlugins.js +849 -243
  132. package/src/css/preflight.css +32 -13
  133. package/src/featureFlags.js +13 -9
  134. package/src/index.js +1 -28
  135. package/src/lib/cacheInvalidation.js +52 -0
  136. package/src/lib/collapseAdjacentRules.js +21 -2
  137. package/src/lib/content.js +249 -0
  138. package/src/lib/defaultExtractor.js +215 -33
  139. package/src/lib/evaluateTailwindFunctions.js +82 -8
  140. package/src/lib/expandApplyAtRules.js +512 -224
  141. package/src/lib/expandTailwindAtRules.js +102 -87
  142. package/src/lib/findAtConfigPath.js +48 -0
  143. package/src/lib/generateRules.js +541 -146
  144. package/src/lib/getModuleDependencies.js +70 -30
  145. package/src/lib/load-config.ts +44 -0
  146. package/src/lib/normalizeTailwindDirectives.js +1 -0
  147. package/src/lib/offsets.js +432 -0
  148. package/src/lib/partitionApplyAtRules.js +52 -0
  149. package/src/lib/regex.js +74 -0
  150. package/src/lib/remap-bitfield.js +82 -0
  151. package/src/lib/resolveDefaultsAtRules.js +55 -30
  152. package/src/lib/setupContextUtils.js +720 -190
  153. package/src/lib/setupTrackingContext.js +47 -61
  154. package/src/lib/sharedState.js +15 -4
  155. package/src/plugin.js +47 -0
  156. package/src/postcss-plugins/nesting/README.md +42 -0
  157. package/src/postcss-plugins/nesting/index.js +13 -0
  158. package/src/postcss-plugins/nesting/plugin.js +80 -0
  159. package/src/processTailwindFeatures.js +11 -4
  160. package/src/public/colors.js +22 -0
  161. package/src/public/default-config.js +1 -1
  162. package/src/public/default-theme.js +2 -2
  163. package/src/public/load-config.js +2 -0
  164. package/src/util/applyImportantSelector.js +27 -0
  165. package/src/util/buildMediaQuery.js +5 -3
  166. package/src/util/cloneNodes.js +40 -2
  167. package/src/util/color.js +39 -20
  168. package/src/util/colorNames.js +150 -0
  169. package/src/util/dataTypes.js +184 -26
  170. package/src/util/formatVariantSelector.js +272 -144
  171. package/src/util/getAllConfigs.js +21 -2
  172. package/src/util/isPlainObject.js +1 -1
  173. package/src/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +1 -1
  174. package/src/util/log.js +8 -8
  175. package/src/util/nameClass.js +4 -0
  176. package/src/util/negateValue.js +11 -3
  177. package/src/util/normalizeConfig.js +45 -6
  178. package/src/util/normalizeScreens.js +99 -4
  179. package/src/util/parseBoxShadowValue.js +4 -3
  180. package/src/util/parseDependency.js +37 -42
  181. package/src/util/parseGlob.js +24 -0
  182. package/src/util/pluginUtils.js +139 -24
  183. package/src/util/prefixSelector.js +31 -10
  184. package/src/util/pseudoElements.js +171 -0
  185. package/src/util/removeAlphaVariables.js +24 -0
  186. package/src/util/resolveConfig.js +70 -32
  187. package/src/util/resolveConfigPath.js +12 -1
  188. package/src/util/splitAtTopLevelOnly.js +52 -0
  189. package/src/util/toPath.js +1 -1
  190. package/src/util/transformThemeValue.js +13 -3
  191. package/src/util/validateConfig.js +26 -0
  192. package/src/util/validateFormalSyntax.js +34 -0
  193. package/src/util/withAlphaVariable.js +1 -1
  194. package/src/value-parser/LICENSE +22 -0
  195. package/src/value-parser/README.md +3 -0
  196. package/src/value-parser/index.d.ts +177 -0
  197. package/src/value-parser/index.js +28 -0
  198. package/src/value-parser/parse.js +303 -0
  199. package/src/value-parser/stringify.js +41 -0
  200. package/src/value-parser/unit.js +118 -0
  201. package/src/value-parser/walk.js +18 -0
  202. package/stubs/.gitignore +1 -0
  203. package/stubs/.prettierrc.json +6 -0
  204. package/stubs/{defaultConfig.stub.js → config.full.js} +290 -178
  205. package/stubs/postcss.config.js +6 -0
  206. package/stubs/tailwind.config.cjs +2 -0
  207. package/stubs/tailwind.config.js +2 -0
  208. package/stubs/tailwind.config.ts +3 -0
  209. package/types/config.d.ts +376 -0
  210. package/types/generated/.gitkeep +0 -0
  211. package/types/generated/colors.d.ts +298 -0
  212. package/types/generated/corePluginList.d.ts +1 -0
  213. package/types/generated/default-theme.d.ts +397 -0
  214. package/types/index.d.ts +11 -0
  215. package/CHANGELOG.md +0 -1959
  216. package/lib/constants.js +0 -37
  217. package/lib/lib/detectNesting.js +0 -34
  218. package/nesting/plugin.js +0 -41
  219. package/scripts/install-integrations.js +0 -27
  220. package/scripts/rebuildFixtures.js +0 -68
  221. package/src/constants.js +0 -17
  222. package/src/lib/detectNesting.js +0 -39
  223. /package/stubs/{simpleConfig.stub.js → config.simple.js} +0 -0
  224. /package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -0
@@ -2,34 +2,156 @@ import selectorParser from 'postcss-selector-parser'
2
2
  import unescape from 'postcss-selector-parser/dist/util/unesc'
3
3
  import escapeClassName from '../util/escapeClassName'
4
4
  import prefixSelector from '../util/prefixSelector'
5
+ import { movePseudos } from './pseudoElements'
6
+ import { splitAtTopLevelOnly } from './splitAtTopLevelOnly'
7
+
8
+ /** @typedef {import('postcss-selector-parser').Root} Root */
9
+ /** @typedef {import('postcss-selector-parser').Selector} Selector */
10
+ /** @typedef {import('postcss-selector-parser').Pseudo} Pseudo */
11
+ /** @typedef {import('postcss-selector-parser').Node} Node */
12
+
13
+ /** @typedef {{format: string, respectPrefix: boolean}[]} RawFormats */
14
+ /** @typedef {import('postcss-selector-parser').Root} ParsedFormats */
15
+ /** @typedef {RawFormats | ParsedFormats} AcceptedFormats */
5
16
 
6
17
  let MERGE = ':merge'
7
- let PARENT = '&'
8
-
9
- export let selectorFunctions = new Set([MERGE])
10
-
11
- export function formatVariantSelector(current, ...others) {
12
- for (let other of others) {
13
- let incomingValue = resolveFunctionArgument(other, MERGE)
14
- if (incomingValue !== null) {
15
- let existingValue = resolveFunctionArgument(current, MERGE, incomingValue)
16
- if (existingValue !== null) {
17
- let existingTarget = `${MERGE}(${incomingValue})`
18
- let splitIdx = other.indexOf(existingTarget)
19
- let addition = other.slice(splitIdx + existingTarget.length).split(' ')[0]
20
-
21
- current = current.replace(existingTarget, existingTarget + addition)
22
- continue
23
- }
18
+
19
+ /**
20
+ * @param {RawFormats} formats
21
+ * @param {{context: any, candidate: string, base: string | null}} options
22
+ * @returns {ParsedFormats | null}
23
+ */
24
+ export function formatVariantSelector(formats, { context, candidate }) {
25
+ let prefix = context?.tailwindConfig.prefix ?? ''
26
+
27
+ // Parse the format selector into an AST
28
+ let parsedFormats = formats.map((format) => {
29
+ let ast = selectorParser().astSync(format.format)
30
+
31
+ return {
32
+ ...format,
33
+ ast: format.respectPrefix ? prefixSelector(prefix, ast) : ast,
24
34
  }
35
+ })
36
+
37
+ // We start with the candidate selector
38
+ let formatAst = selectorParser.root({
39
+ nodes: [
40
+ selectorParser.selector({
41
+ nodes: [selectorParser.className({ value: escapeClassName(candidate) })],
42
+ }),
43
+ ],
44
+ })
45
+
46
+ // And iteratively merge each format selector into the candidate selector
47
+ for (let { ast } of parsedFormats) {
48
+ // 1. Handle :merge() special pseudo-class
49
+ ;[formatAst, ast] = handleMergePseudo(formatAst, ast)
50
+
51
+ // 2. Merge the format selector into the current selector AST
52
+ ast.walkNesting((nesting) => nesting.replaceWith(...formatAst.nodes[0].nodes))
53
+
54
+ // 3. Keep going!
55
+ formatAst = ast
56
+ }
57
+
58
+ return formatAst
59
+ }
60
+
61
+ /**
62
+ * Given any node in a selector this gets the "simple" selector it's a part of
63
+ * A simple selector is just a list of nodes without any combinators
64
+ * Technically :is(), :not(), :has(), etc… can have combinators but those are nested
65
+ * inside the relevant node and won't be picked up so they're fine to ignore
66
+ *
67
+ * @param {Node} node
68
+ * @returns {Node[]}
69
+ **/
70
+ function simpleSelectorForNode(node) {
71
+ /** @type {Node[]} */
72
+ let nodes = []
73
+
74
+ // Walk backwards until we hit a combinator node (or the start)
75
+ while (node.prev() && node.prev().type !== 'combinator') {
76
+ node = node.prev()
77
+ }
25
78
 
26
- current = other.replace(PARENT, current)
79
+ // Now record all non-combinator nodes until we hit one (or the end)
80
+ while (node && node.type !== 'combinator') {
81
+ nodes.push(node)
82
+ node = node.next()
27
83
  }
28
84
 
29
- return current
85
+ return nodes
30
86
  }
31
87
 
32
- export function finalizeSelector(format, { selector, candidate, context }) {
88
+ /**
89
+ * Resorts the nodes in a selector to ensure they're in the correct order
90
+ * Tags go before classes, and pseudo classes go after classes
91
+ *
92
+ * @param {Selector} sel
93
+ * @returns {Selector}
94
+ **/
95
+ function resortSelector(sel) {
96
+ sel.sort((a, b) => {
97
+ if (a.type === 'tag' && b.type === 'class') {
98
+ return -1
99
+ } else if (a.type === 'class' && b.type === 'tag') {
100
+ return 1
101
+ } else if (a.type === 'class' && b.type === 'pseudo' && b.value.startsWith('::')) {
102
+ return -1
103
+ } else if (a.type === 'pseudo' && a.value.startsWith('::') && b.type === 'class') {
104
+ return 1
105
+ }
106
+
107
+ return sel.index(a) - sel.index(b)
108
+ })
109
+
110
+ return sel
111
+ }
112
+
113
+ /**
114
+ * Remove extraneous selectors that do not include the base class/candidate
115
+ *
116
+ * Example:
117
+ * Given the utility `.a, .b { color: red}`
118
+ * Given the candidate `sm:b`
119
+ *
120
+ * The final selector should be `.sm\:b` and not `.a, .sm\:b`
121
+ *
122
+ * @param {Selector} ast
123
+ * @param {string} base
124
+ */
125
+ export function eliminateIrrelevantSelectors(sel, base) {
126
+ let hasClassesMatchingCandidate = false
127
+
128
+ sel.walk((child) => {
129
+ if (child.type === 'class' && child.value === base) {
130
+ hasClassesMatchingCandidate = true
131
+ return false // Stop walking
132
+ }
133
+ })
134
+
135
+ if (!hasClassesMatchingCandidate) {
136
+ sel.remove()
137
+ }
138
+
139
+ // We do NOT recursively eliminate sub selectors that don't have the base class
140
+ // as this is NOT a safe operation. For example, if we have:
141
+ // `.space-x-2 > :not([hidden]) ~ :not([hidden])`
142
+ // We cannot remove the [hidden] from the :not() because it would change the
143
+ // meaning of the selector.
144
+
145
+ // TODO: Can we do this for :matches, :is, and :where?
146
+ }
147
+
148
+ /**
149
+ * @param {string} current
150
+ * @param {AcceptedFormats} formats
151
+ * @param {{context: any, candidate: string, base: string | null}} options
152
+ * @returns {string}
153
+ */
154
+ export function finalizeSelector(current, formats, { context, candidate, base }) {
33
155
  let separator = context?.tailwindConfig?.separator ?? ':'
34
156
 
35
157
  // Split by the separator, but ignore the separator inside square brackets:
@@ -39,14 +161,10 @@ export function finalizeSelector(format, { selector, candidate, context }) {
39
161
  // │ │ │ ╰── We will not split here
40
162
  // ╰──┴─────┴─────────────── We will split here
41
163
  //
42
- let splitter = new RegExp(`\\${separator}(?![^[]*\\])`)
43
- let base = candidate.split(splitter).pop()
44
-
45
- if (context?.tailwindConfig?.prefix) {
46
- format = prefixSelector(context.tailwindConfig.prefix, format)
47
- }
164
+ base = base ?? splitAtTopLevelOnly(candidate, separator).pop()
48
165
 
49
- format = format.replace(PARENT, `.${escapeClassName(candidate)}`)
166
+ // Parse the selector into an AST
167
+ let selector = selectorParser().astSync(current)
50
168
 
51
169
  // Normalize escaped classes, e.g.:
52
170
  //
@@ -59,138 +177,148 @@ export function finalizeSelector(format, { selector, candidate, context }) {
59
177
  // base in selector: bg-\\[rgb\\(255\\,0\\,0\\)\\]
60
178
  // escaped base: bg-\\[rgb\\(255\\2c 0\\2c 0\\)\\]
61
179
  //
62
- selector = selectorParser((selectors) => {
63
- return selectors.walkClasses((node) => {
64
- if (node.raws && node.value.includes(base)) {
65
- node.raws.value = escapeClassName(unescape(node.raws.value))
66
- }
180
+ selector.walkClasses((node) => {
181
+ if (node.raws && node.value.includes(base)) {
182
+ node.raws.value = escapeClassName(unescape(node.raws.value))
183
+ }
184
+ })
185
+
186
+ // Remove extraneous selectors that do not include the base candidate
187
+ selector.each((sel) => eliminateIrrelevantSelectors(sel, base))
188
+
189
+ // If ffter eliminating irrelevant selectors, we end up with nothing
190
+ // Then the whole "rule" this is associated with does not need to exist
191
+ // We use `null` as a marker value for that case
192
+ if (selector.length === 0) {
193
+ return null
194
+ }
195
+
196
+ // If there are no formats that means there were no variants added to the candidate
197
+ // so we can just return the selector as-is
198
+ let formatAst = Array.isArray(formats)
199
+ ? formatVariantSelector(formats, { context, candidate })
200
+ : formats
201
+
202
+ if (formatAst === null) {
203
+ return selector.toString()
204
+ }
67
205
 
68
- return node
69
- })
70
- }).processSync(selector)
206
+ let simpleStart = selectorParser.comment({ value: '/*__simple__*/' })
207
+ let simpleEnd = selectorParser.comment({ value: '/*__simple__*/' })
71
208
 
72
209
  // We can safely replace the escaped base now, since the `base` section is
73
210
  // now in a normalized escaped value.
74
- selector = selector.replace(`.${escapeClassName(base)}`, format)
211
+ selector.walkClasses((node) => {
212
+ if (node.value !== base) {
213
+ return
214
+ }
215
+
216
+ let parent = node.parent
217
+ let formatNodes = formatAst.nodes[0].nodes
218
+
219
+ // Perf optimization: if the parent is a single class we can just replace it and be done
220
+ if (parent.nodes.length === 1) {
221
+ node.replaceWith(...formatNodes)
222
+ return
223
+ }
224
+
225
+ let simpleSelector = simpleSelectorForNode(node)
226
+ parent.insertBefore(simpleSelector[0], simpleStart)
227
+ parent.insertAfter(simpleSelector[simpleSelector.length - 1], simpleEnd)
228
+
229
+ for (let child of formatNodes) {
230
+ parent.insertBefore(simpleSelector[0], child.clone())
231
+ }
232
+
233
+ node.remove()
234
+
235
+ // Re-sort the simple selector to ensure it's in the correct order
236
+ simpleSelector = simpleSelectorForNode(simpleStart)
237
+ let firstNode = parent.index(simpleStart)
238
+
239
+ parent.nodes.splice(
240
+ firstNode,
241
+ simpleSelector.length,
242
+ ...resortSelector(selectorParser.selector({ nodes: simpleSelector })).nodes
243
+ )
244
+
245
+ simpleStart.remove()
246
+ simpleEnd.remove()
247
+ })
75
248
 
76
249
  // Remove unnecessary pseudo selectors that we used as placeholders
77
- return selectorParser((selectors) => {
78
- return selectors.map((selector) => {
79
- selector.walkPseudos((p) => {
80
- if (selectorFunctions.has(p.value)) {
81
- p.replaceWith(p.nodes)
82
- }
83
-
84
- return p
85
- })
250
+ selector.walkPseudos((p) => {
251
+ if (p.value === MERGE) {
252
+ p.replaceWith(p.nodes)
253
+ }
254
+ })
255
+
256
+ // Move pseudo elements to the end of the selector (if necessary)
257
+ selector.each((sel) => movePseudos(sel))
86
258
 
87
- // This will make sure to move pseudo's to the correct spot (the end for
88
- // pseudo elements) because otherwise the selector will never work
89
- // anyway.
90
- //
91
- // E.g.:
92
- // - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
93
- // - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
94
- //
95
- // `::before:hover` doesn't work, which means that we can make it work for you by flipping the order.
96
- function collectPseudoElements(selector) {
97
- let nodes = []
98
-
99
- for (let node of selector.nodes) {
100
- if (isPseudoElement(node)) {
101
- nodes.push(node)
102
- selector.removeChild(node)
103
- }
104
-
105
- if (node?.nodes) {
106
- nodes.push(...collectPseudoElements(node))
107
- }
108
- }
109
-
110
- return nodes
111
- }
112
-
113
- let pseudoElements = collectPseudoElements(selector)
114
- if (pseudoElements.length > 0) {
115
- selector.nodes.push(pseudoElements.sort(sortSelector))
116
- }
117
-
118
- return selector
119
- })
120
- }).processSync(selector)
259
+ return selector.toString()
121
260
  }
122
261
 
123
- // Note: As a rule, double colons (::) should be used instead of a single colon
124
- // (:). This distinguishes pseudo-classes from pseudo-elements. However, since
125
- // this distinction was not present in older versions of the W3C spec, most
126
- // browsers support both syntaxes for the original pseudo-elements.
127
- let pseudoElementsBC = [':before', ':after', ':first-line', ':first-letter']
128
-
129
- // These pseudo-elements _can_ be combined with other pseudo selectors AND the order does matter.
130
- let pseudoElementExceptions = ['::file-selector-button']
131
-
132
- // This will make sure to move pseudo's to the correct spot (the end for
133
- // pseudo elements) because otherwise the selector will never work
134
- // anyway.
135
- //
136
- // E.g.:
137
- // - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
138
- // - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
139
- //
140
- // `::before:hover` doesn't work, which means that we can make it work
141
- // for you by flipping the order.
142
- function sortSelector(a, z) {
143
- // Both nodes are non-pseudo's so we can safely ignore them and keep
144
- // them in the same order.
145
- if (a.type !== 'pseudo' && z.type !== 'pseudo') {
146
- return 0
147
- }
262
+ /**
263
+ *
264
+ * @param {Selector} selector
265
+ * @param {Selector} format
266
+ */
267
+ export function handleMergePseudo(selector, format) {
268
+ /** @type {{pseudo: Pseudo, value: string}[]} */
269
+ let merges = []
270
+
271
+ // Find all :merge() pseudo-classes in `selector`
272
+ selector.walkPseudos((pseudo) => {
273
+ if (pseudo.value === MERGE) {
274
+ merges.push({
275
+ pseudo,
276
+ value: pseudo.nodes[0].toString(),
277
+ })
278
+ }
279
+ })
148
280
 
149
- // If one of them is a combinator, we need to keep it in the same order
150
- // because that means it will start a new "section" in the selector.
151
- if ((a.type === 'combinator') ^ (z.type === 'combinator')) {
152
- return 0
153
- }
281
+ // Find all :merge() "attachments" in `format` and attach them to the matching selector in `selector`
282
+ format.walkPseudos((pseudo) => {
283
+ if (pseudo.value !== MERGE) {
284
+ return
285
+ }
154
286
 
155
- // One of the items is a pseudo and the other one isn't. Let's move
156
- // the pseudo to the right.
157
- if ((a.type === 'pseudo') ^ (z.type === 'pseudo')) {
158
- return (a.type === 'pseudo') - (z.type === 'pseudo')
159
- }
287
+ let value = pseudo.nodes[0].toString()
160
288
 
161
- // Both are pseudo's, move the pseudo elements (except for
162
- // ::file-selector-button) to the right.
163
- return isPseudoElement(a) - isPseudoElement(z)
164
- }
289
+ // Does `selector` contain a :merge() pseudo-class with the same value?
290
+ let existing = merges.find((merge) => merge.value === value)
165
291
 
166
- function isPseudoElement(node) {
167
- if (node.type !== 'pseudo') return false
168
- if (pseudoElementExceptions.includes(node.value)) return false
292
+ // Nope so there's nothing to do
293
+ if (!existing) {
294
+ return
295
+ }
169
296
 
170
- return node.value.startsWith('::') || pseudoElementsBC.includes(node.value)
171
- }
297
+ // Everything after `:merge()` up to the next combinator is what is attached to the merged selector
298
+ let attachments = []
299
+ let next = pseudo.next()
300
+ while (next && next.type !== 'combinator') {
301
+ attachments.push(next)
302
+ next = next.next()
303
+ }
304
+
305
+ let combinator = next
172
306
 
173
- function resolveFunctionArgument(haystack, needle, arg) {
174
- let startIdx = haystack.indexOf(arg ? `${needle}(${arg})` : needle)
175
- if (startIdx === -1) return null
176
-
177
- // Start inside the `(`
178
- startIdx += needle.length + 1
179
-
180
- let target = ''
181
- let count = 0
182
-
183
- for (let char of haystack.slice(startIdx)) {
184
- if (char !== '(' && char !== ')') {
185
- target += char
186
- } else if (char === '(') {
187
- target += char
188
- count++
189
- } else if (char === ')') {
190
- if (--count < 0) break // unbalanced
191
- target += char
307
+ existing.pseudo.parent.insertAfter(
308
+ existing.pseudo,
309
+ selectorParser.selector({ nodes: attachments.map((node) => node.clone()) })
310
+ )
311
+
312
+ pseudo.remove()
313
+ attachments.forEach((node) => node.remove())
314
+
315
+ // What about this case:
316
+ // :merge(.group):focus > &
317
+ // :merge(.group):hover &
318
+ if (combinator && combinator.type === 'combinator') {
319
+ combinator.remove()
192
320
  }
193
- }
321
+ })
194
322
 
195
- return target
323
+ return [selector, format]
196
324
  }
@@ -1,14 +1,33 @@
1
- import defaultConfig from '../../stubs/defaultConfig.stub.js'
1
+ import defaultFullConfig from '../../stubs/config.full.js'
2
2
  import { flagEnabled } from '../featureFlags'
3
3
 
4
4
  export default function getAllConfigs(config) {
5
- const configs = (config?.presets ?? [defaultConfig])
5
+ const configs = (config?.presets ?? [defaultFullConfig])
6
6
  .slice()
7
7
  .reverse()
8
8
  .flatMap((preset) => getAllConfigs(preset instanceof Function ? preset() : preset))
9
9
 
10
10
  const features = {
11
11
  // Add experimental configs here...
12
+ respectDefaultRingColorOpacity: {
13
+ theme: {
14
+ ringColor: ({ theme }) => ({
15
+ DEFAULT: '#3b82f67f',
16
+ ...theme('colors'),
17
+ }),
18
+ },
19
+ },
20
+
21
+ disableColorOpacityUtilitiesByDefault: {
22
+ corePlugins: {
23
+ backgroundOpacity: false,
24
+ borderOpacity: false,
25
+ divideOpacity: false,
26
+ placeholderOpacity: false,
27
+ ringOpacity: false,
28
+ textOpacity: false,
29
+ },
30
+ },
12
31
  }
13
32
 
14
33
  const experimentals = Object.keys(features)
@@ -4,5 +4,5 @@ export default function isPlainObject(value) {
4
4
  }
5
5
 
6
6
  const prototype = Object.getPrototypeOf(value)
7
- return prototype === null || prototype === Object.prototype
7
+ return prototype === null || Object.getPrototypeOf(prototype) === null
8
8
  }
@@ -15,7 +15,7 @@ let quotes = new Set(['"', "'", '`'])
15
15
  // E.g.: w-[this-is]w-[weird-and-invalid]
16
16
  // E.g.: w-[this-is\\]w-\\[weird-but-valid]
17
17
  // E.g.: content-['this-is-also-valid]-weirdly-enough']
18
- export default function isValidArbitraryValue(value) {
18
+ export default function isSyntacticallyValidPropertyValue(value) {
19
19
  let stack = []
20
20
  let inQuotes = false
21
21
 
package/src/util/log.js CHANGED
@@ -1,29 +1,29 @@
1
- import chalk from 'chalk'
1
+ import colors from 'picocolors'
2
2
 
3
3
  let alreadyShown = new Set()
4
4
 
5
- function log(chalk, messages, key) {
6
- if (process.env.JEST_WORKER_ID !== undefined) return
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(chalk, '-', message))
12
+ messages.forEach((message) => console.warn(type, '-', message))
13
13
  }
14
14
 
15
15
  export function dim(input) {
16
- return chalk.dim(input)
16
+ return colors.dim(input)
17
17
  }
18
18
 
19
19
  export default {
20
20
  info(key, messages) {
21
- log(chalk.bold.cyan('info'), ...(Array.isArray(key) ? [key] : [messages, key]))
21
+ log(colors.bold(colors.cyan('info')), ...(Array.isArray(key) ? [key] : [messages, key]))
22
22
  },
23
23
  warn(key, messages) {
24
- log(chalk.bold.yellow('warn'), ...(Array.isArray(key) ? [key] : [messages, key]))
24
+ log(colors.bold(colors.yellow('warn')), ...(Array.isArray(key) ? [key] : [messages, key]))
25
25
  },
26
26
  risk(key, messages) {
27
- log(chalk.bold.magenta('risk'), ...(Array.isArray(key) ? [key] : [messages, key]))
27
+ log(colors.bold(colors.magenta('risk')), ...(Array.isArray(key) ? [key] : [messages, key]))
28
28
  },
29
29
  }
@@ -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
  }
@@ -1,4 +1,4 @@
1
- export default function (value) {
1
+ export default function negateValue(value) {
2
2
  value = `${value}`
3
3
 
4
4
  if (value === '0') {
@@ -10,7 +10,15 @@ export default function (value) {
10
10
  return value.replace(/^[+-]?/, (sign) => (sign === '-' ? '' : '-'))
11
11
  }
12
12
 
13
- if (value.includes('var(') || value.includes('calc(')) {
14
- return `calc(${value} * -1)`
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']
18
+
19
+ for (const fn of numericFunctions) {
20
+ if (value.includes(`${fn}(`)) {
21
+ return `calc(${value} * -1)`
22
+ }
15
23
  }
16
24
  }