tailwindcss 3.0.21 → 3.0.24

package/lib/lib/setupTrackingContext.js

@@ -15,6 +15,57 @@ var _resolveConfigPath = _interopRequireDefault(require("../util/resolveConfigPa
 var _sharedState = require("./sharedState");
 var _setupContextUtils = require("./setupContextUtils");
 var _parseDependency = _interopRequireDefault(require("../util/parseDependency"));
+function setupTrackingContext(configOrPath) {
+    return ({ tailwindDirectives , registerDependency  })=>{
+        return (root, result)=>{
+            let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] = getTailwindConfig(configOrPath);
+            let contextDependencies = new Set(configDependencies);
+            // If there are no @tailwind or @apply rules, we don't consider this CSS
+            // file or its dependencies to be dependencies of the context. Can reuse
+            // the context even if they change. We may want to think about `@layer`
+            // being part of this trigger too, but it's tough because it's impossible
+            // for a layer in one file to end up in the actual @tailwind rule in
+            // another file since independent sources are effectively isolated.
+            if (tailwindDirectives.size > 0) {
+                // Add current css file as a context dependencies.
+                contextDependencies.add(result.opts.from);
+                // Add all css @import dependencies as context dependencies.
+                for (let message of result.messages){
+                    if (message.type === "dependency") {
+                        contextDependencies.add(message.file);
+                    }
+                }
+            }
+            let [context] = (0, _setupContextUtils).getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
+            let candidateFiles = getCandidateFiles(context, tailwindConfig);
+            // If there are no @tailwind or @apply rules, we don't consider this CSS file or it's
+            // dependencies to be dependencies of the context. Can reuse the context even if they change.
+            // We may want to think about `@layer` being part of this trigger too, but it's tough
+            // because it's impossible for a layer in one file to end up in the actual @tailwind rule
+            // in another file since independent sources are effectively isolated.
+            if (tailwindDirectives.size > 0) {
+                let fileModifiedMap = (0, _setupContextUtils).getFileModifiedMap(context);
+                // Add template paths as postcss dependencies.
+                for (let fileOrGlob of candidateFiles){
+                    let dependency = (0, _parseDependency).default(fileOrGlob);
+                    if (dependency) {
+                        registerDependency(dependency);
+                    }
+                }
+                for (let changedContent of resolvedChangedContent(context, candidateFiles, fileModifiedMap)){
+                    context.changedContent.push(changedContent);
+                }
+            }
+            for (let file of configDependencies){
+                registerDependency({
+                    type: "dependency",
+                    file
+                });
+            }
+            return context;
+        };
+    };
+}
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -28,7 +79,7 @@ function getCandidateFiles(context, tailwindConfig) {
     if (candidateFilesCache.has(context)) {
         return candidateFilesCache.get(context);
     }
-    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === 'string'
+    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === "string"
     ).map((contentPath)=>(0, _normalizePath).default(contentPath)
     );
     return candidateFilesCache.set(context, candidateFiles).get(context);
@@ -87,14 +138,14 @@ function getTailwindConfig(configOrPath) {
     ];
 }
 function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
