tailwindcss 0.0.0-insiders.ea80db2 → 0.0.0-insiders.eae2b7a

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 (213) hide show
  1. package/README.md +13 -9
  2. package/defaultTheme.d.ts +2 -1
  3. package/index.css +5 -0
  4. package/lib/cli/build/index.js +57 -0
  5. package/lib/cli/build/plugin.js +427 -0
  6. package/lib/cli/build/utils.js +88 -0
  7. package/lib/cli/build/watching.js +182 -0
  8. package/lib/cli/help/index.js +73 -0
  9. package/lib/cli/index.js +231 -0
  10. package/lib/cli/init/index.js +63 -0
  11. package/lib/cli.js +1 -759
  12. package/lib/corePluginList.js +12 -3
  13. package/lib/corePlugins.js +2308 -1739
  14. package/lib/css/preflight.css +13 -5
  15. package/lib/featureFlags.js +50 -25
  16. package/lib/index.js +1 -40
  17. package/lib/lib/cacheInvalidation.js +48 -25
  18. package/lib/lib/collapseAdjacentRules.js +17 -10
  19. package/lib/lib/collapseDuplicateDeclarations.js +13 -8
  20. package/lib/lib/content.js +207 -0
  21. package/lib/lib/defaultExtractor.js +232 -33
  22. package/lib/lib/detectNesting.js +21 -10
  23. package/lib/lib/evaluateTailwindFunctions.js +117 -50
  24. package/lib/lib/expandApplyAtRules.js +316 -215
  25. package/lib/lib/expandTailwindAtRules.js +167 -115
  26. package/lib/lib/findAtConfigPath.js +46 -0
  27. package/lib/lib/generateRules.js +444 -211
  28. package/lib/lib/getModuleDependencies.js +88 -37
  29. package/lib/lib/handleImportAtRules.js +50 -0
  30. package/lib/lib/load-config.js +42 -0
  31. package/lib/lib/normalizeTailwindDirectives.js +29 -39
  32. package/lib/lib/offsets.js +306 -0
  33. package/lib/lib/partitionApplyAtRules.js +13 -8
  34. package/lib/lib/regex.js +74 -0
  35. package/lib/lib/remap-bitfield.js +89 -0
  36. package/lib/lib/resolveDefaultsAtRules.js +96 -74
  37. package/lib/lib/setupContextUtils.js +672 -300
  38. package/lib/lib/setupTrackingContext.js +63 -68
  39. package/lib/lib/sharedState.js +44 -17
  40. package/lib/lib/substituteScreenAtRules.js +14 -10
  41. package/lib/plugin.js +160 -0
  42. package/lib/postcss-plugins/nesting/README.md +2 -2
  43. package/lib/postcss-plugins/nesting/index.js +10 -6
  44. package/lib/postcss-plugins/nesting/plugin.js +24 -20
  45. package/lib/processTailwindFeatures.js +34 -29
  46. package/lib/public/colors.js +272 -246
  47. package/lib/public/create-plugin.js +9 -5
  48. package/lib/public/default-config.js +10 -6
  49. package/lib/public/default-theme.js +10 -6
  50. package/lib/public/load-config.js +12 -0
  51. package/lib/public/resolve-config.js +11 -6
  52. package/lib/util/applyImportantSelector.js +36 -0
  53. package/lib/util/bigSign.js +6 -1
  54. package/lib/util/buildMediaQuery.js +13 -6
  55. package/lib/util/cloneDeep.js +9 -6
  56. package/lib/util/cloneNodes.js +12 -3
  57. package/lib/util/color.js +66 -50
  58. package/lib/util/colorNames.js +752 -0
  59. package/lib/util/configurePlugins.js +7 -2
  60. package/lib/util/createPlugin.js +8 -5
  61. package/lib/util/createUtilityPlugin.js +13 -9
  62. package/lib/util/dataTypes.js +182 -111
  63. package/lib/util/defaults.js +12 -7
  64. package/lib/util/escapeClassName.js +13 -8
  65. package/lib/util/escapeCommas.js +7 -2
  66. package/lib/util/flattenColorPalette.js +11 -10
  67. package/lib/util/formatVariantSelector.js +228 -151
  68. package/lib/util/getAllConfigs.js +33 -12
  69. package/lib/util/hashConfig.js +9 -4
  70. package/lib/util/isKeyframeRule.js +7 -2
  71. package/lib/util/isPlainObject.js +7 -2
  72. package/lib/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +25 -15
  73. package/lib/util/log.js +40 -13
  74. package/lib/util/nameClass.js +27 -10
  75. package/lib/util/negateValue.js +25 -8
  76. package/lib/util/normalizeConfig.js +155 -87
  77. package/lib/util/normalizeScreens.js +127 -8
  78. package/lib/util/parseAnimationValue.js +44 -40
  79. package/lib/util/parseBoxShadowValue.js +33 -62
  80. package/lib/util/parseDependency.js +39 -55
  81. package/lib/util/parseGlob.js +36 -0
  82. package/lib/util/parseObjectStyles.js +15 -10
  83. package/lib/util/pluginUtils.js +154 -59
  84. package/lib/util/prefixSelector.js +29 -10
  85. package/lib/util/pseudoElements.js +209 -0
  86. package/lib/util/removeAlphaVariables.js +31 -0
  87. package/lib/util/resolveConfig.js +96 -95
  88. package/lib/util/resolveConfigPath.js +29 -10
  89. package/lib/util/responsive.js +11 -6
  90. package/lib/util/splitAtTopLevelOnly.js +51 -0
  91. package/lib/util/tap.js +6 -1
  92. package/lib/util/toColorValue.js +7 -2
  93. package/lib/util/toPath.js +22 -4
  94. package/lib/util/transformThemeValue.js +40 -26
  95. package/lib/util/validateConfig.js +48 -0
  96. package/lib/util/validateFormalSyntax.js +26 -0
  97. package/lib/util/withAlphaVariable.js +27 -15
  98. package/lib/value-parser/LICENSE +22 -0
  99. package/lib/value-parser/README.md +3 -0
  100. package/lib/value-parser/index.d.js +2 -0
  101. package/lib/value-parser/index.js +22 -0
  102. package/lib/value-parser/parse.js +259 -0
  103. package/lib/value-parser/stringify.js +38 -0
  104. package/lib/value-parser/unit.js +86 -0
  105. package/lib/value-parser/walk.js +16 -0
  106. package/loadConfig.d.ts +4 -0
  107. package/loadConfig.js +2 -0
  108. package/package.json +54 -52
  109. package/plugin.d.ts +10 -5
  110. package/resolveConfig.d.ts +12 -0
  111. package/scripts/generate-types.js +53 -0
  112. package/scripts/release-channel.js +18 -0
  113. package/scripts/release-notes.js +21 -0
  114. package/scripts/type-utils.js +27 -0
  115. package/src/cli/build/index.js +53 -0
  116. package/src/cli/build/plugin.js +465 -0
  117. package/src/cli/build/utils.js +76 -0
  118. package/src/cli/build/watching.js +229 -0
  119. package/src/cli/help/index.js +70 -0
  120. package/src/cli/index.js +217 -0
  121. package/src/cli/init/index.js +79 -0
  122. package/src/cli.js +1 -836
  123. package/src/corePluginList.js +1 -1
  124. package/src/corePlugins.js +576 -106
  125. package/src/css/preflight.css +13 -5
  126. package/src/featureFlags.js +17 -3
  127. package/src/index.js +1 -42
  128. package/src/lib/collapseAdjacentRules.js +5 -1
  129. package/src/lib/content.js +240 -0
  130. package/src/lib/defaultExtractor.js +202 -35
  131. package/src/lib/detectNesting.js +9 -1
  132. package/src/lib/evaluateTailwindFunctions.js +82 -8
  133. package/src/lib/expandApplyAtRules.js +322 -189
  134. package/src/lib/expandTailwindAtRules.js +82 -59
  135. package/src/lib/findAtConfigPath.js +48 -0
  136. package/src/lib/generateRules.js +413 -132
  137. package/src/lib/getModuleDependencies.js +70 -30
  138. package/src/lib/handleImportAtRules.js +34 -0
  139. package/src/lib/load-config.ts +31 -0
  140. package/src/lib/normalizeTailwindDirectives.js +0 -27
  141. package/src/lib/offsets.js +373 -0
  142. package/src/lib/regex.js +74 -0
  143. package/src/lib/remap-bitfield.js +82 -0
  144. package/src/lib/resolveDefaultsAtRules.js +53 -36
  145. package/src/lib/setupContextUtils.js +570 -151
  146. package/src/lib/setupTrackingContext.js +44 -58
  147. package/src/lib/sharedState.js +13 -4
  148. package/src/plugin.js +128 -0
  149. package/src/postcss-plugins/nesting/README.md +2 -2
  150. package/src/public/colors.js +22 -0
  151. package/src/public/default-config.js +1 -1
  152. package/src/public/default-theme.js +2 -2
  153. package/src/public/load-config.js +2 -0
  154. package/src/util/applyImportantSelector.js +27 -0
  155. package/src/util/buildMediaQuery.js +5 -3
  156. package/src/util/cloneNodes.js +5 -1
  157. package/src/util/color.js +34 -17
  158. package/src/util/colorNames.js +150 -0
  159. package/src/util/dataTypes.js +67 -23
  160. package/src/util/formatVariantSelector.js +264 -144
  161. package/src/util/getAllConfigs.js +21 -2
  162. package/src/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +1 -1
  163. package/src/util/log.js +25 -1
  164. package/src/util/nameClass.js +4 -0
  165. package/src/util/negateValue.js +11 -3
  166. package/src/util/normalizeConfig.js +78 -20
  167. package/src/util/normalizeScreens.js +99 -4
  168. package/src/util/parseBoxShadowValue.js +3 -50
  169. package/src/util/parseDependency.js +37 -42
  170. package/src/util/parseGlob.js +24 -0
  171. package/src/util/pluginUtils.js +118 -23
  172. package/src/util/prefixSelector.js +28 -10
  173. package/src/util/pseudoElements.js +167 -0
  174. package/src/util/removeAlphaVariables.js +24 -0
  175. package/src/util/resolveConfig.js +70 -62
  176. package/src/util/resolveConfigPath.js +12 -1
  177. package/src/util/splitAtTopLevelOnly.js +52 -0
  178. package/src/util/toPath.js +1 -1
  179. package/src/util/transformThemeValue.js +13 -3
  180. package/src/util/validateConfig.js +36 -0
  181. package/src/util/validateFormalSyntax.js +34 -0
  182. package/src/util/withAlphaVariable.js +1 -1
  183. package/src/value-parser/LICENSE +22 -0
  184. package/src/value-parser/README.md +3 -0
  185. package/src/value-parser/index.d.ts +177 -0
  186. package/src/value-parser/index.js +28 -0
  187. package/src/value-parser/parse.js +303 -0
  188. package/src/value-parser/stringify.js +41 -0
  189. package/src/value-parser/unit.js +118 -0
  190. package/src/value-parser/walk.js +18 -0
  191. package/stubs/.gitignore +1 -0
  192. package/stubs/.prettierrc.json +6 -0
  193. package/stubs/{defaultConfig.stub.js → config.full.js} +215 -165
  194. package/stubs/{simpleConfig.stub.js → config.simple.js} +1 -1
  195. package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -1
  196. package/stubs/postcss.config.js +5 -0
  197. package/stubs/tailwind.config.cjs +2 -0
  198. package/stubs/tailwind.config.js +2 -0
  199. package/stubs/tailwind.config.ts +3 -0
  200. package/types/config.d.ts +102 -56
  201. package/types/generated/colors.d.ts +22 -0
  202. package/types/generated/corePluginList.d.ts +1 -1
  203. package/types/generated/default-theme.d.ts +372 -0
  204. package/types/index.d.ts +7 -1
  205. package/CHANGELOG.md +0 -2099
  206. package/lib/cli-peer-dependencies.js +0 -15
  207. package/lib/constants.js +0 -37
  208. package/peers/index.js +0 -75156
  209. package/scripts/install-integrations.js +0 -27
  210. package/scripts/rebuildFixtures.js +0 -68
  211. package/src/cli-peer-dependencies.js +0 -9
  212. package/src/constants.js +0 -17
  213. package/types.d.ts +0 -1
