tailwindcss 3.3.0 → 3.3.2
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 +28 -1
- package/lib/cli/build/deps.js +17 -9
- package/lib/cli/build/index.js +10 -8
- package/lib/cli/build/plugin.js +27 -25
- package/lib/cli/build/utils.js +18 -8
- package/lib/cli/build/watching.js +12 -10
- package/lib/cli/help/index.js +6 -4
- package/lib/cli/index.js +4 -4
- package/lib/cli/init/index.js +8 -6
- package/lib/cli-peer-dependencies.js +12 -4
- package/lib/cli.js +1 -1
- package/lib/corePluginList.js +3 -1
- package/lib/corePlugins.js +41 -35
- package/lib/featureFlags.js +14 -9
- package/lib/index.js +1 -5
- package/lib/lib/cacheInvalidation.js +7 -5
- package/lib/lib/collapseAdjacentRules.js +3 -1
- package/lib/lib/collapseDuplicateDeclarations.js +10 -8
- package/lib/lib/content.js +18 -14
- package/lib/lib/defaultExtractor.js +6 -4
- package/lib/lib/detectNesting.js +3 -1
- package/lib/lib/evaluateTailwindFunctions.js +18 -16
- package/lib/lib/expandApplyAtRules.js +39 -32
- package/lib/lib/expandTailwindAtRules.js +15 -13
- package/lib/lib/findAtConfigPath.js +6 -4
- package/lib/lib/generateRules.js +37 -31
- package/lib/lib/getModuleDependencies.js +10 -8
- package/lib/lib/load-config.js +14 -8
- package/lib/lib/normalizeTailwindDirectives.js +5 -3
- package/lib/lib/offsets.js +7 -5
- package/lib/lib/partitionApplyAtRules.js +3 -1
- package/lib/lib/regex.js +21 -7
- package/lib/lib/remap-bitfield.js +3 -1
- package/lib/lib/resolveDefaultsAtRules.js +24 -20
- package/lib/lib/setupContextUtils.js +67 -57
- package/lib/lib/setupTrackingContext.js +26 -24
- package/lib/lib/sharedState.js +32 -23
- package/lib/lib/substituteScreenAtRules.js +5 -3
- package/lib/oxide/cli/build/deps.js +16 -8
- package/lib/oxide/cli/build/index.js +6 -4
- package/lib/oxide/cli/build/plugin.js +19 -17
- package/lib/oxide/cli/build/utils.js +18 -8
- package/lib/oxide/cli/build/watching.js +10 -8
- package/lib/oxide/cli/help/index.js +6 -4
- package/lib/oxide/cli/index.js +4 -4
- package/lib/oxide/cli/init/index.js +6 -4
- package/lib/plugin.js +7 -7
- package/lib/postcss-plugins/nesting/index.js +3 -1
- package/lib/postcss-plugins/nesting/plugin.js +8 -6
- package/lib/processTailwindFeatures.js +14 -12
- package/lib/public/colors.js +5 -3
- package/lib/public/create-plugin.js +5 -3
- package/lib/public/default-config.js +6 -4
- package/lib/public/default-theme.js +6 -4
- package/lib/public/load-config.js +5 -3
- package/lib/public/resolve-config.js +6 -4
- package/lib/util/applyImportantSelector.js +27 -13
- package/lib/util/bigSign.js +3 -1
- package/lib/util/buildMediaQuery.js +3 -1
- package/lib/util/cloneDeep.js +3 -1
- package/lib/util/cloneNodes.js +3 -1
- package/lib/util/color.js +10 -6
- package/lib/util/colorNames.js +752 -0
- package/lib/util/configurePlugins.js +3 -1
- package/lib/util/createPlugin.js +3 -1
- package/lib/util/createUtilityPlugin.js +5 -3
- package/lib/util/dataTypes.js +45 -15
- package/lib/util/defaults.js +6 -4
- package/lib/util/escapeClassName.js +7 -5
- package/lib/util/escapeCommas.js +3 -1
- package/lib/util/flattenColorPalette.js +3 -1
- package/lib/util/formatVariantSelector.js +28 -106
- package/lib/util/getAllConfigs.js +6 -4
- package/lib/util/hashConfig.js +6 -4
- package/lib/util/isKeyframeRule.js +3 -1
- package/lib/util/isPlainObject.js +3 -1
- package/lib/util/isSyntacticallyValidPropertyValue.js +3 -1
- package/lib/util/log.js +8 -4
- package/lib/util/nameClass.js +12 -6
- package/lib/util/negateValue.js +3 -1
- package/lib/util/normalizeConfig.js +7 -19
- package/lib/util/normalizeScreens.js +12 -4
- package/lib/util/parseAnimationValue.js +3 -1
- package/lib/util/parseBoxShadowValue.js +6 -2
- package/lib/util/parseDependency.js +3 -1
- package/lib/util/parseGlob.js +6 -4
- package/lib/util/parseObjectStyles.js +9 -7
- package/lib/util/pluginUtils.js +30 -18
- package/lib/util/prefixSelector.js +6 -4
- package/lib/util/pseudoElements.js +225 -0
- package/lib/util/removeAlphaVariables.js +3 -1
- package/lib/util/resolveConfig.js +10 -8
- package/lib/util/resolveConfigPath.js +9 -5
- package/lib/util/responsive.js +6 -4
- package/lib/util/splitAtTopLevelOnly.js +3 -1
- package/lib/util/tap.js +3 -1
- package/lib/util/toColorValue.js +3 -1
- package/lib/util/toPath.js +3 -1
- package/lib/util/transformThemeValue.js +6 -4
- package/lib/util/validateConfig.js +16 -3
- package/lib/util/validateFormalSyntax.js +3 -1
- package/lib/util/withAlphaVariable.js +6 -2
- package/package.json +30 -34
- package/peers/index.js +65828 -48819
- package/src/cli/build/plugin.js +1 -1
- package/src/cli.js +1 -1
- package/src/corePlugins.js +16 -17
- package/src/featureFlags.js +2 -3
- package/src/index.js +1 -5
- package/src/lib/defaultExtractor.js +1 -1
- package/src/lib/expandApplyAtRules.js +6 -0
- package/src/lib/expandTailwindAtRules.js +3 -3
- package/src/lib/load-config.ts +9 -5
- package/src/lib/setupTrackingContext.js +1 -1
- package/src/lib/sharedState.js +13 -19
- package/src/oxide/cli/build/plugin.ts +1 -1
- package/src/plugin.js +1 -1
- package/src/util/applyImportantSelector.js +20 -12
- package/src/util/color.js +1 -1
- package/src/util/colorNames.js +150 -0
- package/src/util/formatVariantSelector.js +2 -98
- package/src/util/normalizeConfig.js +0 -17
- package/src/util/pluginUtils.js +1 -5
- package/src/util/pseudoElements.js +170 -0
- package/src/util/validateConfig.js +13 -0
- package/types/config.d.ts +1 -6
|
@@ -9,36 +9,46 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
isValidVariantFormatString: ()
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
isValidVariantFormatString: function() {
|
|
13
|
+
return isValidVariantFormatString;
|
|
14
|
+
},
|
|
15
|
+
parseVariant: function() {
|
|
16
|
+
return parseVariant;
|
|
17
|
+
},
|
|
18
|
+
getFileModifiedMap: function() {
|
|
19
|
+
return getFileModifiedMap;
|
|
20
|
+
},
|
|
21
|
+
createContext: function() {
|
|
22
|
+
return createContext;
|
|
23
|
+
},
|
|
24
|
+
getContext: function() {
|
|
25
|
+
return getContext;
|
|
26
|
+
}
|
|
17
27
|
});
|
|
18
|
-
const _fs = /*#__PURE__*/
|
|
19
|
-
const _url = /*#__PURE__*/
|
|
20
|
-
const _postcss = /*#__PURE__*/
|
|
21
|
-
const _dlv = /*#__PURE__*/
|
|
22
|
-
const
|
|
23
|
-
const _transformThemeValue = /*#__PURE__*/
|
|
24
|
-
const _parseObjectStyles = /*#__PURE__*/
|
|
25
|
-
const _prefixSelector = /*#__PURE__*/
|
|
26
|
-
const _isPlainObject = /*#__PURE__*/
|
|
27
|
-
const _escapeClassName = /*#__PURE__*/
|
|
28
|
-
const _nameClass = /*#__PURE__*/
|
|
28
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
29
|
+
const _url = /*#__PURE__*/ _interop_require_default(require("url"));
|
|
30
|
+
const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
|
|
31
|
+
const _dlv = /*#__PURE__*/ _interop_require_default(require("dlv"));
|
|
32
|
+
const _postcssselectorparser = /*#__PURE__*/ _interop_require_default(require("postcss-selector-parser"));
|
|
33
|
+
const _transformThemeValue = /*#__PURE__*/ _interop_require_default(require("../util/transformThemeValue"));
|
|
34
|
+
const _parseObjectStyles = /*#__PURE__*/ _interop_require_default(require("../util/parseObjectStyles"));
|
|
35
|
+
const _prefixSelector = /*#__PURE__*/ _interop_require_default(require("../util/prefixSelector"));
|
|
36
|
+
const _isPlainObject = /*#__PURE__*/ _interop_require_default(require("../util/isPlainObject"));
|
|
37
|
+
const _escapeClassName = /*#__PURE__*/ _interop_require_default(require("../util/escapeClassName"));
|
|
38
|
+
const _nameClass = /*#__PURE__*/ _interop_require_wildcard(require("../util/nameClass"));
|
|
29
39
|
const _pluginUtils = require("../util/pluginUtils");
|
|
30
40
|
const _corePlugins = require("../corePlugins");
|
|
31
|
-
const _sharedState = /*#__PURE__*/
|
|
41
|
+
const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
|
|
32
42
|
const _toPath = require("../util/toPath");
|
|
33
|
-
const _log = /*#__PURE__*/
|
|
34
|
-
const _negateValue = /*#__PURE__*/
|
|
35
|
-
const _isSyntacticallyValidPropertyValue = /*#__PURE__*/
|
|
43
|
+
const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
|
|
44
|
+
const _negateValue = /*#__PURE__*/ _interop_require_default(require("../util/negateValue"));
|
|
45
|
+
const _isSyntacticallyValidPropertyValue = /*#__PURE__*/ _interop_require_default(require("../util/isSyntacticallyValidPropertyValue"));
|
|
36
46
|
const _generateRules = require("./generateRules");
|
|
37
|
-
const
|
|
38
|
-
const
|
|
39
|
-
const
|
|
47
|
+
const _cacheInvalidation = require("./cacheInvalidation.js");
|
|
48
|
+
const _offsets = require("./offsets.js");
|
|
49
|
+
const _featureFlags = require("../featureFlags.js");
|
|
40
50
|
const _formatVariantSelector = require("../util/formatVariantSelector");
|
|
41
|
-
function
|
|
51
|
+
function _interop_require_default(obj) {
|
|
42
52
|
return obj && obj.__esModule ? obj : {
|
|
43
53
|
default: obj
|
|
44
54
|
};
|
|
@@ -51,7 +61,7 @@ function _getRequireWildcardCache(nodeInterop) {
|
|
|
51
61
|
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
52
62
|
})(nodeInterop);
|
|
53
63
|
}
|
|
54
|
-
function
|
|
64
|
+
function _interop_require_wildcard(obj, nodeInterop) {
|
|
55
65
|
if (!nodeInterop && obj && obj.__esModule) {
|
|
56
66
|
return obj;
|
|
57
67
|
}
|
|
@@ -175,7 +185,7 @@ function parseStyles(styles) {
|
|
|
175
185
|
});
|
|
176
186
|
}
|
|
177
187
|
function getClasses(selector, mutate) {
|
|
178
|
-
let parser = (0,
|
|
188
|
+
let parser = (0, _postcssselectorparser.default)((selectors)=>{
|
|
179
189
|
let allClasses = [];
|
|
180
190
|
if (mutate) {
|
|
181
191
|
mutate(selectors);
|
|
@@ -451,7 +461,7 @@ function parseVariant(variant) {
|
|
|
451
461
|
return utilityModifier;
|
|
452
462
|
}
|
|
453
463
|
};
|
|
454
|
-
let modifiersEnabled = (0,
|
|
464
|
+
let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
|
|
455
465
|
let ruleSets = [].concat(modifiersEnabled ? rule(value, extras) : rule(value)).filter(Boolean).map((declaration)=>({
|
|
456
466
|
[(0, _nameClass.default)(identifier, modifier)]: declaration
|
|
457
467
|
}));
|
|
@@ -517,7 +527,7 @@ function parseVariant(variant) {
|
|
|
517
527
|
return utilityModifier;
|
|
518
528
|
}
|
|
519
529
|
};
|
|
520
|
-
let modifiersEnabled = (0,
|
|
530
|
+
let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
|
|
521
531
|
let ruleSets = [].concat(modifiersEnabled ? rule(value, extras) : rule(value)).filter(Boolean).map((declaration)=>({
|
|
522
532
|
[(0, _nameClass.default)(identifier, modifier)]: declaration
|
|
523
533
|
}));
|
|
@@ -578,7 +588,7 @@ function parseVariant(variant) {
|
|
|
578
588
|
// This is for internal use only which is why it is not present in the types
|
|
579
589
|
let id = (_options_id = options === null || options === void 0 ? void 0 : options.id) !== null && _options_id !== void 0 ? _options_id : ++variantIdentifier;
|
|
580
590
|
let isSpecial = variant === "@";
|
|
581
|
-
let modifiersEnabled = (0,
|
|
591
|
+
let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
|
|
582
592
|
var _options_values;
|
|
583
593
|
for (let [key, value] of Object.entries((_options_values = options === null || options === void 0 ? void 0 : options.values) !== null && _options_values !== void 0 ? _options_values : {})){
|
|
584
594
|
if (key === "DEFAULT") continue;
|
|
@@ -689,9 +699,9 @@ function collectLayerPlugins(root) {
|
|
|
689
699
|
}
|
|
690
700
|
layerRule.remove();
|
|
691
701
|
} else if (layerRule.params === "components") {
|
|
692
|
-
for (let
|
|
702
|
+
for (let node of layerRule.nodes){
|
|
693
703
|
layerPlugins.push(function({ addComponents }) {
|
|
694
|
-
addComponents(
|
|
704
|
+
addComponents(node, {
|
|
695
705
|
respectPrefix: false,
|
|
696
706
|
preserveSource: true
|
|
697
707
|
});
|
|
@@ -699,9 +709,9 @@ function collectLayerPlugins(root) {
|
|
|
699
709
|
}
|
|
700
710
|
layerRule.remove();
|
|
701
711
|
} else if (layerRule.params === "utilities") {
|
|
702
|
-
for (let
|
|
712
|
+
for (let node of layerRule.nodes){
|
|
703
713
|
layerPlugins.push(function({ addUtilities }) {
|
|
704
|
-
addUtilities(
|
|
714
|
+
addUtilities(node, {
|
|
705
715
|
respectPrefix: false,
|
|
706
716
|
preserveSource: true
|
|
707
717
|
});
|
|
@@ -759,7 +769,7 @@ function registerPlugins(plugins, context) {
|
|
|
759
769
|
let variantList = [];
|
|
760
770
|
let variantMap = new Map();
|
|
761
771
|
context.variantMap = variantMap;
|
|
762
|
-
let offsets = new
|
|
772
|
+
let offsets = new _offsets.Offsets();
|
|
763
773
|
context.offsets = offsets;
|
|
764
774
|
let classList = new Set();
|
|
765
775
|
let pluginApi = buildPluginApi(context.tailwindConfig, context, {
|
|
@@ -850,7 +860,7 @@ function registerPlugins(plugins, context) {
|
|
|
850
860
|
})() : [
|
|
851
861
|
util
|
|
852
862
|
];
|
|
853
|
-
for (let
|
|
863
|
+
for (let util of utils){
|
|
854
864
|
for (let { pattern , variants =[] } of checks){
|
|
855
865
|
// RegExp with the /g flag are stateful, so let's reset the last
|
|
856
866
|
// index pointer to reset the state.
|
|
@@ -858,15 +868,15 @@ function registerPlugins(plugins, context) {
|
|
|
858
868
|
if (!patternMatchingCount.has(pattern)) {
|
|
859
869
|
patternMatchingCount.set(pattern, 0);
|
|
860
870
|
}
|
|
861
|
-
if (!pattern.test(
|
|
871
|
+
if (!pattern.test(util)) continue;
|
|
862
872
|
patternMatchingCount.set(pattern, patternMatchingCount.get(pattern) + 1);
|
|
863
873
|
context.changedContent.push({
|
|
864
|
-
content:
|
|
874
|
+
content: util,
|
|
865
875
|
extension: "html"
|
|
866
876
|
});
|
|
867
877
|
for (let variant of variants){
|
|
868
878
|
context.changedContent.push({
|
|
869
|
-
content: variant + context.tailwindConfig.separator +
|
|
879
|
+
content: variant + context.tailwindConfig.separator + util,
|
|
870
880
|
extension: "html"
|
|
871
881
|
});
|
|
872
882
|
}
|
|
@@ -963,11 +973,11 @@ function registerPlugins(plugins, context) {
|
|
|
963
973
|
metadata
|
|
964
974
|
] : cls);
|
|
965
975
|
if ((utilOptions === null || utilOptions === void 0 ? void 0 : utilOptions.supportsNegativeValues) && (0, _negateValue.default)(value)) {
|
|
966
|
-
let
|
|
976
|
+
let cls = (0, _nameClass.formatClass)(utilName, `-${key}`);
|
|
967
977
|
negativeClasses.push(includeMetadata ? [
|
|
968
|
-
|
|
978
|
+
cls,
|
|
969
979
|
metadata
|
|
970
|
-
] :
|
|
980
|
+
] : cls);
|
|
971
981
|
}
|
|
972
982
|
}
|
|
973
983
|
output.push(...negativeClasses);
|
|
@@ -1060,7 +1070,7 @@ function registerPlugins(plugins, context) {
|
|
|
1060
1070
|
// as well. E.g.: `${variant}${separator}${className}`.
|
|
1061
1071
|
// However, plugin authors probably also prepend or append certain
|
|
1062
1072
|
// classes, pseudos, ids, ...
|
|
1063
|
-
let rebuiltBase = (0,
|
|
1073
|
+
let rebuiltBase = (0, _postcssselectorparser.default)((selectors)=>{
|
|
1064
1074
|
selectors.walkClasses((classNode)=>{
|
|
1065
1075
|
classNode.value = `${name}${context.tailwindConfig.separator}${classNode.value}`;
|
|
1066
1076
|
});
|
|
@@ -1184,7 +1194,7 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
|
|
|
1184
1194
|
contextMap.set(sourcePath, context);
|
|
1185
1195
|
existingContext = context;
|
|
1186
1196
|
}
|
|
1187
|
-
let cssDidChange = (0,
|
|
1197
|
+
let cssDidChange = (0, _cacheInvalidation.hasContentChanged)(sourcePath, root);
|
|
1188
1198
|
// If there's already a context in the cache and we don't need to
|
|
1189
1199
|
// reset the context, return the cached context.
|
|
1190
1200
|
if (existingContext) {
|
|
@@ -1210,9 +1220,9 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
|
|
|
1210
1220
|
contextSourcesMap.get(oldContext).delete(sourcePath);
|
|
1211
1221
|
if (contextSourcesMap.get(oldContext).size === 0) {
|
|
1212
1222
|
contextSourcesMap.delete(oldContext);
|
|
1213
|
-
for (let [
|
|
1214
|
-
if (
|
|
1215
|
-
configContextMap.delete(
|
|
1223
|
+
for (let [tailwindConfigHash, context] of configContextMap){
|
|
1224
|
+
if (context === oldContext) {
|
|
1225
|
+
configContextMap.delete(tailwindConfigHash);
|
|
1216
1226
|
}
|
|
1217
1227
|
}
|
|
1218
1228
|
for (let disposable of oldContext.disposables.splice(0)){
|
|
@@ -1222,24 +1232,24 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
|
|
|
1222
1232
|
}
|
|
1223
1233
|
}
|
|
1224
1234
|
_sharedState.env.DEBUG && console.log("Setting up new context...");
|
|
1225
|
-
let
|
|
1226
|
-
Object.assign(
|
|
1235
|
+
let context = createContext(tailwindConfig, [], root);
|
|
1236
|
+
Object.assign(context, {
|
|
1227
1237
|
userConfigPath
|
|
1228
1238
|
});
|
|
1229
|
-
let [,
|
|
1239
|
+
let [, mtimesToCommit] = trackModified([
|
|
1230
1240
|
...contextDependencies
|
|
1231
|
-
], getFileModifiedMap(
|
|
1241
|
+
], getFileModifiedMap(context));
|
|
1232
1242
|
// ---
|
|
1233
1243
|
// Update all context tracking state
|
|
1234
|
-
configContextMap.set(tailwindConfigHash,
|
|
1235
|
-
contextMap.set(sourcePath,
|
|
1236
|
-
if (!contextSourcesMap.has(
|
|
1237
|
-
contextSourcesMap.set(
|
|
1244
|
+
configContextMap.set(tailwindConfigHash, context);
|
|
1245
|
+
contextMap.set(sourcePath, context);
|
|
1246
|
+
if (!contextSourcesMap.has(context)) {
|
|
1247
|
+
contextSourcesMap.set(context, new Set());
|
|
1238
1248
|
}
|
|
1239
|
-
contextSourcesMap.get(
|
|
1249
|
+
contextSourcesMap.get(context).add(sourcePath);
|
|
1240
1250
|
return [
|
|
1241
|
-
|
|
1251
|
+
context,
|
|
1242
1252
|
true,
|
|
1243
|
-
|
|
1253
|
+
mtimesToCommit
|
|
1244
1254
|
];
|
|
1245
1255
|
}
|
|
@@ -9,25 +9,27 @@ Object.defineProperty(exports, // DISABLE_TOUCH = TRUE
|
|
|
9
9
|
// plugins) then return it
|
|
10
10
|
"default", {
|
|
11
11
|
enumerable: true,
|
|
12
|
-
get: ()
|
|
12
|
+
get: function() {
|
|
13
|
+
return setupTrackingContext;
|
|
14
|
+
}
|
|
13
15
|
});
|
|
14
|
-
const _fs = /*#__PURE__*/
|
|
15
|
-
const
|
|
16
|
-
const _hashConfig = /*#__PURE__*/
|
|
17
|
-
const
|
|
18
|
-
const _resolveConfigPath = /*#__PURE__*/
|
|
16
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
17
|
+
const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
|
|
18
|
+
const _hashConfig = /*#__PURE__*/ _interop_require_default(require("../util/hashConfig"));
|
|
19
|
+
const _resolveconfig = /*#__PURE__*/ _interop_require_default(require("../public/resolve-config"));
|
|
20
|
+
const _resolveConfigPath = /*#__PURE__*/ _interop_require_default(require("../util/resolveConfigPath"));
|
|
19
21
|
const _setupContextUtils = require("./setupContextUtils");
|
|
20
|
-
const _parseDependency = /*#__PURE__*/
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const _getModuleDependencies = /*#__PURE__*/
|
|
25
|
-
function
|
|
22
|
+
const _parseDependency = /*#__PURE__*/ _interop_require_default(require("../util/parseDependency"));
|
|
23
|
+
const _validateConfig = require("../util/validateConfig.js");
|
|
24
|
+
const _content = require("./content.js");
|
|
25
|
+
const _loadconfig = require("../lib/load-config");
|
|
26
|
+
const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("./getModuleDependencies"));
|
|
27
|
+
function _interop_require_default(obj) {
|
|
26
28
|
return obj && obj.__esModule ? obj : {
|
|
27
29
|
default: obj
|
|
28
30
|
};
|
|
29
31
|
}
|
|
30
|
-
let configPathCache = new
|
|
32
|
+
let configPathCache = new _quicklru.default({
|
|
31
33
|
maxSize: 100
|
|
32
34
|
});
|
|
33
35
|
let candidateFilesCache = new WeakMap();
|
|
@@ -35,7 +37,7 @@ function getCandidateFiles(context, tailwindConfig) {
|
|
|
35
37
|
if (candidateFilesCache.has(context)) {
|
|
36
38
|
return candidateFilesCache.get(context);
|
|
37
39
|
}
|
|
38
|
-
let candidateFiles = (0,
|
|
40
|
+
let candidateFiles = (0, _content.parseCandidateFiles)(context, tailwindConfig);
|
|
39
41
|
return candidateFilesCache.set(context, candidateFiles).get(context);
|
|
40
42
|
}
|
|
41
43
|
// Get the config object based on a path
|
|
@@ -63,10 +65,10 @@ function getTailwindConfig(configOrPath) {
|
|
|
63
65
|
];
|
|
64
66
|
}
|
|
65
67
|
// It has changed (based on timestamps), or first run
|
|
66
|
-
for (let
|
|
67
|
-
delete require.cache[
|
|
68
|
+
for (let file of newDeps){
|
|
69
|
+
delete require.cache[file];
|
|
68
70
|
}
|
|
69
|
-
let newConfig = (0,
|
|
71
|
+
let newConfig = (0, _validateConfig.validateConfig)((0, _resolveconfig.default)((0, _loadconfig.loadConfig)(userConfigPath)));
|
|
70
72
|
let newHash = (0, _hashConfig.default)(newConfig);
|
|
71
73
|
configPathCache.set(userConfigPath, [
|
|
72
74
|
newConfig,
|
|
@@ -82,12 +84,12 @@ function getTailwindConfig(configOrPath) {
|
|
|
82
84
|
];
|
|
83
85
|
}
|
|
84
86
|
// It's a plain object, not a path
|
|
85
|
-
let
|
|
86
|
-
|
|
87
|
+
let newConfig = (0, _resolveconfig.default)(configOrPath.config === undefined ? configOrPath : configOrPath.config);
|
|
88
|
+
newConfig = (0, _validateConfig.validateConfig)(newConfig);
|
|
87
89
|
return [
|
|
88
|
-
|
|
90
|
+
newConfig,
|
|
89
91
|
null,
|
|
90
|
-
(0, _hashConfig.default)(
|
|
92
|
+
(0, _hashConfig.default)(newConfig),
|
|
91
93
|
[]
|
|
92
94
|
];
|
|
93
95
|
}
|
|
@@ -127,7 +129,7 @@ function setupTrackingContext(configOrPath) {
|
|
|
127
129
|
registerDependency(dependency);
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
|
-
let [changedContent, contentMTimesToCommit] = (0,
|
|
132
|
+
let [changedContent, contentMTimesToCommit] = (0, _content.resolvedChangedContent)(context, candidateFiles, fileModifiedMap);
|
|
131
133
|
for (let content of changedContent){
|
|
132
134
|
context.changedContent.push(content);
|
|
133
135
|
}
|
|
@@ -154,8 +156,8 @@ function setupTrackingContext(configOrPath) {
|
|
|
154
156
|
// "commit" the new modified time for all context deps
|
|
155
157
|
// We do this here because we want content tracking to
|
|
156
158
|
// read the "old" mtime even when it's a context dependency.
|
|
157
|
-
for (let [
|
|
158
|
-
fileModifiedMap.set(
|
|
159
|
+
for (let [path, mtime] of mTimesToCommit.entries()){
|
|
160
|
+
fileModifiedMap.set(path, mtime);
|
|
159
161
|
}
|
|
160
162
|
return context;
|
|
161
163
|
};
|
package/lib/lib/sharedState.js
CHANGED
|
@@ -9,27 +9,45 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
env: ()
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
env: function() {
|
|
13
|
+
return env;
|
|
14
|
+
},
|
|
15
|
+
contextMap: function() {
|
|
16
|
+
return contextMap;
|
|
17
|
+
},
|
|
18
|
+
configContextMap: function() {
|
|
19
|
+
return configContextMap;
|
|
20
|
+
},
|
|
21
|
+
contextSourcesMap: function() {
|
|
22
|
+
return contextSourcesMap;
|
|
23
|
+
},
|
|
24
|
+
sourceHashMap: function() {
|
|
25
|
+
return sourceHashMap;
|
|
26
|
+
},
|
|
27
|
+
NOT_ON_DEMAND: function() {
|
|
28
|
+
return NOT_ON_DEMAND;
|
|
29
|
+
},
|
|
30
|
+
NONE: function() {
|
|
31
|
+
return NONE;
|
|
32
|
+
},
|
|
33
|
+
resolveDebug: function() {
|
|
34
|
+
return resolveDebug;
|
|
35
|
+
}
|
|
20
36
|
});
|
|
21
|
-
const
|
|
22
|
-
function
|
|
37
|
+
const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../package.json"));
|
|
38
|
+
function _interop_require_default(obj) {
|
|
23
39
|
return obj && obj.__esModule ? obj : {
|
|
24
40
|
default: obj
|
|
25
41
|
};
|
|
26
42
|
}
|
|
27
|
-
|
|
28
|
-
const env = {
|
|
43
|
+
const env = typeof process !== "undefined" ? {
|
|
29
44
|
NODE_ENV: process.env.NODE_ENV,
|
|
30
45
|
DEBUG: resolveDebug(process.env.DEBUG),
|
|
31
|
-
ENGINE:
|
|
32
|
-
|
|
46
|
+
ENGINE: _packagejson.default.tailwindcss.engine
|
|
47
|
+
} : {
|
|
48
|
+
NODE_ENV: "production",
|
|
49
|
+
DEBUG: false,
|
|
50
|
+
ENGINE: _packagejson.default.tailwindcss.engine
|
|
33
51
|
};
|
|
34
52
|
const contextMap = new Map();
|
|
35
53
|
const configContextMap = new Map();
|
|
@@ -37,15 +55,6 @@ const contextSourcesMap = new Map();
|
|
|
37
55
|
const sourceHashMap = new Map();
|
|
38
56
|
const NOT_ON_DEMAND = new String("*");
|
|
39
57
|
const NONE = Symbol("__NONE__");
|
|
40
|
-
function resolveBoolean(value, defaultValue) {
|
|
41
|
-
if (value === undefined) {
|
|
42
|
-
return defaultValue;
|
|
43
|
-
}
|
|
44
|
-
if (value === "0" || value === "false") {
|
|
45
|
-
return false;
|
|
46
|
-
}
|
|
47
|
-
return true;
|
|
48
|
-
}
|
|
49
58
|
function resolveDebug(debug) {
|
|
50
59
|
if (debug === undefined) {
|
|
51
60
|
return false;
|
|
@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
Object.defineProperty(exports, "default", {
|
|
6
6
|
enumerable: true,
|
|
7
|
-
get: ()
|
|
7
|
+
get: function() {
|
|
8
|
+
return _default;
|
|
9
|
+
}
|
|
8
10
|
});
|
|
9
11
|
const _normalizeScreens = require("../util/normalizeScreens");
|
|
10
|
-
const _buildMediaQuery = /*#__PURE__*/
|
|
11
|
-
function
|
|
12
|
+
const _buildMediaQuery = /*#__PURE__*/ _interop_require_default(require("../util/buildMediaQuery"));
|
|
13
|
+
function _interop_require_default(obj) {
|
|
12
14
|
return obj && obj.__esModule ? obj : {
|
|
13
15
|
default: obj
|
|
14
16
|
};
|
|
@@ -9,15 +9,23 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
lazyLightningCss: ()
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
lazyLightningCss: function() {
|
|
13
|
+
return lazyLightningCss;
|
|
14
|
+
},
|
|
15
|
+
lightningcss: function() {
|
|
16
|
+
return lightningcss;
|
|
17
|
+
},
|
|
18
|
+
loadPostcss: function() {
|
|
19
|
+
return loadPostcss;
|
|
20
|
+
},
|
|
21
|
+
loadPostcssImport: function() {
|
|
22
|
+
return loadPostcssImport;
|
|
23
|
+
}
|
|
16
24
|
});
|
|
17
|
-
const
|
|
18
|
-
const _browserslist = /*#__PURE__*/
|
|
25
|
+
const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../../../package.json"));
|
|
26
|
+
const _browserslist = /*#__PURE__*/ _interop_require_default(require("browserslist"));
|
|
19
27
|
const _index = require("../../../../peers/index");
|
|
20
|
-
function
|
|
28
|
+
function _interop_require_default(obj) {
|
|
21
29
|
return obj && obj.__esModule ? obj : {
|
|
22
30
|
default: obj
|
|
23
31
|
};
|
|
@@ -46,7 +54,7 @@ async function lightningcss(shouldMinify, result) {
|
|
|
46
54
|
minify: shouldMinify,
|
|
47
55
|
sourceMap: !!result.map,
|
|
48
56
|
inputSourceMap: result.map ? result.map.toString() : undefined,
|
|
49
|
-
targets: css.browserslistToTargets((0, _browserslist.default)(
|
|
57
|
+
targets: css.browserslistToTargets((0, _browserslist.default)(_packagejson.default.browserslist)),
|
|
50
58
|
drafts: {
|
|
51
59
|
nesting: true
|
|
52
60
|
}
|
|
@@ -4,13 +4,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
Object.defineProperty(exports, "build", {
|
|
6
6
|
enumerable: true,
|
|
7
|
-
get: ()
|
|
7
|
+
get: function() {
|
|
8
|
+
return build;
|
|
9
|
+
}
|
|
8
10
|
});
|
|
9
|
-
const _fs = /*#__PURE__*/
|
|
10
|
-
const _path = /*#__PURE__*/
|
|
11
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
12
|
+
const _path = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
11
13
|
const _resolveConfigPath = require("../../../util/resolveConfigPath");
|
|
12
14
|
const _plugin = require("./plugin");
|
|
13
|
-
function
|
|
15
|
+
function _interop_require_default(obj) {
|
|
14
16
|
return obj && obj.__esModule ? obj : {
|
|
15
17
|
default: obj
|
|
16
18
|
};
|
|
@@ -4,29 +4,31 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
Object.defineProperty(exports, "createProcessor", {
|
|
6
6
|
enumerable: true,
|
|
7
|
-
get: ()
|
|
7
|
+
get: function() {
|
|
8
|
+
return createProcessor;
|
|
9
|
+
}
|
|
8
10
|
});
|
|
9
|
-
const _path = /*#__PURE__*/
|
|
10
|
-
const _fs = /*#__PURE__*/
|
|
11
|
-
const
|
|
11
|
+
const _path = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
12
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
13
|
+
const _postcssloadconfig = /*#__PURE__*/ _interop_require_default(require("postcss-load-config"));
|
|
12
14
|
const _lilconfig = require("lilconfig");
|
|
13
|
-
const _plugins = /*#__PURE__*/
|
|
15
|
+
const _plugins = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
|
|
14
16
|
));
|
|
15
|
-
const _options = /*#__PURE__*/
|
|
17
|
+
const _options = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
|
|
16
18
|
));
|
|
17
|
-
const _processTailwindFeatures = /*#__PURE__*/
|
|
19
|
+
const _processTailwindFeatures = /*#__PURE__*/ _interop_require_default(require("../../../processTailwindFeatures"));
|
|
18
20
|
const _deps = require("./deps");
|
|
19
21
|
const _utils = require("./utils");
|
|
20
22
|
const _sharedState = require("../../../lib/sharedState");
|
|
21
|
-
const _resolveConfig = /*#__PURE__*/
|
|
23
|
+
const _resolveConfig = /*#__PURE__*/ _interop_require_default(require("../../../../resolveConfig"));
|
|
22
24
|
const _content = require("../../../lib/content");
|
|
23
25
|
const _watching = require("./watching");
|
|
24
|
-
const
|
|
26
|
+
const _fastglob = /*#__PURE__*/ _interop_require_default(require("fast-glob"));
|
|
25
27
|
const _findAtConfigPath = require("../../../lib/findAtConfigPath");
|
|
26
|
-
const _log = /*#__PURE__*/
|
|
27
|
-
const
|
|
28
|
-
const _getModuleDependencies = /*#__PURE__*/
|
|
29
|
-
function
|
|
28
|
+
const _log = /*#__PURE__*/ _interop_require_default(require("../../../util/log"));
|
|
29
|
+
const _loadconfig = require("../../../lib/load-config");
|
|
30
|
+
const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("../../../lib/getModuleDependencies"));
|
|
31
|
+
function _interop_require_default(obj) {
|
|
30
32
|
return obj && obj.__esModule ? obj : {
|
|
31
33
|
default: obj
|
|
32
34
|
};
|
|
@@ -54,7 +56,7 @@ function _interopRequireDefault(obj) {
|
|
|
54
56
|
plugins: (0, _plugins.default)(config, file),
|
|
55
57
|
options: (0, _options.default)(config, file)
|
|
56
58
|
};
|
|
57
|
-
})() : await (0,
|
|
59
|
+
})() : await (0, _postcssloadconfig.default)();
|
|
58
60
|
let configPlugins = config.plugins;
|
|
59
61
|
let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
|
|
60
62
|
if (typeof plugin === "function" && plugin.name === "tailwindcss") {
|
|
@@ -129,7 +131,7 @@ let state = {
|
|
|
129
131
|
if (this.watcher && configPath) {
|
|
130
132
|
this.refreshConfigDependencies();
|
|
131
133
|
}
|
|
132
|
-
let config = (0,
|
|
134
|
+
let config = (0, _loadconfig.loadConfig)(configPath);
|
|
133
135
|
let dependencies = (0, _getModuleDependencies.default)(configPath);
|
|
134
136
|
this.configBag = {
|
|
135
137
|
config,
|
|
@@ -162,9 +164,9 @@ let state = {
|
|
|
162
164
|
let content = [];
|
|
163
165
|
// Resolve globs from the content config
|
|
164
166
|
// TODO: When we make the postcss plugin async-capable this can become async
|
|
165
|
-
let files =
|
|
167
|
+
let files = _fastglob.default.sync(this.contentPatterns.all);
|
|
166
168
|
for (let file of files){
|
|
167
|
-
if (
|
|
169
|
+
if (false) {
|
|
168
170
|
content.push({
|
|
169
171
|
file,
|
|
170
172
|
extension: _path.default.extname(file).slice(1)
|
|
@@ -9,15 +9,25 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
indentRecursive: ()
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
indentRecursive: function() {
|
|
13
|
+
return indentRecursive;
|
|
14
|
+
},
|
|
15
|
+
formatNodes: function() {
|
|
16
|
+
return formatNodes;
|
|
17
|
+
},
|
|
18
|
+
readFileWithRetries: function() {
|
|
19
|
+
return readFileWithRetries;
|
|
20
|
+
},
|
|
21
|
+
drainStdin: function() {
|
|
22
|
+
return drainStdin;
|
|
23
|
+
},
|
|
24
|
+
outputFile: function() {
|
|
25
|
+
return outputFile;
|
|
26
|
+
}
|
|
17
27
|
});
|
|
18
|
-
const _fs = /*#__PURE__*/
|
|
19
|
-
const _path = /*#__PURE__*/
|
|
20
|
-
function
|
|
28
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
29
|
+
const _path = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
30
|
+
function _interop_require_default(obj) {
|
|
21
31
|
return obj && obj.__esModule ? obj : {
|
|
22
32
|
default: obj
|
|
23
33
|
};
|