tailwindcss 0.0.0-insiders.371b6ea → 0.0.0-insiders.37575ea

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 (201) hide show
  1. package/README.md +1 -1
  2. package/index.css +5 -0
  3. package/lib/cli/build/index.js +18 -9
  4. package/lib/cli/build/plugin.js +152 -89
  5. package/lib/cli/build/utils.js +18 -8
  6. package/lib/cli/build/watching.js +16 -12
  7. package/lib/cli/help/index.js +6 -4
  8. package/lib/cli/index.js +17 -25
  9. package/lib/cli/init/index.js +28 -11
  10. package/lib/cli.js +1 -5
  11. package/lib/corePluginList.js +8 -1
  12. package/lib/corePlugins.js +199 -66
  13. package/lib/css/preflight.css +9 -1
  14. package/lib/featureFlags.js +22 -9
  15. package/lib/index.js +1 -5
  16. package/lib/lib/cacheInvalidation.js +7 -5
  17. package/lib/lib/collapseAdjacentRules.js +3 -1
  18. package/lib/lib/collapseDuplicateDeclarations.js +10 -8
  19. package/lib/lib/content.js +45 -15
  20. package/lib/lib/defaultExtractor.js +6 -4
  21. package/lib/lib/detectNesting.js +3 -1
  22. package/lib/lib/evaluateTailwindFunctions.js +20 -16
  23. package/lib/lib/expandApplyAtRules.js +41 -33
  24. package/lib/lib/expandTailwindAtRules.js +67 -28
  25. package/lib/lib/findAtConfigPath.js +6 -4
  26. package/lib/lib/generateRules.js +84 -63
  27. package/lib/lib/getModuleDependencies.js +85 -37
  28. package/lib/lib/handleImportAtRules.js +50 -0
  29. package/lib/lib/load-config.js +42 -0
  30. package/lib/lib/normalizeTailwindDirectives.js +5 -18
  31. package/lib/lib/offsets.js +14 -7
  32. package/lib/lib/partitionApplyAtRules.js +3 -1
  33. package/lib/lib/regex.js +21 -7
  34. package/lib/lib/remap-bitfield.js +3 -1
  35. package/lib/lib/resolveDefaultsAtRules.js +24 -20
  36. package/lib/lib/setupContextUtils.js +120 -78
  37. package/lib/lib/setupTrackingContext.js +28 -25
  38. package/lib/lib/sharedState.js +29 -28
  39. package/lib/lib/substituteScreenAtRules.js +5 -3
  40. package/lib/plugin.js +122 -6
  41. package/lib/postcss-plugins/nesting/index.js +3 -1
  42. package/lib/postcss-plugins/nesting/plugin.js +8 -6
  43. package/lib/processTailwindFeatures.js +14 -12
  44. package/lib/public/colors.js +49 -25
  45. package/lib/public/create-plugin.js +5 -3
  46. package/lib/public/default-config.js +6 -4
  47. package/lib/public/default-theme.js +6 -4
  48. package/lib/public/load-config.js +12 -0
  49. package/lib/public/resolve-config.js +6 -4
  50. package/lib/util/applyImportantSelector.js +36 -0
  51. package/lib/util/bigSign.js +3 -1
  52. package/lib/util/buildMediaQuery.js +3 -1
  53. package/lib/util/cloneDeep.js +3 -1
  54. package/lib/util/cloneNodes.js +3 -1
  55. package/lib/util/color.js +26 -8
  56. package/lib/util/colorNames.js +752 -0
  57. package/lib/util/configurePlugins.js +3 -1
  58. package/lib/util/createPlugin.js +3 -1
  59. package/lib/util/createUtilityPlugin.js +5 -3
  60. package/lib/util/dataTypes.js +59 -21
  61. package/lib/util/defaults.js +6 -4
  62. package/lib/util/escapeClassName.js +7 -5
  63. package/lib/util/escapeCommas.js +3 -1
  64. package/lib/util/flattenColorPalette.js +3 -1
  65. package/lib/util/formatVariantSelector.js +32 -120
  66. package/lib/util/getAllConfigs.js +6 -4
  67. package/lib/util/hashConfig.js +6 -4
  68. package/lib/util/isKeyframeRule.js +3 -1
  69. package/lib/util/isPlainObject.js +3 -1
  70. package/lib/util/isSyntacticallyValidPropertyValue.js +3 -1
  71. package/lib/util/log.js +25 -4
  72. package/lib/util/nameClass.js +12 -6
  73. package/lib/util/negateValue.js +3 -1
  74. package/lib/util/normalizeConfig.js +44 -17
  75. package/lib/util/normalizeScreens.js +12 -4
  76. package/lib/util/parseAnimationValue.js +3 -1
  77. package/lib/util/parseBoxShadowValue.js +6 -2
  78. package/lib/util/parseDependency.js +3 -1
  79. package/lib/util/parseGlob.js +6 -4
  80. package/lib/util/parseObjectStyles.js +9 -7
  81. package/lib/util/pluginUtils.js +34 -43
  82. package/lib/util/prefixSelector.js +6 -4
  83. package/lib/util/pseudoElements.js +209 -0
  84. package/lib/util/removeAlphaVariables.js +3 -1
  85. package/lib/util/resolveConfig.js +10 -8
  86. package/lib/util/resolveConfigPath.js +26 -10
  87. package/lib/util/responsive.js +6 -4
  88. package/lib/util/splitAtTopLevelOnly.js +10 -2
  89. package/lib/util/tap.js +3 -1
  90. package/lib/util/toColorValue.js +3 -1
  91. package/lib/util/toPath.js +3 -1
  92. package/lib/util/transformThemeValue.js +6 -4
  93. package/lib/util/validateConfig.js +27 -3
  94. package/lib/util/validateFormalSyntax.js +3 -1
  95. package/lib/util/withAlphaVariable.js +6 -2
  96. package/lib/value-parser/LICENSE +22 -0
  97. package/lib/value-parser/README.md +3 -0
  98. package/lib/value-parser/index.d.js +2 -0
  99. package/lib/value-parser/index.js +22 -0
  100. package/lib/value-parser/parse.js +259 -0
  101. package/lib/value-parser/stringify.js +38 -0
  102. package/lib/value-parser/unit.js +86 -0
  103. package/lib/value-parser/walk.js +16 -0
  104. package/loadConfig.d.ts +4 -0
  105. package/loadConfig.js +2 -0
  106. package/package.json +46 -55
  107. package/src/cli/build/index.js +11 -7
  108. package/src/cli/build/plugin.js +97 -67
  109. package/src/cli/build/watching.js +4 -2
  110. package/src/cli/index.js +9 -26
  111. package/src/cli/init/index.js +37 -8
  112. package/src/cli.js +1 -5
  113. package/src/corePluginList.js +1 -1
  114. package/src/corePlugins.js +182 -49
  115. package/src/css/preflight.css +9 -1
  116. package/src/featureFlags.js +7 -3
  117. package/src/index.js +1 -5
  118. package/src/lib/content.js +33 -1
  119. package/src/lib/defaultExtractor.js +1 -1
  120. package/src/lib/evaluateTailwindFunctions.js +4 -1
  121. package/src/lib/expandApplyAtRules.js +8 -1
  122. package/src/lib/expandTailwindAtRules.js +59 -32
  123. package/src/lib/generateRules.js +64 -33
  124. package/src/lib/getModuleDependencies.js +70 -30
  125. package/src/lib/handleImportAtRules.js +34 -0
  126. package/src/lib/load-config.ts +31 -0
  127. package/src/lib/normalizeTailwindDirectives.js +0 -27
  128. package/src/lib/offsets.js +9 -3
  129. package/src/lib/setupContextUtils.js +49 -26
  130. package/src/lib/setupTrackingContext.js +6 -8
  131. package/src/lib/sharedState.js +10 -20
  132. package/src/plugin.js +86 -0
  133. package/src/public/colors.js +22 -0
  134. package/src/public/default-config.js +1 -1
  135. package/src/public/default-theme.js +2 -2
  136. package/src/public/load-config.js +2 -0
  137. package/src/util/applyImportantSelector.js +27 -0
  138. package/src/util/color.js +18 -3
  139. package/src/util/colorNames.js +150 -0
  140. package/src/util/dataTypes.js +17 -6
  141. package/src/util/formatVariantSelector.js +6 -102
  142. package/src/util/getAllConfigs.js +2 -2
  143. package/src/util/log.js +24 -0
  144. package/src/util/normalizeConfig.js +39 -11
  145. package/src/util/pluginUtils.js +11 -38
  146. package/src/util/prefixSelector.js +1 -0
  147. package/src/util/pseudoElements.js +167 -0
  148. package/src/util/resolveConfigPath.js +12 -1
  149. package/src/util/splitAtTopLevelOnly.js +8 -1
  150. package/src/util/validateConfig.js +23 -0
  151. package/src/value-parser/LICENSE +22 -0
  152. package/src/value-parser/README.md +3 -0
  153. package/src/value-parser/index.d.ts +177 -0
  154. package/src/value-parser/index.js +28 -0
  155. package/src/value-parser/parse.js +303 -0
  156. package/src/value-parser/stringify.js +41 -0
  157. package/src/value-parser/unit.js +118 -0
  158. package/src/value-parser/walk.js +18 -0
  159. package/stubs/.gitignore +1 -0
  160. package/stubs/.prettierrc.json +6 -0
  161. package/stubs/{defaultConfig.stub.js → config.full.js} +49 -2
  162. package/stubs/{simpleConfig.stub.js → config.simple.js} +1 -2
  163. package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -1
  164. package/stubs/postcss.config.js +5 -0
  165. package/stubs/tailwind.config.cjs +2 -0
  166. package/stubs/tailwind.config.js +2 -0
  167. package/stubs/tailwind.config.ts +3 -0
  168. package/types/config.d.ts +10 -8
  169. package/types/generated/colors.d.ts +22 -0
  170. package/types/generated/corePluginList.d.ts +1 -1
  171. package/types/generated/default-theme.d.ts +28 -1
  172. package/lib/cli/build/deps.js +0 -54
  173. package/lib/cli-peer-dependencies.js +0 -28
  174. package/lib/constants.js +0 -44
  175. package/lib/oxide/cli/build/deps.js +0 -81
  176. package/lib/oxide/cli/build/index.js +0 -47
  177. package/lib/oxide/cli/build/plugin.js +0 -364
  178. package/lib/oxide/cli/build/utils.js +0 -77
  179. package/lib/oxide/cli/build/watching.js +0 -177
  180. package/lib/oxide/cli/help/index.js +0 -70
  181. package/lib/oxide/cli/index.js +0 -220
  182. package/lib/oxide/cli/init/index.js +0 -35
  183. package/lib/oxide/cli.js +0 -5
  184. package/lib/oxide/postcss-plugin.js +0 -2
  185. package/oxide-node-api-shim/index.js +0 -21
  186. package/oxide-node-api-shim/package.json +0 -5
  187. package/peers/index.js +0 -79461
  188. package/scripts/swap-engines.js +0 -40
  189. package/src/cli/build/deps.js +0 -56
  190. package/src/cli-peer-dependencies.js +0 -15
  191. package/src/constants.js +0 -17
  192. package/src/oxide/cli/build/deps.ts +0 -91
  193. package/src/oxide/cli/build/index.ts +0 -47
  194. package/src/oxide/cli/build/plugin.ts +0 -436
  195. package/src/oxide/cli/build/utils.ts +0 -74
  196. package/src/oxide/cli/build/watching.ts +0 -225
  197. package/src/oxide/cli/help/index.ts +0 -69
  198. package/src/oxide/cli/index.ts +0 -212
  199. package/src/oxide/cli/init/index.ts +0 -32
  200. package/src/oxide/cli.ts +0 -1
  201. package/src/oxide/postcss-plugin.ts +0 -1
