tailwindcss 0.0.0-insiders.bd970d0 → 0.0.0-insiders.bda8421

package/lib/lib/expandApplyAtRules.js

@@ -59,7 +59,7 @@ function extractBaseCandidates(candidates, separator) {
 }
 function prefix(context, selector) {
     let prefix = context.tailwindConfig.prefix;
-    return typeof prefix === 'function' ? prefix(selector) : prefix + selector;
+    return typeof prefix === "function" ? prefix(selector) : prefix + selector;
 }
 function* pathToRoot(node) {
     yield node;
@@ -125,7 +125,7 @@ function* pathToRoot(node) {
         if (node === parent) {
             continue;
         }
-        if (parent.type === 'root') {
+        if (parent.type === "root") {
             break;
         }
         node = shallowClone(parent, {
@@ -150,13 +150,13 @@ function* pathToRoot(node) {
         }
         // Clone what's required to represent this singular rule in the tree
         let container = nestedClone(rule);
-        let sort = context.offsets.create('user');
+        let sort = context.offsets.create("user");
         for (let className of extractClasses(rule)){
             let list = cache.get(className) || [];
             cache.set(className, list);
             list.push([
                 {
-                    layer: 'user',
+                    layer: "user",
                     sort,
                     important: false
                 },
@@ -221,7 +221,7 @@ function* pathToRoot(node) {
 }
 function extractApplyCandidates(params) {
     let candidates = params.split(/[\s\t\n]+/g);
-    if (candidates[candidates.length - 1] === '!important') {
+    if (candidates[candidates.length - 1] === "!important") {
         return [
             candidates.slice(0, -1),
             true
@@ -236,7 +236,7 @@ function processApply(root, context, localCache) {
     let applyCandidates = new Set();
     // Collect all @apply rules and candidates
     let applies = [];
-    root.walkAtRules('apply', (rule)=>{
+    root.walkAtRules("apply", (rule)=>{
         let [candidates] = extractApplyCandidates(rule.params);
         for (let util of candidates){
             applyCandidates.add(util);
@@ -318,7 +318,7 @@ function processApply(root, context, localCache) {
                     []
                 ];
                 for (let node of sel.nodes){
-                    if (node.type === 'combinator') {
+                    if (node.type === "combinator") {
                         groups.push(node);
                         groups.push([]);
                     } else {
@@ -330,13 +330,13 @@ function processApply(root, context, localCache) {
                 for (let group of groups){
                     if (Array.isArray(group)) {
                         group.sort((a, b)=>{
-                            if (a.type === 'tag' && b.type === 'class') {
+                            if (a.type === "tag" && b.type === "class") {
                                 return -1;
-                            } else if (a.type === 'class' && b.type === 'tag') {
+                            } else if (a.type === "class" && b.type === "tag") {
                                 return 1;
-                            } else if (a.type === 'class' && b.type === 'pseudo' && b.value.startsWith('::')) {
+                            } else if (a.type === "class" && b.type === "pseudo" && b.value.startsWith("::")) {
                                 return -1;
-                            } else if (a.type === 'pseudo' && a.value.startsWith('::') && b.type === 'class') {
+                            } else if (a.type === "pseudo" && a.value.startsWith("::") && b.type === "class") {
                                 return 1;
                             }
                             return 0;
@@ -361,17 +361,17 @@ function processApply(root, context, localCache) {
             apply.source
         ]);
         let [applyCandidates, important] = extractApplyCandidates(apply.params);
-        if (apply.parent.type === 'atrule') {
-            if (apply.parent.name === 'screen') {
+        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 ${applyCandidates.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 applyCandidates){
             if ([
-                prefix(context, 'group'),
-                prefix(context, 'peer')
+                prefix(context, "group"),
+                prefix(context, "peer")
             ].includes(applyCandidate)) {
                 // TODO: Link to specific documentation page with error code.
                 throw apply.error(`@apply should not be used with the '${applyCandidate}' utility`);
@@ -380,6 +380,19 @@ function processApply(root, context, localCache) {
                 throw apply.error(`The \`${applyCandidate}\` class does not exist. If \`${applyCandidate}\` is a custom class, make sure it is defined within a \`@layer\` directive.`);
             }
             let rules = applyClassCache.get(applyCandidate);
+            // Verify that we can apply the class
+            for (let [, rule] of rules){
+                if (rule.type === "atrule") {
+                    continue;
+                }
+                rule.walkRules(()=>{
+                    throw apply.error([
+                        `The \`${applyCandidate}\` class cannot be used with \`@apply\` because \`@apply\` does not currently support nested CSS.`,
+                        "Rewrite the selector without nesting or configure the `tailwindcss/nesting` plugin:",
+                        "https://tailwindcss.com/docs/using-with-preprocessors#nesting"
+                    ].join("\n"));
+                });
+            }
             candidates.push([
                 applyCandidate,
                 important,
@@ -438,7 +451,7 @@ function processApply(root, context, localCache) {
                 root.walk((node)=>{
                     node.source = atApplySource;
                 });
-                let canRewriteSelector = node.type !== 'atrule' || node.type === 'atrule' && node.name !== 'keyframes';
+                let canRewriteSelector = node.type !== "atrule" || node.type === "atrule" && node.name !== "keyframes";
                 if (canRewriteSelector) {
                     root.walkRules((rule)=>{
                         // Let's imagine you have the following structure:
@@ -477,11 +490,17 @@ function processApply(root, context, localCache) {
                             return;
                         }
                         // Strip the important selector from the parent selector if at the beginning
-                        let importantSelector = typeof context.tailwindConfig.important === 'string' ? context.tailwindConfig.important : null;
+                        let importantSelector = typeof context.tailwindConfig.important === "string" ? context.tailwindConfig.important : null;
                         // We only want to move the "important" selector if this is a Tailwind-generated utility
                         // 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;
+                        // If the selector becomes empty after replacing the important selector
+                        // This means that it's the same as the parent selector and we don't want to replace it
+                        // Otherwise we'll crash
+                        if (parentSelector === "") {
+                            parentSelector = parent.selector;
+                        }
                         rule.selector = replaceSelector(parentSelector, rule.selector, applyCandidate);
                         // And then re-add it if it was removed
                         if (importantSelector && parentSelector !== parent.selector) {

package/lib/lib/expandTailwindAtRules.js

@@ -10,13 +10,11 @@ Object.defineProperty(exports, "default", {
 });
 const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
-const _oxide = require("@tailwindcss/oxide");
 const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
 const _generateRules = require("./generateRules");
 const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
 const _cloneNodes = /*#__PURE__*/ _interop_require_default(require("../util/cloneNodes"));
 const _defaultExtractor = require("./defaultExtractor");
-const _featureFlags = require("../featureFlags");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -67,16 +65,11 @@ const builtInExtractors = {
 };
 const builtInTransformers = {
     DEFAULT: (content)=>content,
-    svelte: (content)=>content.replace(/(?:^|\s)class:/g, ' ')
+    svelte: (content)=>content.replace(/(?:^|\s)class:/g, " ")
 };
 function getExtractor(context, fileExtension) {
     let extractors = context.tailwindConfig.content.extract;
-    return extractors[fileExtension] || extractors.DEFAULT || builtInExtractors[fileExtension] || // Because we call `DEFAULT(context)`, the returning function is always a new function without a
-    // stable identity. Marking it with `DEFAULT_EXTRACTOR` allows us to check if it is the default
-    // extractor without relying on the function identity.
-    Object.assign(builtInExtractors.DEFAULT(context), {
-        DEFAULT_EXTRACTOR: true
-    });
+    return extractors[fileExtension] || extractors.DEFAULT || builtInExtractors[fileExtension] || builtInExtractors.DEFAULT(context);
 }
 function getTransformer(tailwindConfig, fileExtension) {
     let transformers = tailwindConfig.content.transform;
@@ -92,7 +85,7 @@ function getClassCandidates(content, extractor, candidates, seen) {
             maxSize: 25000
         }));
     }
-    for (let line of content.split('\n')){
+    for (let line of content.split("\n")){
         line = line.trim();
         if (seen.has(line)) {
             continue;
@@ -103,7 +96,7 @@ function getClassCandidates(content, extractor, candidates, seen) {
                 candidates.add(match);
             }
         } else {
-            let extractorMatches = extractor(line).filter((s)=>s !== '!*');
+            let extractorMatches = extractor(line).filter((s)=>s !== "!*");
             let lineMatchesSet = new Set(extractorMatches);
             for (let match of lineMatchesSet){
                 candidates.add(match);
@@ -143,7 +136,7 @@ function expandTailwindAtRules(context) {
             // a lot of work and bail early. Also we don't have to register our touch
             // file as a dependency since the output of this CSS does not depend on
             // the source of any templates. Think Vue <style> blocks for example.
-            if (rule.name === 'tailwind') {
+            if (rule.name === "tailwind") {
                 if (Object.keys(layerNodes).includes(rule.params)) {
                     layerNodes[rule.params] = rule;
                 }
@@ -160,54 +153,33 @@ function expandTailwindAtRules(context) {
             _sharedState.NOT_ON_DEMAND
         ]);
         let seen = new Set();
-        env.DEBUG && console.time('Reading changed files');
-        if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, 'oxideParser')) {
-            let rustParserContent = [];
-            let regexParserContent = [];
-            for (let item of context.changedContent){
-                var _extractor;
-                let transformer = getTransformer(context.tailwindConfig, item.extension);
-                let extractor = getExtractor(context, item.extension);
-                if (transformer === builtInTransformers.DEFAULT && ((_extractor = extractor) === null || _extractor === void 0 ? void 0 : _extractor.DEFAULT_EXTRACTOR) === true) {
-                    rustParserContent.push(item);
-                } else {
-                    regexParserContent.push([
-                        item,
-                        {
-                            transformer,
-                            extractor
-                        }
-                    ]);
+        env.DEBUG && console.time("Reading changed files");
+        /** @type {[item: {file?: string, content?: string}, meta: {transformer: any, extractor: any}][]} */ let regexParserContent = [];
+        for (let item of context.changedContent){
+            let transformer = getTransformer(context.tailwindConfig, item.extension);
+            let extractor = getExtractor(context, item.extension);
+            regexParserContent.push([
+                item,
+                {
+                    transformer,
+                    extractor
                 }
-            }
-            if (rustParserContent.length > 0) {
-                for (let candidate of (0, _oxide.parseCandidateStrings)(rustParserContent, _oxide.IO.Parallel | _oxide.Parsing.Parallel)){
-                    candidates.add(candidate);
-                }
-            }
-            if (regexParserContent.length > 0) {
-                await Promise.all(regexParserContent.map(async ([{ file, content }, { transformer, extractor }])=>{
-                    content = file ? await _fs.default.promises.readFile(file, 'utf8') : content;
-                    getClassCandidates(transformer(content), extractor, candidates, seen);
-                }));
-            }
-        } else {
-            await Promise.all(context.changedContent.map(async ({ file, content, extension })=>{
-                let transformer = getTransformer(context.tailwindConfig, extension);
-                let extractor = getExtractor(context, extension);
-                content = file ? await _fs.default.promises.readFile(file, 'utf8') : content;
+            ]);
+        }
+        const BATCH_SIZE = 500;
+        for(let i = 0; i < regexParserContent.length; i += BATCH_SIZE){
+            let batch = regexParserContent.slice(i, i + BATCH_SIZE);
+            await Promise.all(batch.map(async ([{ file , content  }, { transformer , extractor  }])=>{
+                content = file ? await _fs.default.promises.readFile(file, "utf8") : content;
                 getClassCandidates(transformer(content), extractor, candidates, seen);
             }));
         }
-        env.DEBUG && console.timeEnd('Reading changed files');
+        env.DEBUG && console.timeEnd("Reading changed files");
         // ---
         // Generate the actual CSS
         let classCacheCount = context.classCache.size;
-        env.DEBUG && console.time('Generate rules');
-        env.DEBUG && console.time('Sorting candidates');
-        // TODO: only sort if we are not using the oxide parser (flagEnabled(context.tailwindConfig,
-        // 'oxideParser')) AND if we got all the candidates form the oxideParser alone. This will not
-        // be the case currently if you have custom transformers / extractors.
+        env.DEBUG && console.time("Generate rules");
+        env.DEBUG && console.time("Sorting candidates");
         let sortedCandidates = new Set([
             ...candidates
         ].sort((a, z)=>{
@@ -215,18 +187,18 @@ function expandTailwindAtRules(context) {
             if (a < z) return -1;
             return 1;
         }));
-        env.DEBUG && console.timeEnd('Sorting candidates');
+        env.DEBUG && console.timeEnd("Sorting candidates");
         (0, _generateRules.generateRules)(sortedCandidates, context);
-        env.DEBUG && console.timeEnd('Generate rules');
+        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');
+        env.DEBUG && console.time("Build stylesheet");
         if (context.stylesheetCache === null || context.classCache.size !== classCacheCount) {
             context.stylesheetCache = buildStylesheet([
                 ...context.ruleCache
             ], context);
         }
-        env.DEBUG && console.timeEnd('Build stylesheet');
-        let { defaults: defaultNodes, base: baseNodes, components: componentNodes, utilities: utilityNodes, variants: screenNodes } = context.stylesheetCache;
+        env.DEBUG && console.timeEnd("Build stylesheet");
+        let { defaults: defaultNodes , base: baseNodes , components: componentNodes , utilities: utilityNodes , variants: screenNodes  } = context.stylesheetCache;
         // ---
         // Replace any Tailwind directives with generated CSS
         if (layerNodes.base) {
@@ -234,7 +206,7 @@ function expandTailwindAtRules(context) {
                 ...baseNodes,
                 ...defaultNodes
             ], layerNodes.base.source, {
-                layer: 'base'
+                layer: "base"
             }));
             layerNodes.base.remove();
         }
@@ -242,7 +214,7 @@ function expandTailwindAtRules(context) {
             layerNodes.components.before((0, _cloneNodes.default)([
                 ...componentNodes
             ], layerNodes.components.source, {
-                layer: 'components'
+                layer: "components"
             }));
             layerNodes.components.remove();
         }
@@ -250,7 +222,7 @@ function expandTailwindAtRules(context) {
             layerNodes.utilities.before((0, _cloneNodes.default)([
                 ...utilityNodes
             ], layerNodes.utilities.source, {
-                layer: 'utilities'
+                layer: "utilities"
             }));
             layerNodes.utilities.remove();
         }
@@ -258,55 +230,47 @@ function expandTailwindAtRules(context) {
         const variantNodes = Array.from(screenNodes).filter((node)=>{
             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') {
+            if (parentLayer === "components") {
                 return layerNodes.components !== null;
             }
-            if (parentLayer === 'utilities') {
+            if (parentLayer === "utilities") {
                 return layerNodes.utilities !== null;
             }
             return true;
         });
         if (layerNodes.variants) {
             layerNodes.variants.before((0, _cloneNodes.default)(variantNodes, layerNodes.variants.source, {
-                layer: 'variants'
+                layer: "variants"
             }));
             layerNodes.variants.remove();
         } else if (variantNodes.length > 0) {
-            let cloned = (0, _cloneNodes.default)(variantNodes, undefined, {
-                layer: 'variants'
-            });
-            cloned.forEach((node)=>{
-                var _node_raws_tailwind;
-                var _node_raws_tailwind_parentLayer;
-                let parentLayer = (_node_raws_tailwind_parentLayer = (_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) !== null && _node_raws_tailwind_parentLayer !== void 0 ? _node_raws_tailwind_parentLayer : null;
-                node.walk((n)=>{
-                    if (!n.source) {
-                        n.source = layerNodes[parentLayer].source;
-                    }
-                });
-            });
-            root.append(cloned);
+            root.append((0, _cloneNodes.default)(variantNodes, root.source, {
+                layer: "variants"
+            }));
         }
+        var _root_source_end;
+        // TODO: Why is the root node having no source location for `end` possible?
+        root.source.end = (_root_source_end = root.source.end) !== null && _root_source_end !== void 0 ? _root_source_end : root.source.start;
         // If we've got a utility layer and no utilities are generated there's likely something wrong
         const hasUtilityVariants = variantNodes.some((node)=>{
             var _node_raws_tailwind;
-            return ((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.parentLayer) === 'utilities';
+            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', [
-                'No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.',
-                'https://tailwindcss.com/docs/content-configuration'
+            _log.default.warn("content-problems", [
+                "No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.",
+                "https://tailwindcss.com/docs/content-configuration"
             ]);
         }
         // ---
         if (env.DEBUG) {
-            console.log('Potential classes: ', candidates.size);
-            console.log('Active contexts: ', _sharedState.contextSourcesMap.size);
+            console.log("Potential classes: ", candidates.size);
+            console.log("Active contexts: ", _sharedState.contextSourcesMap.size);
         }
         // Clear the cache for the changed files
         context.changedContent = [];
         // Cleanup any leftover @layer atrules
-        root.walkAtRules('layer', (rule)=>{
+        root.walkAtRules("layer", (rule)=>{
             if (Object.keys(layerNodes).includes(rule.params)) {
                 rule.remove();
             }

package/lib/lib/findAtConfigPath.js

@@ -18,23 +18,23 @@ function _interop_require_default(obj) {
 function findAtConfigPath(root, result) {
     let configPath = null;
     let relativeTo = null;
-    root.walkAtRules('config', (rule)=>{
+    root.walkAtRules("config", (rule)=>{
         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.');
+            throw rule.error("The `@config` directive cannot be used without setting `from` in your PostCSS config.");
         }
         if (configPath) {
-            throw rule.error('Only one `@config` directive is allowed per file.');
+            throw rule.error("Only one `@config` directive is allowed per file.");
         }
         let matches = rule.params.match(/(['"])(.*?)\1/);
         if (!matches) {
-            throw rule.error('A path is required when using the `@config` directive.');
+            throw rule.error("A path is required when using the `@config` directive.");
         }
         let inputPath = matches[2];
         if (_path.default.isAbsolute(inputPath)) {
-            throw rule.error('The `@config` directive cannot be used with an absolute path.');
+            throw rule.error("The `@config` directive cannot be used with an absolute path.");
         }
         configPath = _path.default.resolve(_path.default.dirname(relativeTo), inputPath);
         if (!_fs.default.existsSync(configPath)) {