tailwindcss 0.0.0-insiders.ea10bb9 → 0.0.0-insiders.ea4e1cd

package/lib/lib/expandApplyAtRules.js

@@ -4,13 +4,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>expandApplyAtRules
+    get: function() {
+        return expandApplyAtRules;
+    }
 });
-const _postcss = /*#__PURE__*/ _interopRequireDefault(require("postcss"));
-const _postcssSelectorParser = /*#__PURE__*/ _interopRequireDefault(require("postcss-selector-parser"));
+const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
+const _postcssselectorparser = /*#__PURE__*/ _interop_require_default(require("postcss-selector-parser"));
 const _generateRules = require("./generateRules");
-const _escapeClassName = /*#__PURE__*/ _interopRequireDefault(require("../util/escapeClassName"));
-function _interopRequireDefault(obj) {
+const _escapeClassName = /*#__PURE__*/ _interop_require_default(require("../util/escapeClassName"));
+const _applyImportantSelector = require("../util/applyImportantSelector");
+const _pseudoElements = require("../util/pseudoElements");
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -23,7 +27,7 @@ function _interopRequireDefault(obj) {
         ]
     });
     container.walkRules((rule)=>{
-        (0, _postcssSelectorParser.default)((selectors)=>{
+        (0, _postcssselectorparser.default)((selectors)=>{
             selectors.walkClasses((classSelector)=>{
                 let parentSelector = classSelector.parent.toString();
                 let classes = groups.get(parentSelector);
@@ -40,7 +44,7 @@ function _interopRequireDefault(obj) {
         groups: normalizedGroups
     });
 }
-let selectorExtractor = (0, _postcssSelectorParser.default)();
+let selectorExtractor = (0, _postcssselectorparser.default)();
 /**
  * @param {string} ruleSelectors
  */ function extractSelectors(ruleSelectors) {
@@ -139,8 +143,8 @@ function* pathToRoot(node) {
     root.walkRules((rule)=>{
         // Ignore rules generated by Tailwind
         for (let node of pathToRoot(rule)){
-            var ref;
-            if (((ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.layer) !== undefined) {
+            var _node_raws_tailwind;
+            if (((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.layer) !== undefined) {
                 return;
             }
         }
@@ -309,11 +313,11 @@ function processApply(root, context, localCache) {
             // Sort tag names before class names (but only sort each group (separated by a combinator)
             // separately and not in total)
             // This happens when replacing `.bar` in `.foo.bar` with a tag like `section`
-            for (let sel1 of replaced){
+            for (let sel of replaced){
                 let groups = [
                     []
                 ];
-                for (let node of sel1.nodes){
+                for (let node of sel.nodes){
                     if (node.type === "combinator") {
                         groups.push(node);
                         groups.push([]);
@@ -322,7 +326,7 @@ function processApply(root, context, localCache) {
                         last.push(node);
                     }
                 }
-                sel1.nodes = [];
+                sel.nodes = [];
                 for (let group of groups){
                     if (Array.isArray(group)) {
                         group.sort((a, b)=>{
@@ -338,7 +342,7 @@ function processApply(root, context, localCache) {
                             return 0;
                         });
                     }
-                    sel1.nodes = sel1.nodes.concat(group);
+                    sel.nodes = sel.nodes.concat(group);
                 }
             }
             sel.replaceWith(...replaced);
@@ -356,15 +360,15 @@ function processApply(root, context, localCache) {
             candidates,
             apply.source
         ]);
-        let [applyCandidates1, important] = extractApplyCandidates(apply.params);
+        let [applyCandidates, important] = extractApplyCandidates(apply.params);
         if (apply.parent.type === "atrule") {
             if (apply.parent.name === "screen") {
                 let screenType = apply.parent.params;
-                throw apply.error(`@apply is not supported within nested at-rules like @screen. We suggest you write this as @apply ${applyCandidates1.map((c)=>`${screenType}:${c}`).join(" ")} instead.`);
+                throw apply.error(`@apply is not supported within nested at-rules like @screen. We suggest you write this as @apply ${applyCandidates.map((c)=>`${screenType}:${c}`).join(" ")} instead.`);
             }
             throw apply.error(`@apply is not supported within nested at-rules like @${apply.parent.name}. You can fix this by un-nesting @${apply.parent.name}.`);
         }
-        for (let applyCandidate of applyCandidates1){
+        for (let applyCandidate of applyCandidates){
             if ([
                 prefix(context, "group"),
                 prefix(context, "peer")
@@ -383,16 +387,16 @@ function processApply(root, context, localCache) {
             ]);
         }
     }
-    for (let [parent, [candidates1, atApplySource]] of perParentApplies){
+    for (let [parent, [candidates, atApplySource]] of perParentApplies){
         let siblings = [];
-        for (let [applyCandidate1, important1, rules1] of candidates1){
+        for (let [applyCandidate, important, rules] of candidates){
             let potentialApplyCandidates = [
-                applyCandidate1,
+                applyCandidate,
                 ...extractBaseCandidates([
-                    applyCandidate1
+                    applyCandidate
                 ], context.tailwindConfig.separator)
             ];
-            for (let [meta, node] of rules1){
+            for (let [meta, node] of rules){
                 let parentClasses = extractClasses(parent);
                 let nodeClasses = extractClasses(node);
                 // When we encounter a rule like `.dark .a, .b { … }` we only want to be left with `[.dark, .a]` if the base applyCandidate is `.a` or with `[.b]` if the base applyCandidate is `.b`
@@ -423,20 +427,20 @@ function processApply(root, context, localCache) {
                 nodeClasses = nodeClasses.concat(extractBaseCandidates(nodeClasses, context.tailwindConfig.separator));
                 let intersects = parentClasses.some((selector)=>nodeClasses.includes(selector));
                 if (intersects) {
-                    throw node.error(`You cannot \`@apply\` the \`${applyCandidate1}\` utility here because it creates a circular dependency.`);
+                    throw node.error(`You cannot \`@apply\` the \`${applyCandidate}\` utility here because it creates a circular dependency.`);
                 }
-                let root1 = _postcss.default.root({
+                let root = _postcss.default.root({
                     nodes: [
                         node.clone()
                     ]
                 });
                 // Make sure every node in the entire tree points back at the @apply rule that generated it
-                root1.walk((node)=>{
+                root.walk((node)=>{
                     node.source = atApplySource;
                 });
                 let canRewriteSelector = node.type !== "atrule" || node.type === "atrule" && node.name !== "keyframes";
                 if (canRewriteSelector) {
-                    root1.walkRules((rule)=>{
+                    root.walkRules((rule)=>{
                         // Let's imagine you have the following structure:
                         //
                         // .foo {
@@ -468,7 +472,7 @@ function processApply(root, context, localCache) {
                         // would have replaced this with something that didn't exist and
                         // therefore it removed the selector altogether. In this specific
                         // case it would result in `{}` instead of `.something-unrelated {}`
-                        if (!extractClasses(rule).some((candidate)=>candidate === applyCandidate1)) {
+                        if (!extractClasses(rule).some((candidate)=>candidate === applyCandidate)) {
                             rule.remove();
                             return;
                         }
@@ -478,25 +482,29 @@ function processApply(root, context, localCache) {
                         // We do *not* want to do this for user CSS that happens to be structured the same
                         let isGenerated = parent.raws.tailwind !== undefined;
                         let parentSelector = isGenerated && importantSelector && parent.selector.indexOf(importantSelector) === 0 ? parent.selector.slice(importantSelector.length) : parent.selector;
-                        rule.selector = replaceSelector(parentSelector, rule.selector, applyCandidate1);
+                        rule.selector = replaceSelector(parentSelector, rule.selector, applyCandidate);
                         // And then re-add it if it was removed
                         if (importantSelector && parentSelector !== parent.selector) {
-                            rule.selector = `${importantSelector} ${rule.selector}`;
+                            rule.selector = (0, _applyImportantSelector.applyImportantSelector)(rule.selector, importantSelector);
                         }
                         rule.walkDecls((d)=>{
-                            d.important = meta.important || important1;
+                            d.important = meta.important || important;
                         });
+                        // Move pseudo elements to the end of the selector (if necessary)
+                        let selector = (0, _postcssselectorparser.default)().astSync(rule.selector);
+                        selector.each((sel)=>(0, _pseudoElements.movePseudos)(sel));
+                        rule.selector = selector.toString();
                     });
                 }
                 // It could be that the node we were inserted was removed because the class didn't match
                 // If that was the *only* rule in the parent, then we have nothing add so we skip it
-                if (!root1.nodes[0]) {
+                if (!root.nodes[0]) {
                     continue;
                 }
                 // Insert it
                 siblings.push([
                     meta.sort,
-                    root1.nodes[0]
+                    root.nodes[0]
                 ]);
             }
         }
@@ -505,13 +513,13 @@ function processApply(root, context, localCache) {
         // `parent` refers to the node at `.abc` in: .abc { @apply mt-2 }
         parent.after(nodes);
     }
-    for (let apply1 of applies){
+    for (let apply of applies){
         // If there are left-over declarations, just remove the @apply
-        if (apply1.parent.nodes.length > 1) {
-            apply1.remove();
+        if (apply.parent.nodes.length > 1) {
+            apply.remove();
         } else {
             // The node is empty, drop the full node
-            apply1.parent.remove();
+            apply.parent.remove();
         }
     }
     // Do it again, in case we have other `@apply` rules

package/lib/lib/expandTailwindAtRules.js

@@ -4,15 +4,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>expandTailwindAtRules
+    get: function() {
+        return expandTailwindAtRules;
+    }
 });
-const _quickLru = /*#__PURE__*/ _interopRequireDefault(require("quick-lru"));
-const _sharedState = /*#__PURE__*/ _interopRequireWildcard(require("./sharedState"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
+const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
 const _generateRules = require("./generateRules");
-const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
-const _cloneNodes = /*#__PURE__*/ _interopRequireDefault(require("../util/cloneNodes"));
+const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
+const _cloneNodes = /*#__PURE__*/ _interop_require_default(require("../util/cloneNodes"));
 const _defaultExtractor = require("./defaultExtractor");
-function _interopRequireDefault(obj) {
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -25,7 +28,7 @@ function _getRequireWildcardCache(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
-function _interopRequireWildcard(obj, nodeInterop) {
+function _interop_require_wildcard(obj, nodeInterop) {
     if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }
@@ -78,7 +81,7 @@ let extractorCache = new WeakMap();
 // up these regexes by 50% that could cut initial build time by like 20%.
 function getClassCandidates(content, extractor, candidates, seen) {
     if (!extractorCache.has(extractor)) {
-        extractorCache.set(extractor, new _quickLru.default({
+        extractorCache.set(extractor, new _quicklru.default({
             maxSize: 25000
         }));
     }
@@ -95,8 +98,8 @@ function getClassCandidates(content, extractor, candidates, seen) {
         } else {
             let extractorMatches = extractor(line).filter((s)=>s !== "!*");
             let lineMatchesSet = new Set(extractorMatches);
-            for (let match1 of lineMatchesSet){
-                candidates.add(match1);
+            for (let match of lineMatchesSet){
+                candidates.add(match);
             }
             extractorCache.get(extractor).set(line, lineMatchesSet);
         }
@@ -142,24 +145,48 @@ function expandTailwindAtRules(context) {
         if (Object.values(layerNodes).every((n)=>n === null)) {
             return root;
         }
+        var _context_candidates;
         // ---
         // Find potential rules in changed files
         let candidates = new Set([
+            ...(_context_candidates = context.candidates) !== null && _context_candidates !== void 0 ? _context_candidates : [],
             _sharedState.NOT_ON_DEMAND
         ]);
         let seen = new Set();
         env.DEBUG && console.time("Reading changed files");
-        for (let { content , extension  } of context.changedContent){
-            let transformer = getTransformer(context.tailwindConfig, extension);
-            let extractor = getExtractor(context, extension);
-            getClassCandidates(transformer(content), extractor, candidates, seen);
+        if (false) {
+            // TODO: Pass through or implement `extractor`
+            for (let candidate of require("@tailwindcss/oxide").parseCandidateStringsFromFiles(context.changedContent)){
+                candidates.add(candidate);
+            }
+        // for (let { file, content, extension } of context.changedContent) {
+        //   let transformer = getTransformer(context.tailwindConfig, extension)
+        //   let extractor = getExtractor(context, extension)
+        //   getClassCandidatesOxide(file, transformer(content), extractor, candidates, seen)
+        // }
+        } else {
+            for (let { file , content , extension  } of context.changedContent){
+                let transformer = getTransformer(context.tailwindConfig, extension);
+                let extractor = getExtractor(context, extension);
+                content = file ? _fs.default.readFileSync(file, "utf8") : content;
+                getClassCandidates(transformer(content), extractor, candidates, seen);
+            }
         }
         env.DEBUG && console.timeEnd("Reading changed files");
         // ---
         // Generate the actual CSS
         let classCacheCount = context.classCache.size;
         env.DEBUG && console.time("Generate rules");
-        (0, _generateRules.generateRules)(candidates, context);
+        env.DEBUG && console.time("Sorting candidates");
+        let sortedCandidates = false ? candidates : new Set([
+            ...candidates
+        ].sort((a, z)=>{
+            if (a === z) return 0;
+            if (a < z) return -1;
+            return 1;
+        }));
+        env.DEBUG && console.timeEnd("Sorting candidates");
+        (0, _generateRules.generateRules)(sortedCandidates, context);
         env.DEBUG && console.timeEnd("Generate rules");
         // We only ever add to the classCache, so if it didn't grow, there is nothing new.
         env.DEBUG && console.time("Build stylesheet");
@@ -199,8 +226,8 @@ function expandTailwindAtRules(context) {
         }
         // We do post-filtering to not alter the emitted order of the variants
         const variantNodes = Array.from(screenNodes).filter((node)=>{
-            var ref;
-            const parentLayer = (ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer;
+            var _node_raws_tailwind;
+            const parentLayer = (_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer;
             if (parentLayer === "components") {
                 return layerNodes.components !== null;
             }
@@ -221,8 +248,8 @@ function expandTailwindAtRules(context) {
         }
         // If we've got a utility layer and no utilities are generated there's likely something wrong
         const hasUtilityVariants = variantNodes.some((node)=>{
-            var ref;
-            return ((ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer) === "utilities";
+            var _node_raws_tailwind;
+            return ((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) === "utilities";
         });
         if (layerNodes.utilities && utilityNodes.size === 0 && !hasUtilityVariants) {
             _log.default.warn("content-problems", [

package/lib/lib/findAtConfigPath.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "findAtConfigPath", {
     enumerable: true,
-    get: ()=>findAtConfigPath
+    get: function() {
+        return findAtConfigPath;
+    }
 });
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -17,9 +19,9 @@ function findAtConfigPath(root, result) {
     let configPath = null;
     let relativeTo = null;
     root.walkAtRules("config", (rule)=>{
-        var ref;
-        var _file, ref1;
-        relativeTo = (ref1 = (_file = (ref = rule.source) === null || ref === void 0 ? void 0 : ref.input.file) !== null && _file !== void 0 ? _file : result.opts.from) !== null && ref1 !== void 0 ? ref1 : null;
+        var _rule_source;
+        var _rule_source_input_file, _ref;
+        relativeTo = (_ref = (_rule_source_input_file = (_rule_source = rule.source) === null || _rule_source === void 0 ? void 0 : _rule_source.input.file) !== null && _rule_source_input_file !== void 0 ? _rule_source_input_file : result.opts.from) !== null && _ref !== void 0 ? _ref : null;
         if (relativeTo === null) {
             throw rule.error("The `@config` directive cannot be used without setting `from` in your PostCSS config.");
         }