package/README.md CHANGED
@@ -14,7 +14,7 @@
14
14
 
15
15
 
16
16
  <p align="center">
17
- <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci-stable.yml?branch=master" alt="Build Status"></a>
17
+ <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=master" alt="Build Status"></a>
18
18
  <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
19
19
  <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
20
20
  <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
package/index.css ADDED
@@ -0,0 +1,5 @@
1
+ @tailwind base;
2
+
3
+ @tailwind components;
4
+
5
+ @tailwind utilities;
@@ -5,17 +5,20 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  Object.defineProperty(exports, "build", {
7
7
  enumerable: true,
8
- get: ()=>build
8
+ get: function() {
9
+ return build;
10
+ }
9
11
  });
10
- const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
11
- const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
12
- const _pluginJs = require("./plugin.js");
13
- function _interopRequireDefault(obj) {
12
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
13
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
14
+ const _resolveConfigPath = require("../../util/resolveConfigPath.js");
15
+ const _plugin = require("./plugin.js");
16
+ function _interop_require_default(obj) {
14
17
  return obj && obj.__esModule ? obj : {
15
18
  default: obj
16
19
  };
17
20
  }
18
- async function build(args, configs) {
21
+ async function build(args) {
19
22
  let input = args["--input"];
20
23
  let shouldWatch = args["--watch"];
21
24
  // TODO: Deprecate this in future versions
@@ -31,9 +34,12 @@ async function build(args, configs) {
31
34
  console.error(`Specified config file ${args["--config"]} does not exist.`);
32
35
  process.exit(9);
33
36
  }
37
+ if (args["--no-autoprefixer"]) {
38
+ console.error("[deprecation] The --no-autoprefixer flag is deprecated and has no effect.");
39
+ }
34
40
  // TODO: Reference the @config path here if exists
35
- let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
36
- let processor = await (0, _pluginJs.createProcessor)(args, configPath);
41
+ let configPath = args["--config"] ? args["--config"] : (0, _resolveConfigPath.resolveDefaultConfigPath)();
42
+ let processor = await (0, _plugin.createProcessor)(args, configPath);
37
43
  if (shouldWatch) {
38
44
  // Abort the watcher if stdin is closed to avoid zombie processes
39
45
  // You can disable this behavior with --watch=always
@@ -43,6 +49,9 @@ async function build(args, configs) {
43
49
  process.stdin.resume();
44
50
  await processor.watch();
45
51
  } else {
46
- await processor.build();
52
+ await processor.build().catch((e)=>{
53
+ console.error(e);
54
+ process.exit(1);
55
+ });
47
56
  }
48
57
  }
@@ -5,32 +5,118 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  Object.defineProperty(exports, "createProcessor", {
7
7
  enumerable: true,
8
- get: ()=>createProcessor
8
+ get: function() {
9
+ return createProcessor;
10
+ }
9
11
  });
10
- const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
11
- const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
12
- const _postcssLoadConfig = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config"));
12
+ const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../../package.json"));
13
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
14
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
15
+ const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
16
+ const _postcssloadconfig = /*#__PURE__*/ _interop_require_default(require("postcss-load-config"));
17
+ const _browserslist = /*#__PURE__*/ _interop_require_default(require("browserslist"));
18
+ const _lightningcss = /*#__PURE__*/ _interop_require_wildcard(require("lightningcss"));
13
19
  const _lilconfig = require("lilconfig");
14
- const _plugins = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
20
+ const _plugins = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
15
21
  ));
16
- const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
22
+ const _options = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
17
23
  ));