@@ -2,52 +2,81 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- exports.default = expandTailwindAtRules;
6
- var _quickLru = _interopRequireDefault(require("quick-lru"));
7
- var sharedState = _interopRequireWildcard(require("./sharedState"));
8
- var _generateRules = require("./generateRules");
9
- var _bigSign = _interopRequireDefault(require("../util/bigSign"));
10
- var _log = _interopRequireDefault(require("../util/log"));
11
- var _cloneNodes = _interopRequireDefault(require("../util/cloneNodes"));
12
- var _defaultExtractor = require("./defaultExtractor");
13
- function _interopRequireDefault(obj) {
5
+ Object.defineProperty(exports, "default", {
6
+ enumerable: true,
7
+ get: function() {
8
+ return expandTailwindAtRules;
9
+ }
10
+ });
11
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
12
+ const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
13
+ const _oxide = require("@tailwindcss/oxide");
14
+ const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
15
+ const _generateRules = require("./generateRules");
16
+ const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
17
+ const _cloneNodes = /*#__PURE__*/ _interop_require_default(require("../util/cloneNodes"));
18
+ const _defaultExtractor = require("./defaultExtractor");
19
+ const _featureFlags = require("../featureFlags");
20
+ function _interop_require_default(obj) {
14
21
  return obj && obj.__esModule ? obj : {
15
22
  default: obj
16
23
  };
17
24
  }
18
- function _interopRequireWildcard(obj) {
19
- if (obj && obj.__esModule) {
25
+ function _getRequireWildcardCache(nodeInterop) {
26
+ if (typeof WeakMap !== "function") return null;
27
+ var cacheBabelInterop = new WeakMap();
28
+ var cacheNodeInterop = new WeakMap();
29
+ return (_getRequireWildcardCache = function(nodeInterop) {
30
+ return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
31
+ })(nodeInterop);
32
+ }
33
+ function _interop_require_wildcard(obj, nodeInterop) {
34
+ if (!nodeInterop && obj && obj.__esModule) {
20
35
  return obj;
21
- } else {
22
- var newObj = {};
23
- if (obj != null) {
24
- for(var key in obj){
25
- if (Object.prototype.hasOwnProperty.call(obj, key)) {
26
- var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
27
- if (desc.get || desc.set) {
28
- Object.defineProperty(newObj, key, desc);
29
- } else {
30
- newObj[key] = obj[key];
31
- }
32
- }
36
+ }
37
+ if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
38
+ return {
39
+ default: obj
40
+ };
41
+ }
42
+ var cache = _getRequireWildcardCache(nodeInterop);
43
+ if (cache && cache.has(obj)) {
44
+ return cache.get(obj);
45
+ }
46
+ var newObj = {};
47
+ var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
48
+ for(var key in obj){
49
+ if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
50
+ var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
51
+ if (desc && (desc.get || desc.set)) {
52
+ Object.defineProperty(newObj, key, desc);
53
+ } else {
54
+ newObj[key] = obj[key];
33
55
  }
34
56
  }
35
- newObj.default = obj;
36
- return newObj;
37
57
  }
58
+ newObj.default = obj;
59
+ if (cache) {
60
+ cache.set(obj, newObj);
61
+ }
62
+ return newObj;
38
63
  }
39
- let env = sharedState.env;
64
+ let env = _sharedState.env;
40
65
  const builtInExtractors = {
41
66
  DEFAULT: _defaultExtractor.defaultExtractor
42
67
  };
43
68
  const builtInTransformers = {
44
- DEFAULT: (content)=>content
45
- ,
46
- svelte: (content)=>content.replace(/(?:^|\s)class:/g, ' ')
69
+ DEFAULT: (content)=>content,
70
+ svelte: (content)=>content.replace(/(?:^|\s)class:/g, " ")
47
71
  };
48
- function getExtractor(tailwindConfig, fileExtension) {
49
- let extractors = tailwindConfig.content.extract;
50
- return extractors[fileExtension] || extractors.DEFAULT || builtInExtractors[fileExtension] || builtInExtractors.DEFAULT;
72
+ function getExtractor(context, fileExtension) {
73
+ let extractors = context.tailwindConfig.content.extract;
74
+ return extractors[fileExtension] || extractors.DEFAULT || builtInExtractors[fileExtension] || // Because we call `DEFAULT(context)`, the returning function is always a new function without a
75
+ // stable identity. Marking it with `DEFAULT_EXTRACTOR` allows us to check if it is the default
76
+ // extractor without relying on the function identity.
77
+ Object.assign(builtInExtractors.DEFAULT(context), {
78
+ DEFAULT_EXTRACTOR: true
79
+ });
51
80
  }
52
81
  function getTransformer(tailwindConfig, fileExtension) {
53
82
  let transformers = tailwindConfig.content.transform;
@@ -59,11 +88,11 @@ let extractorCache = new WeakMap();
59
88
  // up these regexes by 50% that could cut initial build time by like 20%.
60
89
  function getClassCandidates(content, extractor, candidates, seen) {
61
90
  if (!extractorCache.has(extractor)) {
62
- extractorCache.set(extractor, new _quickLru.default({
91
+ extractorCache.set(extractor, new _quicklru.default({
63
92
  maxSize: 25000
64
93
  }));
65
94
  }
66
- for (let line of content.split('\n')){
95
+ for (let line of content.split("\n")){
67
96
  line = line.trim();
68
97
  if (seen.has(line)) {
69
98
  continue;
@@ -74,8 +103,7 @@ function getClassCandidates(content, extractor, candidates, seen) {
74
103
  candidates.add(match);
75
104
  }
76
105
  } else {
77
- let extractorMatches = extractor(line).filter((s)=>s !== '!*'
78
- );
106
+ let extractorMatches = extractor(line).filter((s)=>s !== "!*");
79
107
  let lineMatchesSet = new Set(extractorMatches);
80
108
  for (let match of lineMatchesSet){
81
109
  candidates.add(match);
@@ -84,50 +112,21 @@ function getClassCandidates(content, extractor, candidates, seen) {
84
112
  }
85
113
  }
86
114
  }
87
- function buildStylesheet(rules, context) {
88
- let sortedRules = rules.sort(([a], [z])=>(0, _bigSign).default(a - z)
89
- );
115
+ /**
116
+ *
117
+ * @param {[import('./offsets.js').RuleOffset, import('postcss').Node][]} rules
118
+ * @param {*} context
119
+ */ function buildStylesheet(rules, context) {
120
+ let sortedRules = context.offsets.sort(rules);
90
121
  let returnValue = {
91
122
  base: new Set(),
92
123
  defaults: new Set(),
93
124
  components: new Set(),
94
125
  utilities: new Set(),
95
- variants: new Set(),
96
- // All the CSS that is not Tailwind related can be put in this bucket. This
97
- // will make it easier to later use this information when we want to
98
- // `@apply` for example. The main reason we do this here is because we
99
- // still need to make sure the order is correct. Last but not least, we
100
- // will make sure to always re-inject this section into the css, even if
101
- // certain rules were not used. This means that it will look like a no-op
102
- // from the user's perspective, but we gathered all the useful information
103
- // we need.
104
- user: new Set()
126
+ variants: new Set()
105
127
  };
106
128
  for (let [sort, rule] of sortedRules){
107
- if (sort >= context.minimumScreen) {
108
- returnValue.variants.add(rule);
109
- continue;
110
- }
111
- if (sort & context.layerOrder.base) {
112
- returnValue.base.add(rule);
113
- continue;
114
- }
115
- if (sort & context.layerOrder.defaults) {
116
- returnValue.defaults.add(rule);
117
- continue;
118
- }
119
- if (sort & context.layerOrder.components) {
120
- returnValue.components.add(rule);
121
- continue;
122
- }
123
- if (sort & context.layerOrder.utilities) {
124
- returnValue.utilities.add(rule);
125
- continue;
126
- }
127
- if (sort & context.layerOrder.user) {
128
- returnValue.user.add(rule);
129
- continue;
130
- }
129
+ returnValue[sort.layer].add(rule);
131
130
  }
132
131
  return returnValue;
133
132
  }
@@ -144,116 +143,169 @@ function expandTailwindAtRules(context) {
144
143
  // a lot of work and bail early. Also we don't have to register our touch
145
144
  // file as a dependency since the output of this CSS does not depend on
146
145
  // the source of any templates. Think Vue <style> blocks for example.
147
- if (rule.name === 'tailwind') {
146
+ if (rule.name === "tailwind") {
148
147
  if (Object.keys(layerNodes).includes(rule.params)) {
149
148
  layerNodes[rule.params] = rule;
150
149
  }
151
150
  }
152
151
  });
153
- if (Object.values(layerNodes).every((n)=>n === null
154
- )) {
152
+ if (Object.values(layerNodes).every((n)=>n === null)) {
155
153
  return root;
156
154
  }
155
+ var _context_candidates;
157
156
  // ---
158
157
  // Find potential rules in changed files
159
158
  let candidates = new Set([
160
- sharedState.NOT_ON_DEMAND
159
+ ...(_context_candidates = context.candidates) !== null && _context_candidates !== void 0 ? _context_candidates : [],
160
+ _sharedState.NOT_ON_DEMAND
161
161
  ]);
162
162
  let seen = new Set();
163
- env.DEBUG && console.time('Reading changed files');
164
- for (let { content , extension } of context.changedContent){
165
- let transformer = getTransformer(context.tailwindConfig, extension);
166
- let extractor = getExtractor(context.tailwindConfig, extension);
167
- getClassCandidates(transformer(content), extractor, candidates, seen);
163
+ env.DEBUG && console.time("Reading changed files");
164
+ if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, "oxideParser")) {
165
+ let rustParserContent = [];
166
+ let regexParserContent = [];
167
+ for (let item of context.changedContent){
168
+ let transformer = getTransformer(context.tailwindConfig, item.extension);
169
+ let extractor = getExtractor(context, item.extension);
170
+ if (transformer === builtInTransformers.DEFAULT && (extractor === null || extractor === void 0 ? void 0 : extractor.DEFAULT_EXTRACTOR) === true) {
171
+ rustParserContent.push(item);
172
+ } else {
173
+ regexParserContent.push([
174
+ item,
175
+ {
176
+ transformer,
177
+ extractor
178
+ }
179
+ ]);
180
+ }
181
+ }
182
+ if (rustParserContent.length > 0) {
183
+ for (let candidate of (0, _oxide.parseCandidateStrings)(rustParserContent, _oxide.IO.Parallel | _oxide.Parsing.Parallel)){
184
+ candidates.add(candidate);
185
+ }
186
+ }
187
+ if (regexParserContent.length > 0) {
188
+ for (let [{ file , content }, { transformer , extractor }] of regexParserContent){
189
+ content = file ? _fs.default.readFileSync(file, "utf8") : content;
190
+ getClassCandidates(transformer(content), extractor, candidates, seen);
191
+ }
192
+ }
193
+ } else {
194
+ for (let { file , content , extension } of context.changedContent){
195
+ let transformer = getTransformer(context.tailwindConfig, extension);
196
+ let extractor = getExtractor(context, extension);
197
+ content = file ? _fs.default.readFileSync(file, "utf8") : content;
198
+ getClassCandidates(transformer(content), extractor, candidates, seen);
199
+ }
168
200
  }
169
- env.DEBUG && console.timeEnd('Reading changed files');
201
+ env.DEBUG && console.timeEnd("Reading changed files");
170
202
  // ---
171
203
  // Generate the actual CSS
172
204
  let classCacheCount = context.classCache.size;
173
- env.DEBUG && console.time('Generate rules');
174
- let rules = (0, _generateRules).generateRules(candidates, context);
175
- env.DEBUG && console.timeEnd('Generate rules');
205
+ env.DEBUG && console.time("Generate rules");
206
+ env.DEBUG && console.time("Sorting candidates");
207
+ // TODO: only sort if we are not using the oxide parser (flagEnabled(context.tailwindConfig,
208
+ // 'oxideParser')) AND if we got all the candidates form the oxideParser alone. This will not
209
+ // be the case currently if you have custom transformers / extractors.
210
+ let sortedCandidates = new Set([
211
+ ...candidates
212
+ ].sort((a, z)=>{
213
+ if (a === z) return 0;
214
+ if (a < z) return -1;
215
+ return 1;
216
+ }));
217
+ env.DEBUG && console.timeEnd("Sorting candidates");
218
+ (0, _generateRules.generateRules)(sortedCandidates, context);
219
+ env.DEBUG && console.timeEnd("Generate rules");
176
220
  // We only ever add to the classCache, so if it didn't grow, there is nothing new.
177
- env.DEBUG && console.time('Build stylesheet');
221
+ env.DEBUG && console.time("Build stylesheet");
178
222
  if (context.stylesheetCache === null || context.classCache.size !== classCacheCount) {
179
- for (let rule of rules){
180
- context.ruleCache.add(rule);
181
- }
182
223
  context.stylesheetCache = buildStylesheet([
183
224
  ...context.ruleCache
184
225
  ], context);
185
226
  }
186
- env.DEBUG && console.timeEnd('Build stylesheet');
187
- let { defaults: defaultNodes , base: baseNodes , components: componentNodes , utilities: utilityNodes , variants: screenNodes , } = context.stylesheetCache;
227
+ env.DEBUG && console.timeEnd("Build stylesheet");
228
+ let { defaults: defaultNodes , base: baseNodes , components: componentNodes , utilities: utilityNodes , variants: screenNodes } = context.stylesheetCache;
188
229
  // ---
189
230
  // Replace any Tailwind directives with generated CSS
190
231
  if (layerNodes.base) {
191
- layerNodes.base.before((0, _cloneNodes).default([
232
+ layerNodes.base.before((0, _cloneNodes.default)([
192
233
  ...baseNodes,
193
234
  ...defaultNodes
194
235
  ], layerNodes.base.source, {
195
- layer: 'base'
236
+ layer: "base"
196
237
  }));
197
238
  layerNodes.base.remove();
198
239
  }
199
240
  if (layerNodes.components) {
200
- layerNodes.components.before((0, _cloneNodes).default([
241
+ layerNodes.components.before((0, _cloneNodes.default)([
201
242
  ...componentNodes
202
243
  ], layerNodes.components.source, {
203
- layer: 'components'
244
+ layer: "components"
204
245
  }));
205
246
  layerNodes.components.remove();
206
247
  }
207
248
  if (layerNodes.utilities) {
208
- layerNodes.utilities.before((0, _cloneNodes).default([
249
+ layerNodes.utilities.before((0, _cloneNodes.default)([
209
250
  ...utilityNodes
210
251
  ], layerNodes.utilities.source, {
211
- layer: 'utilities'
252
+ layer: "utilities"
212
253
  }));
213
254
  layerNodes.utilities.remove();
214
255
  }
215
256
  // We do post-filtering to not alter the emitted order of the variants
216
257
  const variantNodes = Array.from(screenNodes).filter((node)=>{
217
- var ref;
218
- const parentLayer = (ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer;
219
- if (parentLayer === 'components') {
258
+ var _node_raws_tailwind;
259
+ const parentLayer = (_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer;
260
+ if (parentLayer === "components") {
220
261
  return layerNodes.components !== null;
221
262
  }
222
- if (parentLayer === 'utilities') {
263
+ if (parentLayer === "utilities") {
223
264
  return layerNodes.utilities !== null;
224
265
  }
225
266
  return true;
226
267
  });
227
268
  if (layerNodes.variants) {
228
- layerNodes.variants.before((0, _cloneNodes).default(variantNodes, layerNodes.variants.source, {
229
- layer: 'variants'
269
+ layerNodes.variants.before((0, _cloneNodes.default)(variantNodes, layerNodes.variants.source, {
270
+ layer: "variants"
230
271
  }));
231
272
  layerNodes.variants.remove();
232
273
  } else if (variantNodes.length > 0) {
233
- root.append((0, _cloneNodes).default(variantNodes, root.source, {
234
- layer: 'variants'
235
- }));
274
+ let cloned = (0, _cloneNodes.default)(variantNodes, undefined, {
275
+ layer: "variants"
276
+ });
277
+ cloned.forEach((node)=>{
278
+ var _node_raws_tailwind;
279
+ var _node_raws_tailwind_parentLayer;
280
+ let parentLayer = (_node_raws_tailwind_parentLayer = (_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) !== null && _node_raws_tailwind_parentLayer !== void 0 ? _node_raws_tailwind_parentLayer : null;
281
+ node.walk((n)=>{
282
+ if (!n.source) {
283
+ n.source = layerNodes[parentLayer].source;
284
+ }
285
+ });
286
+ });
287
+ root.append(cloned);
236
288
  }
237
289
  // If we've got a utility layer and no utilities are generated there's likely something wrong
238
290
  const hasUtilityVariants = variantNodes.some((node)=>{
239
- var ref;
240
- return ((ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer) === 'utilities';
291
+ var _node_raws_tailwind;
292
+ return ((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) === "utilities";
241
293
  });
242
294
  if (layerNodes.utilities && utilityNodes.size === 0 && !hasUtilityVariants) {
243
- _log.default.warn('content-problems', [
244
- 'No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.',
245
- 'https://tailwindcss.com/docs/content-configuration',
295
+ _log.default.warn("content-problems", [
296
+ "No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.",
297
+ "https://tailwindcss.com/docs/content-configuration"
246
298
  ]);
247
299
  }
248
300
  // ---
249
301
  if (env.DEBUG) {
250
- console.log('Potential classes: ', candidates.size);
251
- console.log('Active contexts: ', sharedState.contextSourcesMap.size);
302
+ console.log("Potential classes: ", candidates.size);
303
+ console.log("Active contexts: ", _sharedState.contextSourcesMap.size);
252
304
  }
253
305
  // Clear the cache for the changed files
254
306
  context.changedContent = [];
255
307
  // Cleanup any leftover @layer atrules
256
- root.walkAtRules('layer', (rule)=>{
308
+ root.walkAtRules("layer", (rule)=>{
257
309
  if (Object.keys(layerNodes).includes(rule.params)) {
258
310
  rule.remove();
259
311
  }
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ Object.defineProperty(exports, "findAtConfigPath", {
6
+ enumerable: true,
7
+ get: function() {
8
+ return findAtConfigPath;
9
+ }
10
+ });
11
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
12
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
13
+ function _interop_require_default(obj) {
14
+ return obj && obj.__esModule ? obj : {
15
+ default: obj
16
+ };
17
+ }
18
+ function findAtConfigPath(root, result) {
19
+ let configPath = null;
20
+ let relativeTo = null;
21
+ root.walkAtRules("config", (rule)=>{
22
+ var _rule_source;
23
+ var _rule_source_input_file, _ref;
24
+ relativeTo = (_ref = (_rule_source_input_file = (_rule_source = rule.source) === null || _rule_source === void 0 ? void 0 : _rule_source.input.file) !== null && _rule_source_input_file !== void 0 ? _rule_source_input_file : result.opts.from) !== null && _ref !== void 0 ? _ref : null;
25
+ if (relativeTo === null) {
26
+ throw rule.error("The `@config` directive cannot be used without setting `from` in your PostCSS config.");
27
+ }
28
+ if (configPath) {
29
+ throw rule.error("Only one `@config` directive is allowed per file.");
30
+ }
31
+ let matches = rule.params.match(/(['"])(.*?)\1/);
32
+ if (!matches) {
33
+ throw rule.error("A path is required when using the `@config` directive.");
34
+ }
35
+ let inputPath = matches[2];
36
+ if (_path.default.isAbsolute(inputPath)) {
37
+ throw rule.error("The `@config` directive cannot be used with an absolute path.");
38
+ }
39
+ configPath = _path.default.resolve(_path.default.dirname(relativeTo), inputPath);
40
+ if (!_fs.default.existsSync(configPath)) {
41
+ throw rule.error(`The config file at "${inputPath}" does not exist. Make sure the path is correct and the file exists.`);
42
+ }
43
+ rule.remove();
44
+ });
45
+ return configPath ? configPath : null;
46
+ }