-    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === 'string'
-    ).map(({ raw , extension ='html'  })=>({
+    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === "string"
+    ).map(({ raw , extension ="html"  })=>({
             content: raw,
             extension
         })
     );
     for (let changedFile of resolveChangedFiles(candidateFiles, fileModifiedMap)){
-        let content = _fs.default.readFileSync(changedFile, 'utf8');
+        let content = _fs.default.readFileSync(changedFile, "utf8");
         let extension = _path.default.extname(changedFile).slice(1);
         changedContent.push({
             content,
@@ -105,7 +156,7 @@ function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
 }
 function resolveChangedFiles(candidateFiles, fileModifiedMap) {
     let changedFiles = new Set();
-    _sharedState.env.DEBUG && console.time('Finding changed files');
+    _sharedState.env.DEBUG && console.time("Finding changed files");
     let files = _fastGlob.default.sync(candidateFiles);
     for (let file of files){
         let prevModified = fileModifiedMap.has(file) ? fileModifiedMap.get(file) : -Infinity;
@@ -115,57 +166,6 @@ function resolveChangedFiles(candidateFiles, fileModifiedMap) {
             fileModifiedMap.set(file, modified);
         }
     }
-    _sharedState.env.DEBUG && console.timeEnd('Finding changed files');
+    _sharedState.env.DEBUG && console.timeEnd("Finding changed files");
     return changedFiles;
 }
-function setupTrackingContext(configOrPath) {
-    return ({ tailwindDirectives , registerDependency , applyDirectives  })=>{
-        return (root, result)=>{
-            let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] = getTailwindConfig(configOrPath);
-            let contextDependencies = new Set(configDependencies);
-            // If there are no @tailwind or @apply rules, we don't consider this CSS
-            // file or its dependencies to be dependencies of the context. Can reuse
-            // the context even if they change. We may want to think about `@layer`
-            // being part of this trigger too, but it's tough because it's impossible
-            // for a layer in one file to end up in the actual @tailwind rule in
-            // another file since independent sources are effectively isolated.
-            if (tailwindDirectives.size > 0 || applyDirectives.size > 0) {
-                // Add current css file as a context dependencies.
-                contextDependencies.add(result.opts.from);
-                // Add all css @import dependencies as context dependencies.
-                for (let message of result.messages){
-                    if (message.type === 'dependency') {
-                        contextDependencies.add(message.file);
-                    }
-                }
-            }
-            let [context] = (0, _setupContextUtils).getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
-            let candidateFiles = getCandidateFiles(context, tailwindConfig);
-            // If there are no @tailwind or @apply rules, we don't consider this CSS file or it's
-            // dependencies to be dependencies of the context. Can reuse the context even if they change.
-            // We may want to think about `@layer` being part of this trigger too, but it's tough
-            // because it's impossible for a layer in one file to end up in the actual @tailwind rule
-            // in another file since independent sources are effectively isolated.
-            if (tailwindDirectives.size > 0 || applyDirectives.size > 0) {
-                let fileModifiedMap = (0, _setupContextUtils).getFileModifiedMap(context);
-                // Add template paths as postcss dependencies.
-                for (let fileOrGlob of candidateFiles){
-                    let dependency = (0, _parseDependency).default(fileOrGlob);
-                    if (dependency) {
-                        registerDependency(dependency);
-                    }
-                }
-                for (let changedContent of resolvedChangedContent(context, candidateFiles, fileModifiedMap)){
-                    context.changedContent.push(changedContent);
-                }
-            }
-            for (let file of configDependencies){
-                registerDependency({
-                    type: 'dependency',
-                    file
-                });
-            }
-            return context;
-        };
-    };
-}

package/lib/lib/sharedState.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.resolveDebug = resolveDebug;
-exports.contextSourcesMap = exports.configContextMap = exports.contextMap = exports.env = void 0;
+exports.NOT_ON_DEMAND = exports.sourceHashMap = exports.contextSourcesMap = exports.configContextMap = exports.contextMap = exports.env = void 0;
 const env = {
     NODE_ENV: process.env.NODE_ENV,
     DEBUG: resolveDebug(process.env.DEBUG)
@@ -15,15 +15,19 @@ const configContextMap = new Map();
 exports.configContextMap = configContextMap;
 const contextSourcesMap = new Map();
 exports.contextSourcesMap = contextSourcesMap;
+const sourceHashMap = new Map();
+exports.sourceHashMap = sourceHashMap;
+const NOT_ON_DEMAND = new String("*");
+exports.NOT_ON_DEMAND = NOT_ON_DEMAND;
 function resolveDebug(debug) {
     if (debug === undefined) {
         return false;
     }
     // Environment variables are strings, so convert to boolean
-    if (debug === 'true' || debug === '1') {
+    if (debug === "true" || debug === "1") {
         return true;
     }
-    if (debug === 'false' || debug === '0') {
+    if (debug === "false" || debug === "0") {
         return false;
     }
     // Keep the debug convention into account:
@@ -31,17 +35,17 @@ function resolveDebug(debug) {
     // DEBUG=projectA,projectB,projectC -> This enables debug for projectA, projectB and projectC
     // DEBUG=projectA:* -> This enables all debug modes for projectA (if you have sub-types)
     // DEBUG=projectA,-projectB -> This enables debug for projectA and explicitly disables it for projectB
-    if (debug === '*') {
+    if (debug === "*") {
         return true;
     }
-    let debuggers = debug.split(',').map((d)=>d.split(':')[0]
+    let debuggers = debug.split(",").map((d)=>d.split(":")[0]
     );
     // Ignoring tailwindcss
-    if (debuggers.includes('-tailwindcss')) {
+    if (debuggers.includes("-tailwindcss")) {
         return false;
     }
     // Including tailwindcss
-    if (debuggers.includes('tailwindcss')) {
+    if (debuggers.includes("tailwindcss")) {
         return true;
     }
     return false;

package/lib/lib/substituteScreenAtRules.js

@@ -12,7 +12,7 @@ function _interopRequireDefault(obj) {
 }
 function _default({ tailwindConfig: { theme  }  }) {
     return function(css) {
-        css.walkAtRules('screen', (atRule)=>{
+        css.walkAtRules("screen", (atRule)=>{
             let screen = atRule.params;
             let screens = (0, _normalizeScreens).normalizeScreens(theme.screens);
             let screenDefinition = screens.find(({ name  })=>name === screen
@@ -20,7 +20,7 @@ function _default({ tailwindConfig: { theme  }  }) {
             if (!screenDefinition) {
                 throw atRule.error(`No \`${screen}\` screen found.`);
             }
-            atRule.name = 'media';
+            atRule.name = "media";
             atRule.params = (0, _buildMediaQuery).default(screenDefinition);
         });
     };

package/lib/postcss-plugins/nesting/README.md

@@ -1,6 +1,6 @@
 # tailwindcss/nesting
 
-This is a PostCSS plugin that wraps [postcss-nested](https://github.com/postcss/postcss-nested) or [postcss-nesting](https://github.com/jonathantneal/postcss-nesting) and acts as a compatibility layer to make sure your nesting plugin of choice properly understands Tailwind's custom syntax like `@apply` and `@screen`.
+This is a PostCSS plugin that wraps [postcss-nested](https://github.com/postcss/postcss-nested) or [postcss-nesting](https://github.com/csstools/postcss-plugins/tree/main/plugins/postcss-nesting) and acts as a compatibility layer to make sure your nesting plugin of choice properly understands Tailwind's custom syntax like `@apply` and `@screen`.
 
 Add it to your PostCSS configuration, somewhere before Tailwind itself:
 
@@ -18,7 +18,7 @@ module.exports = {
 
 By default, it uses the [postcss-nested](https://github.com/postcss/postcss-nested) plugin under the hood, which uses a Sass-like syntax and is the plugin that powers nesting support in the [Tailwind CSS plugin API](https://tailwindcss.com/docs/plugins#css-in-js-syntax).
 
-If you'd rather use [postcss-nesting](https://github.com/jonathantneal/postcss-nesting) (which is based on the work-in-progress [CSS Nesting](https://drafts.csswg.org/css-nesting-1/) specification), first install the plugin alongside:
+If you'd rather use [postcss-nesting](https://github.com/csstools/postcss-plugins/tree/main/plugins/postcss-nesting) (which is based on the work-in-progress [CSS Nesting](https://drafts.csswg.org/css-nesting-1/) specification), first install the plugin alongside:
 
 ```shell
 npm install postcss-nesting

package/lib/postcss-plugins/nesting/index.js

@@ -6,7 +6,7 @@ exports.default = void 0;
 var _plugin = require("./plugin");
 var _default = Object.assign(function(opts) {
     return {
-        postcssPlugin: 'tailwindcss/nesting',
+        postcssPlugin: "tailwindcss/nesting",
         Once (root, { result  }) {
             return (0, _plugin).nesting(opts)(root, result);
         }

package/lib/postcss-plugins/nesting/plugin.js

@@ -12,13 +12,13 @@ function _interopRequireDefault(obj) {
 }
 function nesting(opts = _postcssNested.default) {
     return (root, result)=>{
-        root.walkAtRules('screen', (rule)=>{
-            rule.name = 'media';
+        root.walkAtRules("screen", (rule)=>{
+            rule.name = "media";
             rule.params = `screen(${rule.params})`;
         });
-        root.walkAtRules('apply', (rule)=>{
+        root.walkAtRules("apply", (rule)=>{
             rule.before(_postcss.default.decl({
-                prop: '__apply',
+                prop: "__apply",
                 value: rule.params,
                 source: rule.source
             }));
@@ -26,28 +26,60 @@ function nesting(opts = _postcssNested.default) {
         });
         let plugin = (()=>{
             var ref;
-            if (typeof opts === 'function' || typeof opts === 'object' && (opts === null || opts === void 0 ? void 0 : (ref = opts.hasOwnProperty) === null || ref === void 0 ? void 0 : ref.call(opts, 'postcssPlugin'))) {
+            if (typeof opts === "function" || typeof opts === "object" && (opts === null || opts === void 0 ? void 0 : (ref = opts.hasOwnProperty) === null || ref === void 0 ? void 0 : ref.call(opts, "postcssPlugin"))) {
                 return opts;
             }
-            if (typeof opts === 'string') {
+            if (typeof opts === "string") {
                 return require(opts);
             }
             if (Object.keys(opts).length <= 0) {
                 return _postcssNested.default;
             }
-            throw new Error('tailwindcss/nesting should be loaded with a nesting plugin.');
+            throw new Error("tailwindcss/nesting should be loaded with a nesting plugin.");
         })();
         (0, _postcss).default([
             plugin
         ]).process(root, result.opts).sync();
-        root.walkDecls('__apply', (decl)=>{
+        root.walkDecls("__apply", (decl)=>{
             decl.before(_postcss.default.atRule({
-                name: 'apply',
+                name: "apply",
                 params: decl.value,
                 source: decl.source
             }));
             decl.remove();
         });
+        /**
+     * Use a private PostCSS API to remove the "clean" flag from the entire AST.
+     * This is done because running process() on the AST will set the "clean"
+     * flag on all nodes, which we don't want.
+     *
+     * This causes downstream plugins using the visitor API to be skipped.
+     *
+     * This is guarded because the PostCSS API is not public
+     * and may change in future versions of PostCSS.
+     *
+     * See https://github.com/postcss/postcss/issues/1712 for more details
+     *
+     * @param {import('postcss').Node} node
+     */ function markDirty(node) {
+            if (!("markDirty" in node)) {
+                return;
+            }
+            // Traverse the tree down to the leaf nodes
+            if (node.nodes) {
+                node.nodes.forEach((n)=>markDirty(n)
+                );
+            }
+            // If it's a leaf node mark it as dirty
+            // We do this here because marking a node as dirty
+            // will walk up the tree and mark all parents as dirty
+            // resulting in a lot of unnecessary work if we did this
+            // for every single node
+            if (!node.nodes) {
+                node.markDirty();
+            }
+        }
+        markDirty(root);
         return root;
     };
 }

package/lib/processTailwindFeatures.js

@@ -15,11 +15,6 @@ var _partitionApplyAtRules = _interopRequireDefault(require("./lib/partitionAppl
 var _detectNesting = _interopRequireDefault(require("./lib/detectNesting"));
 var _setupContextUtils = require("./lib/setupContextUtils");
 var _featureFlags = require("./featureFlags");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function processTailwindFeatures(setupContext) {
     return function(root, result) {
         let { tailwindDirectives , applyDirectives  } = (0, _normalizeTailwindDirectives).default(root);
@@ -32,7 +27,7 @@ function processTailwindFeatures(setupContext) {
             applyDirectives,
             registerDependency (dependency) {
                 result.messages.push({
-                    plugin: 'tailwindcss',
+                    plugin: "tailwindcss",
                     parent: result.opts.from,
                     ...dependency
                 });
@@ -41,7 +36,7 @@ function processTailwindFeatures(setupContext) {
                 return (0, _setupContextUtils).createContext(tailwindConfig, changedContent, root);
             }
         })(root, result);
-        if (context.tailwindConfig.separator === '-') {
+        if (context.tailwindConfig.separator === "-") {
             throw new Error("The '-' character cannot be used as a custom separator in JIT mode due to parsing ambiguity. Please use another character like '_' instead.");
         }
         (0, _featureFlags).issueFlagNotices(context.tailwindConfig);
@@ -57,3 +52,8 @@ function processTailwindFeatures(setupContext) {
         (0, _collapseDuplicateDeclarations).default(context)(root, result);
     };
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}