18
- const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("../../processTailwindFeatures"));
19
- const _deps = require("./deps");
24
+ const _processTailwindFeatures = /*#__PURE__*/ _interop_require_default(require("../../processTailwindFeatures"));
20
25
  const _utils = require("./utils");
21
26
  const _sharedState = require("../../lib/sharedState");
22
- const _resolveConfigJs = /*#__PURE__*/ _interopRequireDefault(require("../../../resolveConfig.js"));
23
- const _getModuleDependenciesJs = /*#__PURE__*/ _interopRequireDefault(require("../../lib/getModuleDependencies.js"));
24
- const _contentJs = require("../../lib/content.js");
25
- const _watchingJs = require("./watching.js");
26
- const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
27
- const _findAtConfigPathJs = require("../../lib/findAtConfigPath.js");
28
- const _log = /*#__PURE__*/ _interopRequireDefault(require("../../util/log"));
29
- function _interopRequireDefault(obj) {
27
+ const _resolveConfig = /*#__PURE__*/ _interop_require_default(require("../../../resolveConfig.js"));
28
+ const _content = require("../../lib/content.js");
29
+ const _watching = require("./watching.js");
30
+ const _fastglob = /*#__PURE__*/ _interop_require_default(require("fast-glob"));
31
+ const _findAtConfigPath = require("../../lib/findAtConfigPath.js");
32
+ const _log = /*#__PURE__*/ _interop_require_default(require("../../util/log"));
33
+ const _loadconfig = require("../../lib/load-config");
34
+ const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("../../lib/getModuleDependencies"));
35
+ const _validateConfig = require("../../util/validateConfig");
36
+ const _handleImportAtRules = require("../../lib/handleImportAtRules");
37
+ const _featureFlags = require("../../featureFlags");
38
+ function _interop_require_default(obj) {
30
39
  return obj && obj.__esModule ? obj : {
31
40
  default: obj
32
41
  };
33
42
  }
