tailwindcss 3.1.8 → 3.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +64 -3
- package/README.md +6 -5
- package/lib/cli/build/deps.js +54 -0
- package/lib/cli/build/index.js +44 -0
- package/lib/cli/build/plugin.js +351 -0
- package/lib/cli/build/utils.js +78 -0
- package/lib/cli/build/watching.js +113 -0
- package/lib/cli/help/index.js +71 -0
- package/lib/cli/index.js +18 -0
- package/lib/cli/init/index.js +46 -0
- package/lib/cli/shared.js +12 -0
- package/lib/cli.js +11 -590
- package/lib/corePlugins.js +332 -108
- package/lib/css/preflight.css +5 -0
- package/lib/featureFlags.js +7 -4
- package/lib/index.js +6 -1
- package/lib/lib/content.js +167 -0
- package/lib/lib/defaultExtractor.js +15 -10
- package/lib/lib/detectNesting.js +2 -2
- package/lib/lib/evaluateTailwindFunctions.js +17 -1
- package/lib/lib/expandApplyAtRules.js +66 -37
- package/lib/lib/expandTailwindAtRules.js +10 -42
- package/lib/lib/findAtConfigPath.js +44 -0
- package/lib/lib/generateRules.js +180 -93
- package/lib/lib/normalizeTailwindDirectives.js +1 -1
- package/lib/lib/offsets.js +217 -0
- package/lib/lib/regex.js +1 -1
- package/lib/lib/setupContextUtils.js +339 -100
- package/lib/lib/setupTrackingContext.js +5 -39
- package/lib/lib/sharedState.js +2 -0
- package/lib/public/colors.js +1 -1
- package/lib/util/buildMediaQuery.js +6 -3
- package/lib/util/configurePlugins.js +1 -1
- package/lib/util/dataTypes.js +15 -19
- package/lib/util/formatVariantSelector.js +92 -8
- package/lib/util/getAllConfigs.js +14 -3
- package/lib/util/isValidArbitraryValue.js +1 -1
- package/lib/util/nameClass.js +3 -0
- package/lib/util/negateValue.js +15 -2
- package/lib/util/normalizeConfig.js +17 -3
- package/lib/util/normalizeScreens.js +100 -3
- package/lib/util/parseAnimationValue.js +1 -1
- package/lib/util/parseBoxShadowValue.js +1 -1
- package/lib/util/parseDependency.js +33 -54
- package/lib/util/parseGlob.js +34 -0
- package/lib/util/parseObjectStyles.js +1 -1
- package/lib/util/pluginUtils.js +87 -17
- package/lib/util/resolveConfig.js +2 -2
- package/lib/util/splitAtTopLevelOnly.js +31 -81
- package/lib/util/transformThemeValue.js +9 -2
- package/lib/util/validateConfig.js +1 -1
- package/lib/util/validateFormalSyntax.js +24 -0
- package/package.json +14 -13
- package/peers/index.js +3263 -1887
- package/plugin.d.ts +3 -3
- package/scripts/release-channel.js +18 -0
- package/scripts/release-notes.js +21 -0
- package/src/cli/build/deps.js +56 -0
- package/src/cli/build/index.js +45 -0
- package/src/cli/build/plugin.js +417 -0
- package/src/cli/build/utils.js +76 -0
- package/src/cli/build/watching.js +134 -0
- package/src/cli/help/index.js +70 -0
- package/src/cli/index.js +3 -0
- package/src/cli/init/index.js +50 -0
- package/src/cli/shared.js +5 -0
- package/src/cli.js +4 -696
- package/src/corePlugins.js +262 -39
- package/src/css/preflight.css +5 -0
- package/src/featureFlags.js +12 -2
- package/src/index.js +5 -0
- package/src/lib/content.js +205 -0
- package/src/lib/defaultExtractor.js +3 -0
- package/src/lib/evaluateTailwindFunctions.js +22 -1
- package/src/lib/expandApplyAtRules.js +70 -29
- package/src/lib/expandTailwindAtRules.js +8 -46
- package/src/lib/findAtConfigPath.js +48 -0
- package/src/lib/generateRules.js +223 -101
- package/src/lib/offsets.js +270 -0
- package/src/lib/setupContextUtils.js +376 -89
- package/src/lib/setupTrackingContext.js +4 -45
- package/src/lib/sharedState.js +2 -0
- package/src/util/buildMediaQuery.js +5 -3
- package/src/util/dataTypes.js +15 -17
- package/src/util/formatVariantSelector.js +113 -9
- package/src/util/getAllConfigs.js +14 -2
- package/src/util/nameClass.js +4 -0
- package/src/util/negateValue.js +10 -2
- package/src/util/normalizeConfig.js +22 -2
- package/src/util/normalizeScreens.js +99 -4
- package/src/util/parseBoxShadowValue.js +1 -1
- package/src/util/parseDependency.js +37 -42
- package/src/util/parseGlob.js +24 -0
- package/src/util/pluginUtils.js +96 -14
- package/src/util/resolveConfig.js +1 -1
- package/src/util/splitAtTopLevelOnly.js +23 -49
- package/src/util/transformThemeValue.js +9 -1
- package/src/util/validateFormalSyntax.js +34 -0
- package/stubs/defaultConfig.stub.js +20 -3
- package/types/config.d.ts +48 -13
- package/types/generated/default-theme.d.ts +11 -0
package/CHANGELOG.md
CHANGED
|
@@ -9,6 +9,65 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
9
9
|
|
|
10
10
|
- Nothing yet!
|
|
11
11
|
|
|
12
|
+
## [3.2.1] - 2022-10-21
|
|
13
|
+
|
|
14
|
+
### Fixed
|
|
15
|
+
|
|
16
|
+
- Fix missing `supports` in types ([#9616](https://github.com/tailwindlabs/tailwindcss/pull/9616))
|
|
17
|
+
- Fix missing PostCSS dependencies in the CLI ([#9617](https://github.com/tailwindlabs/tailwindcss/pull/9617))
|
|
18
|
+
- Ensure `micromatch` is a proper CLI dependency ([#9620](https://github.com/tailwindlabs/tailwindcss/pull/9620))
|
|
19
|
+
- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551db0f2726461371b4f3c6cd4c7090888504](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
|
|
20
|
+
|
|
21
|
+
## [3.2.0] - 2022-10-19
|
|
22
|
+
|
|
23
|
+
### Added
|
|
24
|
+
|
|
25
|
+
- Add new `@config` directive ([#9405](https://github.com/tailwindlabs/tailwindcss/pull/9405))
|
|
26
|
+
- Add new `relative: true` option to resolve content paths relative to the config file ([#9396](https://github.com/tailwindlabs/tailwindcss/pull/9396))
|
|
27
|
+
- Add new `supports-*` variant ([#9453](https://github.com/tailwindlabs/tailwindcss/pull/9453))
|
|
28
|
+
- Add new `min-*` and `max-*` variants ([#9558](https://github.com/tailwindlabs/tailwindcss/pull/9558))
|
|
29
|
+
- Add new `aria-*` variants ([#9557](https://github.com/tailwindlabs/tailwindcss/pull/9557), [#9588](https://github.com/tailwindlabs/tailwindcss/pull/9588))
|
|
30
|
+
- Add new `data-*` variants ([#9559](https://github.com/tailwindlabs/tailwindcss/pull/9559), [#9588](https://github.com/tailwindlabs/tailwindcss/pull/9588))
|
|
31
|
+
- Add new `break-keep` utility for `word-break: keep-all` ([#9393](https://github.com/tailwindlabs/tailwindcss/pull/9393))
|
|
32
|
+
- Add new `collapse` utility for `visibility: collapse` ([#9181](https://github.com/tailwindlabs/tailwindcss/pull/9181))
|
|
33
|
+
- Add new `fill-none` utility for `fill: none` ([#9403](https://github.com/tailwindlabs/tailwindcss/pull/9403))
|
|
34
|
+
- Add new `stroke-none` utility for `stroke: none` ([#9403](https://github.com/tailwindlabs/tailwindcss/pull/9403))
|
|
35
|
+
- Add new `place-content-baseline` utility for `place-content: baseline` ([#9498](https://github.com/tailwindlabs/tailwindcss/pull/9498))
|
|
36
|
+
- Add new `place-items-baseline` utility for `place-items: baseline` ([#9507](https://github.com/tailwindlabs/tailwindcss/pull/9507))
|
|
37
|
+
- Add new `content-baseline` utility for `align-content: baseline` ([#9507](https://github.com/tailwindlabs/tailwindcss/pull/9507))
|
|
38
|
+
- Add support for configuring default `font-feature-settings` for a font family ([#9039](https://github.com/tailwindlabs/tailwindcss/pull/9039))
|
|
39
|
+
- Add standalone CLI build for 32-bit Linux on ARM (`node16-linux-armv7`) ([#9084](https://github.com/tailwindlabs/tailwindcss/pull/9084))
|
|
40
|
+
- Add future flag to disable color opacity utility plugins ([#9088](https://github.com/tailwindlabs/tailwindcss/pull/9088))
|
|
41
|
+
- Add negative value support for `outline-offset` ([#9136](https://github.com/tailwindlabs/tailwindcss/pull/9136))
|
|
42
|
+
- Add support for modifiers to `matchUtilities` ([#9541](https://github.com/tailwindlabs/tailwindcss/pull/9541))
|
|
43
|
+
- Allow negating utilities using `min`/`max`/`clamp` ([#9237](https://github.com/tailwindlabs/tailwindcss/pull/9237))
|
|
44
|
+
- Implement fallback plugins when there is ambiguity between plugins when using arbitrary values ([#9376](https://github.com/tailwindlabs/tailwindcss/pull/9376))
|
|
45
|
+
- Support `sort` function in `matchVariant` ([#9423](https://github.com/tailwindlabs/tailwindcss/pull/9423))
|
|
46
|
+
- Upgrade to `postcss-nested` v6.0 ([#9546](https://github.com/tailwindlabs/tailwindcss/pull/9546))
|
|
47
|
+
|
|
48
|
+
### Fixed
|
|
49
|
+
|
|
50
|
+
- Use absolute paths when resolving changed files for resilience against working directory changes ([#9032](https://github.com/tailwindlabs/tailwindcss/pull/9032))
|
|
51
|
+
- Fix ring color utility generation when using `respectDefaultRingColorOpacity` ([#9070](https://github.com/tailwindlabs/tailwindcss/pull/9070))
|
|
52
|
+
- Sort tags before classes when `@apply`-ing a selector with joined classes ([#9107](https://github.com/tailwindlabs/tailwindcss/pull/9107))
|
|
53
|
+
- Remove invalid `outline-hidden` utility ([#9147](https://github.com/tailwindlabs/tailwindcss/pull/9147))
|
|
54
|
+
- Honor the `hidden` attribute on elements in preflight ([#9174](https://github.com/tailwindlabs/tailwindcss/pull/9174))
|
|
55
|
+
- Don't stop watching atomically renamed files ([#9173](https://github.com/tailwindlabs/tailwindcss/pull/9173), [#9215](https://github.com/tailwindlabs/tailwindcss/pull/9215))
|
|
56
|
+
- Fix duplicate utilities issue causing memory leaks ([#9208](https://github.com/tailwindlabs/tailwindcss/pull/9208))
|
|
57
|
+
- Fix `fontFamily` config TypeScript types ([#9214](https://github.com/tailwindlabs/tailwindcss/pull/9214))
|
|
58
|
+
- Handle variants on complex selector utilities ([#9262](https://github.com/tailwindlabs/tailwindcss/pull/9262))
|
|
59
|
+
- Fix shared config mutation issue ([#9294](https://github.com/tailwindlabs/tailwindcss/pull/9294))
|
|
60
|
+
- Fix ordering of parallel variants ([#9282](https://github.com/tailwindlabs/tailwindcss/pull/9282))
|
|
61
|
+
- Handle variants in utility selectors using `:where()` and `:has()` ([#9309](https://github.com/tailwindlabs/tailwindcss/pull/9309))
|
|
62
|
+
- Improve data type analysis for arbitrary values ([#9320](https://github.com/tailwindlabs/tailwindcss/pull/9320))
|
|
63
|
+
- Don't emit generated utilities with invalid uses of theme functions ([#9319](https://github.com/tailwindlabs/tailwindcss/pull/9319))
|
|
64
|
+
- Revert change that only listened for stdin close on TTYs ([#9331](https://github.com/tailwindlabs/tailwindcss/pull/9331))
|
|
65
|
+
- Ignore unset values (like `null` or `undefined`) when resolving the classList for intellisense ([#9385](https://github.com/tailwindlabs/tailwindcss/pull/9385))
|
|
66
|
+
- Improve type checking for formal syntax ([#9349](https://github.com/tailwindlabs/tailwindcss/pull/9349), [#9448](https://github.com/tailwindlabs/tailwindcss/pull/9448))
|
|
67
|
+
- Fix incorrect required `content` key in custom plugin configs ([#9502](https://github.com/tailwindlabs/tailwindcss/pull/9502), [#9545](https://github.com/tailwindlabs/tailwindcss/pull/9545))
|
|
68
|
+
- Fix content path detection on Windows ([#9569](https://github.com/tailwindlabs/tailwindcss/pull/9569))
|
|
69
|
+
- Ensure `--content` is used in the CLI when passed ([#9587](https://github.com/tailwindlabs/tailwindcss/pull/9587))
|
|
70
|
+
|
|
12
71
|
## [3.1.8] - 2022-08-05
|
|
13
72
|
|
|
14
73
|
### Fixed
|
|
@@ -104,7 +163,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
104
163
|
- Move `important` selector to the front when `@apply`-ing selector-modifying variants in custom utilities ([#8313](https://github.com/tailwindlabs/tailwindcss/pull/8313))
|
|
105
164
|
- Error when registering an invalid custom variant ([#8345](https://github.com/tailwindlabs/tailwindcss/pull/8345))
|
|
106
165
|
- Create tailwind.config.cjs file in ESM package when running init ([#8363](https://github.com/tailwindlabs/tailwindcss/pull/8363))
|
|
107
|
-
- Fix `
|
|
166
|
+
- Fix `matchVariant` that use at-rules and placeholders ([#8392](https://github.com/tailwindlabs/tailwindcss/pull/8392))
|
|
108
167
|
- Improve types of the `tailwindcss/plugin` ([#8400](https://github.com/tailwindlabs/tailwindcss/pull/8400))
|
|
109
168
|
- Allow returning parallel variants from `addVariant` or `matchVariant` callback functions ([#8455](https://github.com/tailwindlabs/tailwindcss/pull/8455))
|
|
110
169
|
- Try using local `postcss` installation first in the CLI ([#8270](https://github.com/tailwindlabs/tailwindcss/pull/8270))
|
|
@@ -457,7 +516,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
457
516
|
|
|
458
517
|
### Fixed
|
|
459
518
|
|
|
460
|
-
- Ensure `corePlugins` order is
|
|
519
|
+
- Ensure `corePlugins` order is consistent in AOT mode ([#5928](https://github.com/tailwindlabs/tailwindcss/pull/5928))
|
|
461
520
|
|
|
462
521
|
## [2.2.18] - 2021-10-29
|
|
463
522
|
|
|
@@ -2029,7 +2088,9 @@ No release notes
|
|
|
2029
2088
|
|
|
2030
2089
|
- Everything!
|
|
2031
2090
|
|
|
2032
|
-
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1
|
|
2091
|
+
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.1...HEAD
|
|
2092
|
+
[3.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.0...v3.2.1
|
|
2093
|
+
[3.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...v3.2.0
|
|
2033
2094
|
[3.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...v3.1.8
|
|
2034
2095
|
[3.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...v3.1.7
|
|
2035
2096
|
[3.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...v3.1.6
|
package/README.md
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
<p align="center">
|
|
2
|
-
<a href="https://tailwindcss.com
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
<a href="https://tailwindcss.com" target="_blank">
|
|
3
|
+
<picture>
|
|
4
|
+
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-dark.svg">
|
|
5
|
+
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg">
|
|
6
|
+
<img alt="Tailwind CSS" src="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
|
|
7
|
+
</picture>
|
|
7
8
|
</a>
|
|
8
9
|
</p>
|
|
9
10
|
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
"use strict";
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
function _export(target, all) {
|
|
7
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: all[name]
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
_export(exports, {
|
|
13
|
+
loadPostcss: ()=>loadPostcss,
|
|
14
|
+
loadPostcssImport: ()=>loadPostcssImport,
|
|
15
|
+
loadCssNano: ()=>loadCssNano,
|
|
16
|
+
loadAutoprefixer: ()=>loadAutoprefixer
|
|
17
|
+
});
|
|
18
|
+
const _indexJs = require("../../../peers/index.js");
|
|
19
|
+
function loadPostcss() {
|
|
20
|
+
// Try to load a local `postcss` version first
|
|
21
|
+
try {
|
|
22
|
+
return require("postcss");
|
|
23
|
+
} catch {}
|
|
24
|
+
return (0, _indexJs.lazyPostcss)();
|
|
25
|
+
}
|
|
26
|
+
function loadPostcssImport() {
|
|
27
|
+
// Try to load a local `postcss-import` version first
|
|
28
|
+
try {
|
|
29
|
+
return require("postcss-import");
|
|
30
|
+
} catch {}
|
|
31
|
+
return (0, _indexJs.lazyPostcssImport)();
|
|
32
|
+
}
|
|
33
|
+
function loadCssNano() {
|
|
34
|
+
let options = {
|
|
35
|
+
preset: [
|
|
36
|
+
"default",
|
|
37
|
+
{
|
|
38
|
+
cssDeclarationSorter: false
|
|
39
|
+
}
|
|
40
|
+
]
|
|
41
|
+
};
|
|
42
|
+
// Try to load a local `cssnano` version first
|
|
43
|
+
try {
|
|
44
|
+
return require("cssnano");
|
|
45
|
+
} catch {}
|
|
46
|
+
return (0, _indexJs.lazyCssnano)()(options);
|
|
47
|
+
}
|
|
48
|
+
function loadAutoprefixer() {
|
|
49
|
+
// Try to load a local `autoprefixer` version first
|
|
50
|
+
try {
|
|
51
|
+
return require("autoprefixer");
|
|
52
|
+
} catch {}
|
|
53
|
+
return (0, _indexJs.lazyAutoprefixer)();
|
|
54
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
"use strict";
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "build", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: ()=>build
|
|
9
|
+
});
|
|
10
|
+
const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
|
|
11
|
+
const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
|
|
12
|
+
const _pluginJs = require("./plugin.js");
|
|
13
|
+
function _interopRequireDefault(obj) {
|
|
14
|
+
return obj && obj.__esModule ? obj : {
|
|
15
|
+
default: obj
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
async function build(args, configs) {
|
|
19
|
+
let input = args["--input"];
|
|
20
|
+
let shouldWatch = args["--watch"];
|
|
21
|
+
// TODO: Deprecate this in future versions
|
|
22
|
+
if (!input && args["_"][1]) {
|
|
23
|
+
console.error("[deprecation] Running tailwindcss without -i, please provide an input file.");
|
|
24
|
+
input = args["--input"] = args["_"][1];
|
|
25
|
+
}
|
|
26
|
+
if (input && input !== "-" && !_fs.default.existsSync(input = _path.default.resolve(input))) {
|
|
27
|
+
console.error(`Specified input file ${args["--input"]} does not exist.`);
|
|
28
|
+
process.exit(9);
|
|
29
|
+
}
|
|
30
|
+
if (args["--config"] && !_fs.default.existsSync(args["--config"] = _path.default.resolve(args["--config"]))) {
|
|
31
|
+
console.error(`Specified config file ${args["--config"]} does not exist.`);
|
|
32
|
+
process.exit(9);
|
|
33
|
+
}
|
|
34
|
+
// 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);
|
|
37
|
+
if (shouldWatch) {
|
|
38
|
+
/* Abort the watcher if stdin is closed to avoid zombie processes */ process.stdin.on("end", ()=>process.exit(0));
|
|
39
|
+
process.stdin.resume();
|
|
40
|
+
await processor.watch();
|
|
41
|
+
} else {
|
|
42
|
+
await processor.build();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -0,0 +1,351 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
"use strict";
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "createProcessor", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: ()=>createProcessor
|
|
9
|
+
});
|
|
10
|
+
const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
|
|
11
|
+
const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
|
|
12
|
+
const _postcssLoadConfig = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config"));
|
|
13
|
+
const _lilconfig = require("lilconfig");
|
|
14
|
+
const _plugins = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
|
|
15
|
+
));
|
|
16
|
+
const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
|
|
17
|
+
));
|
|
18
|
+
const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("../../processTailwindFeatures"));
|
|
19
|
+
const _deps = require("./deps");
|
|
20
|
+
const _utils = require("./utils");
|
|
21
|
+
const _shared = require("../shared");
|
|
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) {
|
|
30
|
+
return obj && obj.__esModule ? obj : {
|
|
31
|
+
default: obj
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
*
|
|
36
|
+
* @param {string} [customPostCssPath ]
|
|
37
|
+
* @returns
|
|
38
|
+
*/ async function loadPostCssPlugins(customPostCssPath) {
|
|
39
|
+
let config = customPostCssPath ? await (async ()=>{
|
|
40
|
+
let file = _path.default.resolve(customPostCssPath);
|
|
41
|
+
// Implementation, see: https://unpkg.com/browse/postcss-load-config@3.1.0/src/index.js
|
|
42
|
+
// @ts-ignore
|
|
43
|
+
let { config ={} } = await (0, _lilconfig.lilconfig)("postcss").load(file);
|
|
44
|
+
if (typeof config === "function") {
|
|
45
|
+
config = config();
|
|
46
|
+
} else {
|
|
47
|
+
config = Object.assign({}, config);
|
|
48
|
+
}
|
|
49
|
+
if (!config.plugins) {
|
|
50
|
+
config.plugins = [];
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
file,
|
|
54
|
+
plugins: (0, _plugins.default)(config, file),
|
|
55
|
+
options: (0, _options.default)(config, file)
|
|
56
|
+
};
|
|
57
|
+
})() : await (0, _postcssLoadConfig.default)();
|
|
58
|
+
let configPlugins = config.plugins;
|
|
59
|
+
let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
|
|
60
|
+
if (typeof plugin === "function" && plugin.name === "tailwindcss") {
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
if (typeof plugin === "object" && plugin !== null && plugin.postcssPlugin === "tailwindcss") {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
return false;
|
|
67
|
+
});
|
|
68
|
+
let beforePlugins = configPluginTailwindIdx === -1 ? [] : configPlugins.slice(0, configPluginTailwindIdx);
|
|
69
|
+
let afterPlugins = configPluginTailwindIdx === -1 ? configPlugins : configPlugins.slice(configPluginTailwindIdx + 1);
|
|
70
|
+
return [
|
|
71
|
+
beforePlugins,
|
|
72
|
+
afterPlugins,
|
|
73
|
+
config.options
|
|
74
|
+
];
|
|
75
|
+
}
|
|
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
|
+
let state = {
|
|
109
|
+
/** @type {any} */ context: null,
|
|
110
|
+
/** @type {ReturnType<typeof createWatcher> | null} */ watcher: null,
|
|
111
|
+
/** @type {{content: string, extension: string}[]} */ changedContent: [],
|
|
112
|
+
configDependencies: new Set(),
|
|
113
|
+
contextDependencies: new Set(),
|
|
114
|
+
/** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
|
|
115
|
+
refreshContentPaths () {
|
|
116
|
+
var ref;
|
|
117
|
+
this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, (ref = this.context) === null || ref === void 0 ? void 0 : ref.tailwindConfig);
|
|
118
|
+
},
|
|
119
|
+
get config () {
|
|
120
|
+
return this.context.tailwindConfig;
|
|
121
|
+
},
|
|
122
|
+
get contentPatterns () {
|
|
123
|
+
return {
|
|
124
|
+
all: this.contentPaths.map((contentPath)=>contentPath.pattern),
|
|
125
|
+
dynamic: this.contentPaths.filter((contentPath)=>contentPath.glob !== undefined).map((contentPath)=>contentPath.pattern)
|
|
126
|
+
};
|
|
127
|
+
},
|
|
128
|
+
loadConfig (configPath, content) {
|
|
129
|
+
if (this.watcher && configPath) {
|
|
130
|
+
this.refreshConfigDependencies(configPath);
|
|
131
|
+
}
|
|
132
|
+
let config = configPath ? require(configPath) : {};
|
|
133
|
+
// @ts-ignore
|
|
134
|
+
config = (0, _resolveConfigJs.default)(config, {
|
|
135
|
+
content: {
|
|
136
|
+
files: []
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
// Override content files if `--content` has been passed explicitly
|
|
140
|
+
if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
|
|
141
|
+
config.content.files = content;
|
|
142
|
+
}
|
|
143
|
+
return config;
|
|
144
|
+
},
|
|
145
|
+
refreshConfigDependencies (configPath) {
|
|
146
|
+
_shared.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
|
+
}
|
|
156
|
+
_shared.env.DEBUG && console.timeEnd("Module dependencies");
|
|
157
|
+
},
|
|
158
|
+
readContentPaths () {
|
|
159
|
+
let content = [];
|
|
160
|
+
// Resolve globs from the content config
|
|
161
|
+
// TODO: When we make the postcss plugin async-capable this can become async
|
|
162
|
+
let files = _fastGlob.default.sync(this.contentPatterns.all);
|
|
163
|
+
for (let file of files){
|
|
164
|
+
content.push({
|
|
165
|
+
content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
|
|
166
|
+
extension: _path.default.extname(file).slice(1)
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
// Resolve raw content in the tailwind config
|
|
170
|
+
let rawContent = this.config.content.files.filter((file)=>{
|
|
171
|
+
return file !== null && typeof file === "object";
|
|
172
|
+
});
|
|
173
|
+
for (let { raw: content1 , extension ="html" } of rawContent){
|
|
174
|
+
content1.push({
|
|
175
|
+
content: content1,
|
|
176
|
+
extension
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
return content;
|
|
180
|
+
},
|
|
181
|
+
getContext ({ createContext , cliConfigPath , root , result , content }) {
|
|
182
|
+
if (this.context) {
|
|
183
|
+
this.context.changedContent = this.changedContent.splice(0);
|
|
184
|
+
return this.context;
|
|
185
|
+
}
|
|
186
|
+
_shared.env.DEBUG && console.time("Searching for config");
|
|
187
|
+
var ref;
|
|
188
|
+
let configPath = (ref = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && ref !== void 0 ? ref : cliConfigPath;
|
|
189
|
+
_shared.env.DEBUG && console.timeEnd("Searching for config");
|
|
190
|
+
_shared.env.DEBUG && console.time("Loading config");
|
|
191
|
+
let config = this.loadConfig(configPath, content);
|
|
192
|
+
_shared.env.DEBUG && console.timeEnd("Loading config");
|
|
193
|
+
_shared.env.DEBUG && console.time("Creating context");
|
|
194
|
+
this.context = createContext(config, []);
|
|
195
|
+
Object.assign(this.context, {
|
|
196
|
+
userConfigPath: configPath
|
|
197
|
+
});
|
|
198
|
+
_shared.env.DEBUG && console.timeEnd("Creating context");
|
|
199
|
+
_shared.env.DEBUG && console.time("Resolving content paths");
|
|
200
|
+
this.refreshContentPaths();
|
|
201
|
+
_shared.env.DEBUG && console.timeEnd("Resolving content paths");
|
|
202
|
+
if (this.watcher) {
|
|
203
|
+
_shared.env.DEBUG && console.time("Watch new files");
|
|
204
|
+
this.watcher.refreshWatchedFiles();
|
|
205
|
+
_shared.env.DEBUG && console.timeEnd("Watch new files");
|
|
206
|
+
}
|
|
207
|
+
_shared.env.DEBUG && console.time("Reading content files");
|
|
208
|
+
for (let file of this.readContentPaths()){
|
|
209
|
+
this.context.changedContent.push(file);
|
|
210
|
+
}
|
|
211
|
+
_shared.env.DEBUG && console.timeEnd("Reading content files");
|
|
212
|
+
return this.context;
|
|
213
|
+
}
|
|
214
|
+
};
|
|
215
|
+
async function createProcessor(args, cliConfigPath) {
|
|
216
|
+
var ref;
|
|
217
|
+
let postcss = (0, _deps.loadPostcss)();
|
|
218
|
+
let input = args["--input"];
|
|
219
|
+
let output = args["--output"];
|
|
220
|
+
let includePostCss = args["--postcss"];
|
|
221
|
+
let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
|
|
222
|
+
let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : loadBuiltinPostcssPlugins();
|
|
223
|
+
if (args["--purge"]) {
|
|
224
|
+
_log.default.warn("purge-flag-deprecated", [
|
|
225
|
+
"The `--purge` flag has been deprecated.",
|
|
226
|
+
"Please use `--content` instead."
|
|
227
|
+
]);
|
|
228
|
+
if (!args["--content"]) {
|
|
229
|
+
args["--content"] = args["--purge"];
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
var ref1;
|
|
233
|
+
let content = (ref1 = (ref = args["--content"]) === null || ref === void 0 ? void 0 : ref.split(/(?<!{[^}]+),/)) !== null && ref1 !== void 0 ? ref1 : [];
|
|
234
|
+
let tailwindPlugin = ()=>{
|
|
235
|
+
return {
|
|
236
|
+
postcssPlugin: "tailwindcss",
|
|
237
|
+
Once (root, { result }) {
|
|
238
|
+
_shared.env.DEBUG && console.time("Compiling CSS");
|
|
239
|
+
(0, _processTailwindFeatures.default)(({ createContext })=>{
|
|
240
|
+
console.error();
|
|
241
|
+
console.error("Rebuilding...");
|
|
242
|
+
return ()=>{
|
|
243
|
+
return state.getContext({
|
|
244
|
+
createContext,
|
|
245
|
+
cliConfigPath,
|
|
246
|
+
root,
|
|
247
|
+
result,
|
|
248
|
+
content
|
|
249
|
+
});
|
|
250
|
+
};
|
|
251
|
+
})(root, result);
|
|
252
|
+
_shared.env.DEBUG && console.timeEnd("Compiling CSS");
|
|
253
|
+
}
|
|
254
|
+
};
|
|
255
|
+
};
|
|
256
|
+
tailwindPlugin.postcss = true;
|
|
257
|
+
let plugins = [
|
|
258
|
+
...beforePlugins,
|
|
259
|
+
tailwindPlugin,
|
|
260
|
+
!args["--minify"] && _utils.formatNodes,
|
|
261
|
+
...afterPlugins,
|
|
262
|
+
!args["--no-autoprefixer"] && (0, _deps.loadAutoprefixer)(),
|
|
263
|
+
args["--minify"] && (0, _deps.loadCssNano)()
|
|
264
|
+
].filter(Boolean);
|
|
265
|
+
/** @type {import('postcss').Processor} */ // @ts-ignore
|
|
266
|
+
let processor = postcss(plugins);
|
|
267
|
+
async function readInput() {
|
|
268
|
+
// Piping in data, let's drain the stdin
|
|
269
|
+
if (input === "-") {
|
|
270
|
+
return (0, _utils.drainStdin)();
|
|
271
|
+
}
|
|
272
|
+
// Input file has been provided
|
|
273
|
+
if (input) {
|
|
274
|
+
return _fs.default.promises.readFile(_path.default.resolve(input), "utf8");
|
|
275
|
+
}
|
|
276
|
+
// No input file provided, fallback to default atrules
|
|
277
|
+
return "@tailwind base; @tailwind components; @tailwind utilities";
|
|
278
|
+
}
|
|
279
|
+
async function build() {
|
|
280
|
+
let start = process.hrtime.bigint();
|
|
281
|
+
return readInput().then((css)=>processor.process(css, {
|
|
282
|
+
...postcssOptions,
|
|
283
|
+
from: input,
|
|
284
|
+
to: output
|
|
285
|
+
})).then((result)=>{
|
|
286
|
+
if (!state.watcher) {
|
|
287
|
+
return result;
|
|
288
|
+
}
|
|
289
|
+
_shared.env.DEBUG && console.time("Recording PostCSS dependencies");
|
|
290
|
+
for (let message of result.messages){
|
|
291
|
+
if (message.type === "dependency") {
|
|
292
|
+
state.contextDependencies.add(message.file);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
_shared.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
|
|
296
|
+
// TODO: This needs to be in a different spot
|
|
297
|
+
_shared.env.DEBUG && console.time("Watch new files");
|
|
298
|
+
state.watcher.refreshWatchedFiles();
|
|
299
|
+
_shared.env.DEBUG && console.timeEnd("Watch new files");
|
|
300
|
+
return result;
|
|
301
|
+
}).then((result)=>{
|
|
302
|
+
if (!output) {
|
|
303
|
+
process.stdout.write(result.css);
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
return Promise.all([
|
|
307
|
+
(0, _utils.outputFile)(output, result.css),
|
|
308
|
+
result.map && (0, _utils.outputFile)(output + ".map", result.map.toString())
|
|
309
|
+
]);
|
|
310
|
+
}).then(()=>{
|
|
311
|
+
let end = process.hrtime.bigint();
|
|
312
|
+
console.error();
|
|
313
|
+
console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
|
|
314
|
+
});
|
|
315
|
+
}
|
|
316
|
+
/**
|
|
317
|
+
* @param {{file: string, content(): Promise<string>, extension: string}[]} changes
|
|
318
|
+
*/ async function parseChanges(changes) {
|
|
319
|
+
return Promise.all(changes.map(async (change)=>({
|
|
320
|
+
content: await change.content(),
|
|
321
|
+
extension: change.extension
|
|
322
|
+
})));
|
|
323
|
+
}
|
|
324
|
+
if (input !== undefined && input !== "-") {
|
|
325
|
+
state.contextDependencies.add(_path.default.resolve(input));
|
|
326
|
+
}
|
|
327
|
+
return {
|
|
328
|
+
build,
|
|
329
|
+
watch: async ()=>{
|
|
330
|
+
state.watcher = (0, _watchingJs.createWatcher)(args, {
|
|
331
|
+
state,
|
|
332
|
+
/**
|
|
333
|
+
* @param {{file: string, content(): Promise<string>, extension: string}[]} changes
|
|
334
|
+
*/ async rebuild (changes) {
|
|
335
|
+
let needsNewContext = changes.some((change)=>{
|
|
336
|
+
return state.configDependencies.has(change.file) || state.contextDependencies.has(change.file);
|
|
337
|
+
});
|
|
338
|
+
if (needsNewContext) {
|
|
339
|
+
state.context = null;
|
|
340
|
+
} else {
|
|
341
|
+
for (let change of (await parseChanges(changes))){
|
|
342
|
+
state.changedContent.push(change);
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
return build();
|
|
346
|
+
}
|
|
347
|
+
});
|
|
348
|
+
await build();
|
|
349
|
+
}
|
|
350
|
+
};
|
|
351
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
"use strict";
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
function _export(target, all) {
|
|
7
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: all[name]
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
_export(exports, {
|
|
13
|
+
indentRecursive: ()=>indentRecursive,
|
|
14
|
+
formatNodes: ()=>formatNodes,
|
|
15
|
+
readFileWithRetries: ()=>readFileWithRetries,
|
|
16
|
+
drainStdin: ()=>drainStdin,
|
|
17
|
+
outputFile: ()=>outputFile
|
|
18
|
+
});
|
|
19
|
+
const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
|
|
20
|
+
const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
|
|
21
|
+
function _interopRequireDefault(obj) {
|
|
22
|
+
return obj && obj.__esModule ? obj : {
|
|
23
|
+
default: obj
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
function indentRecursive(node, indent = 0) {
|
|
27
|
+
node.each && node.each((child, i)=>{
|
|
28
|
+
if (!child.raws.before || !child.raws.before.trim() || child.raws.before.includes("\n")) {
|
|
29
|
+
child.raws.before = `\n${node.type !== "rule" && i > 0 ? "\n" : ""}${" ".repeat(indent)}`;
|
|
30
|
+
}
|
|
31
|
+
child.raws.after = `\n${" ".repeat(indent)}`;
|
|
32
|
+
indentRecursive(child, indent + 1);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
function formatNodes(root) {
|
|
36
|
+
indentRecursive(root);
|
|
37
|
+
if (root.first) {
|
|
38
|
+
root.first.raws.before = "";
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
async function readFileWithRetries(path, tries = 5) {
|
|
42
|
+
for(let n = 0; n <= tries; n++){
|
|
43
|
+
try {
|
|
44
|
+
return await _fs.default.promises.readFile(path, "utf8");
|
|
45
|
+
} catch (err) {
|
|
46
|
+
if (n !== tries) {
|
|
47
|
+
if (err.code === "ENOENT" || err.code === "EBUSY") {
|
|
48
|
+
await new Promise((resolve)=>setTimeout(resolve, 10));
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
throw err;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function drainStdin() {
|
|
57
|
+
return new Promise((resolve, reject)=>{
|
|
58
|
+
let result = "";
|
|
59
|
+
process.stdin.on("data", (chunk)=>{
|
|
60
|
+
result += chunk;
|
|
61
|
+
});
|
|
62
|
+
process.stdin.on("end", ()=>resolve(result));
|
|
63
|
+
process.stdin.on("error", (err)=>reject(err));
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
async function outputFile(file, newContents) {
|
|
67
|
+
try {
|
|
68
|
+
let currentContents = await _fs.default.promises.readFile(file, "utf8");
|
|
69
|
+
if (currentContents === newContents) {
|
|
70
|
+
return; // Skip writing the file
|
|
71
|
+
}
|
|
72
|
+
} catch {}
|
|
73
|
+
// Write the file
|
|
74
|
+
await _fs.default.promises.mkdir(_path.default.dirname(file), {
|
|
75
|
+
recursive: true
|
|
76
|
+
});
|
|
77
|
+
await _fs.default.promises.writeFile(file, newContents, "utf8");
|
|
78
|
+
}
|