43
+ function _getRequireWildcardCache(nodeInterop) {
44
+ if (typeof WeakMap !== "function") return null;
45
+ var cacheBabelInterop = new WeakMap();
46
+ var cacheNodeInterop = new WeakMap();
47
+ return (_getRequireWildcardCache = function(nodeInterop) {
48
+ return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
49
+ })(nodeInterop);
50
+ }
51
+ function _interop_require_wildcard(obj, nodeInterop) {
52
+ if (!nodeInterop && obj && obj.__esModule) {
53
+ return obj;
54
+ }
55
+ if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
56
+ return {
57
+ default: obj
58
+ };
59
+ }
60
+ var cache = _getRequireWildcardCache(nodeInterop);
61
+ if (cache && cache.has(obj)) {
62
+ return cache.get(obj);
63
+ }
64
+ var newObj = {};
65
+ var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
66
+ for(var key in obj){
67
+ if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
68
+ var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
69
+ if (desc && (desc.get || desc.set)) {
70
+ Object.defineProperty(newObj, key, desc);
71
+ } else {
72
+ newObj[key] = obj[key];
73
+ }
74
+ }
75
+ }
76
+ newObj.default = obj;
77
+ if (cache) {
78
+ cache.set(obj, newObj);
79
+ }
80
+ return newObj;
81
+ }
82
+ function license() {
83
+ return `/* ! tailwindcss v${_packagejson.default.version} | MIT License | https://tailwindcss.com */\n`;
84
+ }
85
+ async function lightningcss(result, { map =true , minify =true } = {}) {
86
+ try {
87
+ var _browserslist_findConfig;
88
+ var _result_opts_from;
89
+ let resolvedBrowsersListConfig = (_browserslist_findConfig = _browserslist.default.findConfig((_result_opts_from = result.opts.from) !== null && _result_opts_from !== void 0 ? _result_opts_from : process.cwd())) === null || _browserslist_findConfig === void 0 ? void 0 : _browserslist_findConfig.defaults;
90
+ let defaultBrowsersListConfig = _packagejson.default.browserslist;
91
+ let browsersListConfig = resolvedBrowsersListConfig !== null && resolvedBrowsersListConfig !== void 0 ? resolvedBrowsersListConfig : defaultBrowsersListConfig;
92
+ let transformed = _lightningcss.default.transform({
93
+ filename: result.opts.from || "input.css",
94
+ code: Buffer.from(result.css, "utf-8"),
95
+ minify,
96
+ sourceMap: result.map === undefined ? map : !!result.map,
97
+ inputSourceMap: result.map ? result.map.toString() : undefined,
98
+ targets: _lightningcss.default.browserslistToTargets((0, _browserslist.default)(browsersListConfig)),
99
+ drafts: {
100
+ nesting: true
101
+ },
102
+ include: _lightningcss.Features.Nesting,
103
+ exclude: _lightningcss.Features.LogicalProperties
104
+ });
105
+ return Object.assign(result, {
106
+ css: transformed.code.toString("utf8"),
107
+ map: result.map ? Object.assign(result.map, {
108
+ toString () {
109
+ var _transformed_map;
110
+ return (_transformed_map = transformed.map) === null || _transformed_map === void 0 ? void 0 : _transformed_map.toString();
111
+ }
112
+ }) : result.map
113
+ });
114
+ } catch (err) {
115
+ console.error("Unable to use Lightning CSS. Using raw version instead.");
116
+ console.error(err);
117
+ return result;
118
+ }
119
+ }
34
120
  /**
35
121
  *
36
122
  * @param {string} [customPostCssPath ]
@@ -54,7 +140,7 @@ function _interopRequireDefault(obj) {
54
140
  plugins: (0, _plugins.default)(config, file),
55
141
  options: (0, _options.default)(config, file)
56
142
  };
57
- })() : await (0, _postcssLoadConfig.default)();
143
+ })() : await (0, _postcssloadconfig.default)();
58
144
  let configPlugins = config.plugins;
59
145
  let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
60
146
  if (typeof plugin === "function" && plugin.name === "tailwindcss") {
@@ -73,48 +159,16 @@ function _interopRequireDefault(obj) {
73
159
  config.options
74
160
  ];
75
161
  }
76
- function loadBuiltinPostcssPlugins() {
77
- let postcss = (0, _deps.loadPostcss)();
78
- let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
79
- return [
80
- [
81
- (root)=>{
82
- root.walkAtRules("import", (rule)=>{
83
- if (rule.params.slice(1).startsWith("tailwindcss/")) {
84
- rule.after(postcss.comment({
85
- text: IMPORT_COMMENT + rule.params
86
- }));
87
- rule.remove();
88
- }
89
- });
90
- },
91
- (0, _deps.loadPostcssImport)(),
92
- (root)=>{
93
- root.walkComments((rule)=>{
94
- if (rule.text.startsWith(IMPORT_COMMENT)) {
95
- rule.after(postcss.atRule({
96
- name: "import",
97
- params: rule.text.replace(IMPORT_COMMENT, "")
98
- }));
99
- rule.remove();
100
- }
101
- });
102
- }
103
- ],
104
- [],
105
- {}
106
- ];
107
- }
108
162
  let state = {
109
163
  /** @type {any} */ context: null,
110
164
  /** @type {ReturnType<typeof createWatcher> | null} */ watcher: null,
111
165
  /** @type {{content: string, extension: string}[]} */ changedContent: [],
112
- configDependencies: new Set(),
166
+ /** @type {{config: import('../../../types').Config, dependencies: Set<string>, dispose: Function } | null} */ configBag: null,
113
167
  contextDependencies: new Set(),
114
168
  /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
115
169
  refreshContentPaths () {
116
170
  var _this_context;
117
- this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, (_this_context = this.context) === null || _this_context === void 0 ? void 0 : _this_context.tailwindConfig);
171
+ this.contentPaths = (0, _content.parseCandidateFiles)(this.context, (_this_context = this.context) === null || _this_context === void 0 ? void 0 : _this_context.tailwindConfig);
118
172
  },
119
173
  get config () {
120
174
  return this.context.tailwindConfig;
@@ -127,41 +181,39 @@ let state = {
127
181
  },
128
182
  loadConfig (configPath, content) {
129
183
  if (this.watcher && configPath) {
130
- this.refreshConfigDependencies(configPath);
184
+ this.refreshConfigDependencies();
131
185
  }
132
- let config = configPath ? require(configPath) : {};
133
- // @ts-ignore
134
- config = (0, _resolveConfigJs.default)(config, {
135
- content: {
136
- files: []
186
+ let config = (0, _loadconfig.loadConfig)(configPath);
187
+ let dependencies = (0, _getModuleDependencies.default)(configPath);
188
+ this.configBag = {
189
+ config,
190
+ dependencies,
191
+ dispose () {
192
+ for (let file of dependencies){
193
+ delete require.cache[require.resolve(file)];
194
+ }
137
195
  }
138
- });
196
+ };
197
+ this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config));
139
198
  // Override content files if `--content` has been passed explicitly
140
199
  if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
141
- config.content.files = content;
200
+ this.configBag.config.content.files = content;
142
201
  }
143
- return config;
202
+ return this.configBag.config;
144
203
  },
145
- refreshConfigDependencies (configPath) {
204
+ refreshConfigDependencies () {
205
+ var _this_configBag;
146
206
  _sharedState.env.DEBUG && console.time("Module dependencies");
147
- for (let file of this.configDependencies){
148
- delete require.cache[require.resolve(file)];
149
- }
150
- if (configPath) {
151
- let deps = (0, _getModuleDependenciesJs.default)(configPath).map(({ file })=>file);
152
- for (let dependency of deps){
153
- this.configDependencies.add(dependency);
154
- }
155
- }
207
+ (_this_configBag = this.configBag) === null || _this_configBag === void 0 ? void 0 : _this_configBag.dispose();
156
208
  _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
157
209
  },
158
210
  readContentPaths () {
159
211
  let content = [];
160
212
  // Resolve globs from the content config
161
213
  // TODO: When we make the postcss plugin async-capable this can become async
162
- let files = _fastGlob.default.sync(this.contentPatterns.all);
214
+ let files = _fastglob.default.sync(this.contentPatterns.all);
163
215
  for (let file of files){
164
- if (_sharedState.env.OXIDE) {
216
+ if ((0, _featureFlags.flagEnabled)(this.config, "oxideParser")) {
165
217
  content.push({
166
218
  file,
167
219
  extension: _path.default.extname(file).slice(1)
@@ -191,8 +243,8 @@ let state = {
191
243
  return this.context;
192
244
  }
193
245
  _sharedState.env.DEBUG && console.time("Searching for config");
194
- var _findAtConfigPath;
195
- let configPath = (_findAtConfigPath = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && _findAtConfigPath !== void 0 ? _findAtConfigPath : cliConfigPath;
246
+ var _findAtConfigPath1;
247
+ let configPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : cliConfigPath;
196
248
  _sharedState.env.DEBUG && console.timeEnd("Searching for config");
197
249
  _sharedState.env.DEBUG && console.time("Loading config");
198
250
  let config = this.loadConfig(configPath, content);
@@ -219,12 +271,16 @@ let state = {
219
271
  };
220
272
  async function createProcessor(args, cliConfigPath) {
221
273
  var _args_content;
222
- let postcss = (0, _deps.loadPostcss)();
223
274
  let input = args["--input"];
224
275
  let output = args["--output"];
225
276
  let includePostCss = args["--postcss"];
226
277
  let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
227
- let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : loadBuiltinPostcssPlugins();
278
+ let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : [
279
+ [],
280
+ [],
281
+ {}
282
+ ];
283
+ beforePlugins.unshift(...(0, _handleImportAtRules.handleImportAtRules)());
228
284
  if (args["--purge"]) {
229
285
  _log.default.warn("purge-flag-deprecated", [
230
286
  "The `--purge` flag has been deprecated.",
@@ -263,12 +319,10 @@ async function createProcessor(args, cliConfigPath) {
263
319
  ...beforePlugins,
264
320
  tailwindPlugin,
265
321
  !args["--minify"] && _utils.formatNodes,
266
- ...afterPlugins,
267
- !args["--no-autoprefixer"] && (0, _deps.loadAutoprefixer)(),
268
- args["--minify"] && (0, _deps.loadCssNano)()
322
+ ...afterPlugins
269
323
  ].filter(Boolean);
270
324
  /** @type {import('postcss').Processor} */ // @ts-ignore
271
- let processor = postcss(plugins);
325
+ let processor = (0, _postcss.default)(plugins);
272
326
  async function readInput() {
273
327
  // Piping in data, let's drain the stdin
274
328
  if (input === "-") {
@@ -283,10 +337,14 @@ async function createProcessor(args, cliConfigPath) {
283
337
  }
284
338
  async function build() {
285
339
  let start = process.hrtime.bigint();
286
- return readInput().then((css)=>processor.process(css, {
287
- ...postcssOptions,
288
- from: input,
289
- to: output
340
+ let options = {
341
+ ...postcssOptions,
342
+ from: input,
343
+ to: output
344
+ };
345
+ return readInput().then((css)=>processor.process(css, options)).then((result)=>lightningcss(result, {
346
+ ...options,
347
+ minify: !!args["--minify"]
290
348
  })).then((result)=>{
291
349
  if (!state.watcher) {
292
350
  return result;
@@ -305,11 +363,11 @@ async function createProcessor(args, cliConfigPath) {
305
363
  return result;
306
364
  }).then((result)=>{
307
365
  if (!output) {
308
- process.stdout.write(result.css);
366
+ process.stdout.write(license() + result.css);
309
367
  return;
310
368
  }
311
369
  return Promise.all([
312
- (0, _utils.outputFile)(result.opts.to, result.css),
370
+ (0, _utils.outputFile)(result.opts.to, license() + result.css),
313
371
  result.map && (0, _utils.outputFile)(result.opts.to + ".map", result.map.toString())
314
372
  ]);
315
373
  }).then(()=>{
@@ -326,7 +384,11 @@ async function createProcessor(args, cliConfigPath) {
326
384
  // If you fix it and then save the main CSS file so there's no error
327
385
  // The watcher will start watching the imported CSS files and will be
328
386
  // resilient to future errors.
329
- console.error(err);
387
+ if (state.watcher) {
388
+ console.error(err);
389
+ } else {
390
+ return Promise.reject(err);
391
+ }
330
392
  });
331
393
  }
332
394
  /**
@@ -343,13 +405,14 @@ async function createProcessor(args, cliConfigPath) {
343
405
  return {
344
406
  build,
345
407
  watch: async ()=>{
346
- state.watcher = (0, _watchingJs.createWatcher)(args, {
408
+ state.watcher = (0, _watching.createWatcher)(args, {
347
409
  state,
348
410
  /**
349
411
  * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
350
412
  */ async rebuild (changes) {
351
413
  let needsNewContext = changes.some((change)=>{
352
- return state.configDependencies.has(change.file) || state.contextDependencies.has(change.file);
414
+ var _state_configBag;
415
+ return ((_state_configBag = state.configBag) === null || _state_configBag === void 0 ? void 0 : _state_configBag.dependencies.has(change.file)) || state.contextDependencies.has(change.file);
353
416
  });
354
417
  if (needsNewContext) {
355
418
  state.context = null;
@@ -10,15 +10,25 @@ function _export(target, all) {
10
10
  });
11
11
  }
12
12
  _export(exports, {
13
- indentRecursive: ()=>indentRecursive,
14
- formatNodes: ()=>formatNodes,
15
- readFileWithRetries: ()=>readFileWithRetries,
16
- drainStdin: ()=>drainStdin,
17
- outputFile: ()=>outputFile
13
+ indentRecursive: function() {
14
+ return indentRecursive;
15
+ },
16
+ formatNodes: function() {
17
+ return formatNodes;
18
+ },
19
+ readFileWithRetries: function() {
20
+ return readFileWithRetries;
21
+ },
22
+ drainStdin: function() {
23
+ return drainStdin;
24
+ },
25
+ outputFile: function() {
26
+ return outputFile;
27
+ }
18
28
  });
19
- const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
20
- const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
21
- function _interopRequireDefault(obj) {
29
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
30
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
31
+ function _interop_require_default(obj) {
22
32
  return obj && obj.__esModule ? obj : {
23
33
  default: obj
24
34
  };
@@ -5,15 +5,17 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  Object.defineProperty(exports, "createWatcher", {
7
7
  enumerable: true,
8
- get: ()=>createWatcher
8
+ get: function() {
9
+ return createWatcher;
10
+ }
9
11
  });
10
- const _chokidar = /*#__PURE__*/ _interopRequireDefault(require("chokidar"));
11
- const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
12
- const _micromatch = /*#__PURE__*/ _interopRequireDefault(require("micromatch"));
13
- const _normalizePath = /*#__PURE__*/ _interopRequireDefault(require("normalize-path"));
14
- const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
15
- const _utilsJs = require("./utils.js");
16
- function _interopRequireDefault(obj) {
12
+ const _chokidar = /*#__PURE__*/ _interop_require_default(require("chokidar"));
13
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
14
+ const _micromatch = /*#__PURE__*/ _interop_require_default(require("micromatch"));
15
+ const _normalizepath = /*#__PURE__*/ _interop_require_default(require("normalize-path"));
16
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
17
+ const _utils = require("./utils.js");
18
+ function _interop_require_default(obj) {
17
19
  return obj && obj.__esModule ? obj : {
18
20
  default: obj
19
21
  };
@@ -64,7 +66,9 @@ function createWatcher(args, { state , rebuild }) {
64
66
  // Clear all pending rebuilds for the about-to-be-built files
65
67
  changes.forEach((change)=>pendingRebuilds.delete(change.file));
66
68
  // Resolve the promise even when the rebuild fails
67
- return rebuild(changes).then(()=>{}, ()=>{});
69
+ return rebuild(changes).then(()=>{}, (e)=>{
70
+ console.error(e.toString());
71
+ });
68
72
  }
69
73
  /**
70
74
  *
@@ -109,7 +113,7 @@ function createWatcher(args, { state , rebuild }) {
109
113
  // This can happen when a file is pseudo-atomically replaced (a copy is created, overwritten, the old one is unlinked, and the new one is renamed)
110
114
  // TODO: An an optimization we should allow removal when the config changes
111
115
  watcher.on("unlink", (file)=>{
112
- file = (0, _normalizePath.default)(file);
116
+ file = (0, _normalizepath.default)(file);
113
117
  // Only re-add the file if it's not covered by a dynamic pattern
114
118
  if (!_micromatch.default.some([
115
119
  file
@@ -148,7 +152,7 @@ function createWatcher(args, { state , rebuild }) {
148
152
  // We need to read the file as early as possible outside of the chain
149
153
  // because it may be gone by the time we get to it. doing the read
150
154
  // immediately increases the chance that the file is still there
151
- let content = await (0, _utilsJs.readFileWithRetries)(_path.default.resolve(filePath));
155
+ let content = await (0, _utils.readFileWithRetries)(_path.default.resolve(filePath));
152
156
  if (content === undefined) {
153
157
  return;
154
158
  }
@@ -171,7 +175,7 @@ function createWatcher(args, { state , rebuild }) {
171
175
  fswatcher: watcher,
172
176
  refreshWatchedFiles () {
173
177
  watcher.add(Array.from(state.contextDependencies));
174
- watcher.add(Array.from(state.configDependencies));
178
+ watcher.add(Array.from(state.configBag.dependencies));
175
179
  watcher.add(state.contentPatterns.all);
176
180
  }
177
181
  };
@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  Object.defineProperty(exports, "help", {
7
7
  enumerable: true,
8
- get: ()=>help
8
+ get: function() {
9
+ return help;
10
+ }
9
11
  });
10
- const _packageJson = /*#__PURE__*/ _interopRequireDefault(require("../../../package.json"));
11
- function _interopRequireDefault(obj) {
12
+ const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../../package.json"));
13
+ function _interop_require_default(obj) {
12
14
  return obj && obj.__esModule ? obj : {
13
15
  default: obj
14
16
  };
@@ -17,7 +19,7 @@ function help({ message , usage , commands , options }) {
17
19
  let indent = 2;
18
20
  // Render header
19
21
  console.log();
20
- console.log(`${_packageJson.default.name} v${_packageJson.default.version}`);
22
+ console.log(`${_packagejson.default.name} v${_packagejson.default.version}`);
21
23
  // Render message
22
24
  if (message) {
23
25
  console.log();
package/lib/cli/index.js CHANGED
@@ -3,34 +3,17 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
7
- const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
8
- const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
6
+ const _path = /*#__PURE__*/ _interop_require_default(require("path"));
7
+ const _arg = /*#__PURE__*/ _interop_require_default(require("arg"));
8
+ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
9
9
  const _build = require("./build");
10
10
  const _help = require("./help");
11
11
  const _init = require("./init");
12
- function _interopRequireDefault(obj) {
12
+ function _interop_require_default(obj) {
13
13
  return obj && obj.__esModule ? obj : {
14
14
  default: obj
15
15
  };
16
16
  }
17
- function isESM() {
18
- const pkgPath = _path.default.resolve("./package.json");
19
- try {
20
- let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
21
- return pkg.type && pkg.type === "module";
22
- } catch (err) {
23
- return false;
24
- }
25
- }
26
- let configs = isESM() ? {
27
- tailwind: "tailwind.config.cjs",
28
- postcss: "postcss.config.cjs"
29
- } : {
30
- tailwind: "tailwind.config.js",
31
- postcss: "postcss.config.js"
32
- };
33
- // ---
34
17
  function oneOf(...options) {
35
18
  return Object.assign((value = true)=>{
36
19
  for (let option of options){
@@ -48,13 +31,21 @@ let commands = {
48
31
  init: {
49
32
  run: _init.init,
50
33
  args: {
51
- "--full": {
34
+ "--esm": {
52
35
  type: Boolean,
53
- description: `Initialize a full \`${configs.tailwind}\` file`
36
+ description: `Initialize configuration file as ESM`
37
+ },
38
+ "--ts": {
39
+ type: Boolean,
40
+ description: `Initialize configuration file as TypeScript`
54
41
  },
55
42
  "--postcss": {
56
43
  type: Boolean,
57
- description: `Initialize a \`${configs.postcss}\` file`
44
+ description: `Initialize a \`postcss.config.js\` file`
45
+ },
46
+ "--full": {
47
+ type: Boolean,
48
+ description: `Include the default values for all options in the generated configuration file`
58
49
  },
59
50
  "-f": "--full",
60
51
  "-p": "--postcss"
@@ -100,6 +91,7 @@ let commands = {
100
91
  description: "Path to a custom config file"
101
92
  },
102
93
  "--no-autoprefixer": {
94
+ deprecated: true,
103
95
  type: Boolean,
104
96
  description: "Disable autoprefixer"
105
97
  },
@@ -236,4 +228,4 @@ if (args["--help"]) {
236
228
  });
237
229
  process.exit(0);
238
230
  }
239
- run(args, configs);
231
+ run(args);