tailwindcss 3.0.8 → 3.0.9

package/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Nothing yet!
+
+## [3.0.9] - 2022-01-03
+
+### Fixed
+
+- Improve `DEBUG` flag ([#6797](https://github.com/tailwindlabs/tailwindcss/pull/6797), [#6804](https://github.com/tailwindlabs/tailwindcss/pull/6804))
+- Ensure we can use `<` and `>` characters in modifiers ([#6851](https://github.com/tailwindlabs/tailwindcss/pull/6851))
+- Validate `theme()` works in arbitrary values ([#6852](https://github.com/tailwindlabs/tailwindcss/pull/6852))
+- Properly detect `theme()` value usage in arbitrary properties ([#6854](https://github.com/tailwindlabs/tailwindcss/pull/6854))
+- Improve collapsing of duplicate declarations ([#6856](https://github.com/tailwindlabs/tailwindcss/pull/6856))
+- Remove support for `TAILWIND_MODE=watch` ([#6858](https://github.com/tailwindlabs/tailwindcss/pull/6858))
+
+## [3.0.8] - 2021-12-28
+
 ### Fixed
 
 - Reduce specificity of `abbr` rule in preflight ([#6671](https://github.com/tailwindlabs/tailwindcss/pull/6671))
@@ -1745,7 +1760,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.7...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.9...HEAD
+[3.0.9]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.8...v3.0.9
+[3.0.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.7...v3.0.8
 [3.0.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.6...v3.0.7
 [3.0.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.5...v3.0.6
 [3.0.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.4...v3.0.5

package/lib/index.js

@@ -1,6 +1,5 @@
 "use strict";
 var _setupTrackingContext = _interopRequireDefault(require("./lib/setupTrackingContext"));
-var _setupWatchingContext = _interopRequireDefault(require("./lib/setupWatchingContext"));
 var _processTailwindFeatures = _interopRequireDefault(require("./processTailwindFeatures"));
 var _sharedState = require("./lib/sharedState");
 function _interopRequireDefault(obj) {
@@ -18,8 +17,7 @@ module.exports = function tailwindcss(configOrPath) {
                 return root;
             },
             function(root, result) {
-                let setupContext = _sharedState.env.TAILWIND_MODE === 'watch' ? (0, _setupWatchingContext).default(configOrPath) : (0, _setupTrackingContext).default(configOrPath);
-                (0, _processTailwindFeatures).default(setupContext)(root, result);
+                (0, _processTailwindFeatures).default((0, _setupTrackingContext).default(configOrPath))(root, result);
             },
             _sharedState.env.DEBUG && function(root) {
                 console.timeEnd('JIT TOTAL');

package/lib/lib/collapseDuplicateDeclarations.js

@@ -8,6 +8,7 @@ function collapseDuplicateDeclarations() {
         root.walkRules((node)=>{
             let seen = new Map();
             let droppable = new Set([]);
+            let byProperty = new Map();
             node.walkDecls((decl)=>{
                 // This could happen if we have nested selectors. In that case the
                 // parent will loop over all its declarations but also the declarations
@@ -17,13 +18,63 @@ function collapseDuplicateDeclarations() {
                     return;
                 }
                 if (seen.has(decl.prop)) {
-                    droppable.add(seen.get(decl.prop));
+                    // Exact same value as what we have seen so far
+                    if (seen.get(decl.prop).value === decl.value) {
+                        // Keep the last one, drop the one we've seen so far
+                        droppable.add(seen.get(decl.prop));
+                        // Override the existing one with the new value. This is necessary
+                        // so that if we happen to have more than one declaration with the
+                        // same value, that we keep removing the previous one. Otherwise we
+                        // will only remove the *first* one.
+                        seen.set(decl.prop, decl);
+                        return;
+                    }
+                    // Not the same value, so we need to check if we can merge it so
+                    // let's collect it first.
+                    if (!byProperty.has(decl.prop)) {
+                        byProperty.set(decl.prop, new Set());
+                    }
+                    byProperty.get(decl.prop).add(seen.get(decl.prop));
+                    byProperty.get(decl.prop).add(decl);
                 }
                 seen.set(decl.prop, decl);
             });
+            // Drop all the duplicate declarations with the exact same value we've
+            // already seen so far.
             for (let decl1 of droppable){
                 decl1.remove();
             }
+            // Analyze the declarations based on its unit, drop all the declarations
+            // with the same unit but the last one in the list.
+            for (let declarations of byProperty.values()){
+                let byUnit = new Map();
+                for (let decl of declarations){
+                    let unit = resolveUnit(decl.value);
+                    if (unit === null) {
+                        continue;
+                    }
+                    if (!byUnit.has(unit)) {
+                        byUnit.set(unit, new Set());
+                    }
+                    byUnit.get(unit).add(decl);
+                }
+                for (let declarations1 of byUnit.values()){
+                    // Get all but the last one
+                    let removableDeclarations = Array.from(declarations1).slice(0, -1);
+                    for (let decl of removableDeclarations){
+                        decl.remove();
+                    }
+                }
+            }
         });
     };
 }
+let UNITLESS_NUMBER = Symbol('unitless-number');
+function resolveUnit(input) {
+    let result = /^-?\d*.?\d+([\w%]+)?$/g.exec(input);
+    if (result) {
+        var ref;
+        return (ref = result[1]) !== null && ref !== void 0 ? ref : UNITLESS_NUMBER;
+    }
+    return null;
+}

package/lib/lib/defaultExtractor.js

@@ -15,9 +15,11 @@ const PATTERNS = [
     /([^<>"'`\s]*\[\w*\("[^'`\s]*"\)\])/.source,
     /([^<>"'`\s]*\['[^"'`\s]*'\])/.source,
     /([^<>"'`\s]*\["[^"'`\s]*"\])/.source,
+    /([^<>"'`\s]*\[[^<>"'`\s]*:[^\]\s]*\])/.source,
     /([^<>"'`\s]*\[[^<>"'`\s]*:'[^"'`\s]*'\])/.source,
     /([^<>"'`\s]*\[[^<>"'`\s]*:"[^"'`\s]*"\])/.source,
     /([^<>"'`\s]*\[[^"'`\s]+\][^<>"'`\s]*)/.source,
+    /([^"'`\s]*[^<>"'`\s:\\])/.source,
     /([^<>"'`\s]*[^"'`\s:\\])/.source, 
 ].join('|');
 const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, 'g');

package/lib/lib/sharedState.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+exports.resolveDebug = resolveDebug;
 exports.contextSourcesMap = exports.configContextMap = exports.contextMap = exports.env = void 0;
 const env = {
-    TAILWIND_MODE: process.env.TAILWIND_MODE,
     NODE_ENV: process.env.NODE_ENV,
-    DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0',
-    TAILWIND_DISABLE_TOUCH: process.env.TAILWIND_DISABLE_TOUCH !== undefined,
-    TAILWIND_TOUCH_DIR: process.env.TAILWIND_TOUCH_DIR
+    DEBUG: resolveDebug(process.env.DEBUG)
 };
 exports.env = env;
 const contextMap = new Map();
@@ -17,3 +15,34 @@ const configContextMap = new Map();
 exports.configContextMap = configContextMap;
 const contextSourcesMap = new Map();
 exports.contextSourcesMap = contextSourcesMap;
+function resolveDebug(debug) {
+    if (debug === undefined) {
+        return false;
+    }
+    // Environment variables are strings, so convert to boolean
+    if (debug === 'true' || debug === '1') {
+        return true;
+    }
+    if (debug === 'false' || debug === '0') {
+        return false;
+    }
+    // Keep the debug convention into account:
+    // DEBUG=* -> This enables all debug modes
+    // 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 === '*') {
+        return true;
+    }
+    let debuggers = debug.split(',').map((d)=>d.split(':')[0]
+    );
+    // Ignoring tailwindcss
+    if (debuggers.includes('-tailwindcss')) {
+        return false;
+    }
+    // Including tailwindcss
+    if (debuggers.includes('tailwindcss')) {
+        return true;
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "prepublishOnly": "npm install --force && npm run swcify",
     "style": "eslint .",
     "pretest": "npm run generate:plugin-list",
-    "test": "cross-env TAILWIND_MODE=build jest",
+    "test": "jest",
     "test:integrations": "npm run test --prefix ./integrations",
     "install:integrations": "node scripts/install-integrations.js",
     "posttest": "npm run style",
@@ -54,7 +54,7 @@
     "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.4.3",
+    "jest": "^27.4.5",
     "jest-diff": "^27.4.2",
     "postcss": "^8.4.5",
     "postcss-cli": "^8.3.1",
@@ -85,8 +85,7 @@
     "postcss-selector-parser": "^6.0.7",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
-    "resolve": "^1.20.0",
-    "tmp": "^0.2.1"
+    "resolve": "^1.20.0"
   },
   "browserslist": [
     "> 1%",

package/src/index.js

@@ -1,5 +1,4 @@
 import setupTrackingContext from './lib/setupTrackingContext'
-import setupWatchingContext from './lib/setupWatchingContext'
 import processTailwindFeatures from './processTailwindFeatures'
 import { env } from './lib/sharedState'
 
@@ -14,12 +13,7 @@ module.exports = function tailwindcss(configOrPath) {
           return root
         },
       function (root, result) {
-        let setupContext =
-          env.TAILWIND_MODE === 'watch'
-            ? setupWatchingContext(configOrPath)
-            : setupTrackingContext(configOrPath)
-
-        processTailwindFeatures(setupContext)(root, result)
+        processTailwindFeatures(setupTrackingContext(configOrPath))(root, result)
       },
       env.DEBUG &&
         function (root) {

package/src/lib/collapseDuplicateDeclarations.js

@@ -3,6 +3,7 @@ export default function collapseDuplicateDeclarations() {
     root.walkRules((node) => {
       let seen = new Map()
       let droppable = new Set([])
+      let byProperty = new Map()
 
       node.walkDecls((decl) => {
         // This could happen if we have nested selectors. In that case the
@@ -14,15 +15,79 @@ export default function collapseDuplicateDeclarations() {
         }
 
         if (seen.has(decl.prop)) {
-          droppable.add(seen.get(decl.prop))
+          // Exact same value as what we have seen so far
+          if (seen.get(decl.prop).value === decl.value) {
+            // Keep the last one, drop the one we've seen so far
+            droppable.add(seen.get(decl.prop))
+            // Override the existing one with the new value. This is necessary
+            // so that if we happen to have more than one declaration with the
+            // same value, that we keep removing the previous one. Otherwise we
+            // will only remove the *first* one.
+            seen.set(decl.prop, decl)
+            return
+          }
+
+          // Not the same value, so we need to check if we can merge it so
+          // let's collect it first.
+          if (!byProperty.has(decl.prop)) {
+            byProperty.set(decl.prop, new Set())
+          }
+
+          byProperty.get(decl.prop).add(seen.get(decl.prop))
+          byProperty.get(decl.prop).add(decl)
         }
 
         seen.set(decl.prop, decl)
       })
 
+      // Drop all the duplicate declarations with the exact same value we've
+      // already seen so far.
       for (let decl of droppable) {
         decl.remove()
       }
+
+      // Analyze the declarations based on its unit, drop all the declarations
+      // with the same unit but the last one in the list.
+      for (let declarations of byProperty.values()) {
+        let byUnit = new Map()
+
+        for (let decl of declarations) {
+          let unit = resolveUnit(decl.value)
+          if (unit === null) {
+            // We don't have a unit, so should never try and collapse this
+            // value. This is because we can't know how to do it in a correct
+            // way (e.g.: overrides for older browsers)
+            continue
+          }
+
+          if (!byUnit.has(unit)) {
+            byUnit.set(unit, new Set())
+          }
+
+          byUnit.get(unit).add(decl)
+        }
+
+        for (let declarations of byUnit.values()) {
+          // Get all but the last one
+          let removableDeclarations = Array.from(declarations).slice(0, -1)
+
+          for (let decl of removableDeclarations) {
+            decl.remove()
+          }
+        }
+      }
     })
   }
 }
+
+let UNITLESS_NUMBER = Symbol('unitless-number')
+
+function resolveUnit(input) {
+  let result = /^-?\d*.?\d+([\w%]+)?$/g.exec(input)
+
+  if (result) {
+    return result[1] ?? UNITLESS_NUMBER
+  }
+
+  return null
+}

package/src/lib/defaultExtractor.js

@@ -10,9 +10,11 @@ const PATTERNS = [
   /([^<>"'`\s]*\[\w*\("[^'`\s]*"\)\])/.source, // bg-[url("..."),url("...")]
   /([^<>"'`\s]*\['[^"'`\s]*'\])/.source, // `content-['hello']` but not `content-['hello']']`
   /([^<>"'`\s]*\["[^"'`\s]*"\])/.source, // `content-["hello"]` but not `content-["hello"]"]`
+  /([^<>"'`\s]*\[[^<>"'`\s]*:[^\]\s]*\])/.source, // `[attr:value]`
   /([^<>"'`\s]*\[[^<>"'`\s]*:'[^"'`\s]*'\])/.source, // `[content:'hello']` but not `[content:"hello"]`
   /([^<>"'`\s]*\[[^<>"'`\s]*:"[^"'`\s]*"\])/.source, // `[content:"hello"]` but not `[content:'hello']`
   /([^<>"'`\s]*\[[^"'`\s]+\][^<>"'`\s]*)/.source, // `fill-[#bada55]`, `fill-[#bada55]/50`
+  /([^"'`\s]*[^<>"'`\s:\\])/.source, //  `<sm:underline`, `md>:font-bold`
   /([^<>"'`\s]*[^"'`\s:\\])/.source, //  `px-1.5`, `uppercase` but not `uppercase:`
 
   // Arbitrary properties

package/src/lib/sharedState.js

@@ -1,10 +1,46 @@
 export const env = {
-  TAILWIND_MODE: process.env.TAILWIND_MODE,
   NODE_ENV: process.env.NODE_ENV,
-  DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0',
-  TAILWIND_DISABLE_TOUCH: process.env.TAILWIND_DISABLE_TOUCH !== undefined,
-  TAILWIND_TOUCH_DIR: process.env.TAILWIND_TOUCH_DIR,
+  DEBUG: resolveDebug(process.env.DEBUG),
 }
 export const contextMap = new Map()
 export const configContextMap = new Map()
 export const contextSourcesMap = new Map()
+
+export function resolveDebug(debug) {
+  if (debug === undefined) {
+    return false
+  }
+
+  // Environment variables are strings, so convert to boolean
+  if (debug === 'true' || debug === '1') {
+    return true
+  }
+
+  if (debug === 'false' || debug === '0') {
+    return false
+  }
+
+  // Keep the debug convention into account:
+  // DEBUG=* -> This enables all debug modes
+  // 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 === '*') {
+    return true
+  }
+
+  let debuggers = debug.split(',').map((d) => d.split(':')[0])
+
+  // Ignoring tailwindcss
+  if (debuggers.includes('-tailwindcss')) {
+    return false
+  }
+
+  // Including tailwindcss
+  if (debuggers.includes('tailwindcss')) {
+    return true
+  }
+
+  return false
+}

package/lib/lib/setupWatchingContext.js

@@ -1,288 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports.default = setupWatchingContext;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _tmp = _interopRequireDefault(require("tmp"));
-var _chokidar = _interopRequireDefault(require("chokidar"));
-var _fastGlob = _interopRequireDefault(require("fast-glob"));
-var _quickLru = _interopRequireDefault(require("quick-lru"));
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-var _hashConfig = _interopRequireDefault(require("../util/hashConfig"));
-var _log = _interopRequireDefault(require("../util/log"));
-var _getModuleDependencies = _interopRequireDefault(require("../lib/getModuleDependencies"));
-var _resolveConfig = _interopRequireDefault(require("../public/resolve-config"));
-var _resolveConfigPath = _interopRequireDefault(require("../util/resolveConfigPath"));
-var _setupContextUtils = require("./setupContextUtils");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-// This is used to trigger rebuilds. Just updating the timestamp
-// is significantly faster than actually writing to the file (10x).
-function touch(filename) {
-    let time = new Date();
-    try {
-        _fs.default.utimesSync(filename, time, time);
-    } catch (err) {
-        _fs.default.closeSync(_fs.default.openSync(filename, 'w'));
-    }
-}
-let watchers = new WeakMap();
-function getWatcher(context) {
-    if (watchers.has(context)) {
-        return watchers.get(context);
-    }
-    return null;
-}
-function setWatcher(context, watcher) {
-    return watchers.set(context, watcher);
-}
-let touchFiles = new WeakMap();
-function getTouchFile(context) {
-    if (touchFiles.has(context)) {
-        return touchFiles.get(context);
-    }
-    return null;
-}
-function setTouchFile(context, touchFile) {
-    return touchFiles.set(context, touchFile);
-}
-let configPaths = new WeakMap();
-function getConfigPath(context, configOrPath) {
-    if (!configPaths.has(context)) {
-        configPaths.set(context, (0, _resolveConfigPath).default(configOrPath));
-    }
-    return configPaths.get(context);
-}
-function rebootWatcher(context, configPath, configDependencies, candidateFiles) {
-    let touchFile = getTouchFile(context);
-    if (touchFile === null) {
-        touchFile = _tmp.default.fileSync().name;
-        setTouchFile(context, touchFile);
-        touch(touchFile);
-    }
-    let watcher = getWatcher(context);
-    Promise.resolve(watcher ? watcher.close() : null).then(()=>{
-        _log.default.info([
-            'Tailwind CSS is watching for changes...',
-            'https://tailwindcss.com/docs/just-in-time-mode#watch-mode-and-one-off-builds', 
-        ]);
-        watcher = _chokidar.default.watch([
-            ...candidateFiles,
-            ...configDependencies
-        ], {
-            ignoreInitial: true,
-            awaitWriteFinish: process.platform === 'win32' ? {
-                stabilityThreshold: 50,
-                pollInterval: 10
-            } : false
-        });
-        setWatcher(context, watcher);
-        watcher.on('add', (file)=>{
-            let changedFile = _path.default.resolve('.', file);
-            let content = _fs.default.readFileSync(changedFile, 'utf8');
-            let extension = _path.default.extname(changedFile).slice(1);
-            context.changedContent.push({
-                content,
-                extension
-            });
-            touch(touchFile);
-        });
-        watcher.on('change', (file)=>{
-            // If it was a config dependency, touch the config file to trigger a new context.
-            // This is not really that clean of a solution but it's the fastest, because we
-            // can do a very quick check on each build to see if the config has changed instead
-            // of having to get all of the module dependencies and check every timestamp each
-            // time.
-            if (configDependencies.has(file)) {
-                for (let dependency of configDependencies){
-                    delete require.cache[require.resolve(dependency)];
-                }
-                touch(configPath);
-            } else {
-                let changedFile = _path.default.resolve('.', file);
-                let content = _fs.default.readFileSync(changedFile, 'utf8');
-                let extension = _path.default.extname(changedFile).slice(1);
-                context.changedContent.push({
-                    content,
-                    extension
-                });
-                touch(touchFile);
-            }
-        });
-        watcher.on('unlink', (file)=>{
-            // Touch the config file if any of the dependencies are deleted.
-            if (configDependencies.has(file)) {
-                for (let dependency of configDependencies){
-                    delete require.cache[require.resolve(dependency)];
-                }
-                touch(configPath);
-            }
-        });
-    });
-}
-let configPathCache = new _quickLru.default({
-    maxSize: 100
-});
-let configDependenciesCache = new WeakMap();
-function getConfigDependencies(context) {
-    if (!configDependenciesCache.has(context)) {
-        configDependenciesCache.set(context, new Set());
-    }
-    return configDependenciesCache.get(context);
-}
-let candidateFilesCache = new WeakMap();
-function getCandidateFiles(context, tailwindConfig) {
-    if (candidateFilesCache.has(context)) {
-        return candidateFilesCache.get(context);
-    }
-    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === 'string'
-    ).map((contentPath)=>(0, _normalizePath).default(contentPath)
-    );
-    return candidateFilesCache.set(context, candidateFiles).get(context);
-}
-// Get the config object based on a path
-function getTailwindConfig(configOrPath) {
-    let userConfigPath = (0, _resolveConfigPath).default(configOrPath);
-    if (userConfigPath !== null) {
-        let [prevConfig, prevModified = -Infinity, prevConfigHash] = configPathCache.get(userConfigPath) || [];
-        let modified = _fs.default.statSync(userConfigPath).mtimeMs;
-        // It hasn't changed (based on timestamp)
-        if (modified <= prevModified) {
-            return [
-                prevConfig,
-                userConfigPath,
-                prevConfigHash,
-                [
-                    userConfigPath
-                ]
-            ];
-        }
-        // It has changed (based on timestamp), or first run
-        delete require.cache[userConfigPath];
-        let newConfig = (0, _resolveConfig).default(require(userConfigPath));
-        let newHash = (0, _hashConfig).default(newConfig);
-        configPathCache.set(userConfigPath, [
-            newConfig,
-            modified,
-            newHash
-        ]);
-        return [
-            newConfig,
-            userConfigPath,
-            newHash,
-            [
-                userConfigPath
-            ]
-        ];
-    }
-    // It's a plain object, not a path
-    let newConfig = (0, _resolveConfig).default(configOrPath.config === undefined ? configOrPath : configOrPath.config);
-    return [
-        newConfig,
-        null,
-        (0, _hashConfig).default(newConfig),
-        []
-    ];
-}
-function resolvedChangedContent(context, candidateFiles) {
-    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === 'string'
-    ).map(({ raw , extension ='html'  })=>({
-            content: raw,
-            extension
-        })
-    );
-    for (let changedFile of resolveChangedFiles(context, candidateFiles)){
-        let content = _fs.default.readFileSync(changedFile, 'utf8');
-        let extension = _path.default.extname(changedFile).slice(1);
-        changedContent.push({
-            content,
-            extension
-        });
-    }
-    return changedContent;
-}
-let scannedContentCache = new WeakMap();
-function resolveChangedFiles(context, candidateFiles) {
-    let changedFiles = new Set();
-    // If we're not set up and watching files ourselves, we need to do
-    // the work of grabbing all of the template files for candidate
-    // detection.
-    if (!scannedContentCache.has(context)) {
-        let files = _fastGlob.default.sync(candidateFiles);
-        for (let file of files){
-            changedFiles.add(file);
-        }
-        scannedContentCache.set(context, true);
-    }
-    return changedFiles;
-}
-function setupWatchingContext(configOrPath) {
-    return ({ tailwindDirectives , registerDependency  })=>{
-        return (root, result)=>{
-            let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] = getTailwindConfig(configOrPath);
-            let contextDependencies = new Set(configDependencies);
-            // If there are no @tailwind 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) {
-                // 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, isNewContext] = (0, _setupContextUtils).getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies);
-            let candidateFiles = getCandidateFiles(context, tailwindConfig);
-            let contextConfigDependencies = getConfigDependencies(context);
-            for (let file of configDependencies){
-                registerDependency({
-                    type: 'dependency',
-                    file
-                });
-            }
-            context.disposables.push((oldContext)=>{
-                let watcher = getWatcher(oldContext);
-                if (watcher !== null) {
-                    watcher.close();
-                }
-            });
-            let configPath = getConfigPath(context, configOrPath);
-            if (configPath !== null) {
-                for (let dependency of (0, _getModuleDependencies).default(configPath)){
-                    if (dependency.file === configPath) {
-                        continue;
-                    }
-                    contextConfigDependencies.add(dependency.file);
-                }
-            }
-            if (isNewContext) {
-                rebootWatcher(context, configPath, contextConfigDependencies, candidateFiles);
-            }
-            // Register our temp file as a dependency — we write to this file
-            // to trigger rebuilds.
-            let touchFile = getTouchFile(context);
-            if (touchFile) {
-                registerDependency({
-                    type: 'dependency',
-                    file: touchFile
-                });
-            }
-            if (tailwindDirectives.size > 0) {
-                for (let changedContent of resolvedChangedContent(context, candidateFiles)){
-                    context.changedContent.push(changedContent);
-                }
-            }
-            return context;
-        };
-    };
-}

package/src/lib/setupWatchingContext.js

@@ -1,311 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-
-import tmp from 'tmp'
-import chokidar from 'chokidar'
-import fastGlob from 'fast-glob'
-import LRU from 'quick-lru'
-import normalizePath from 'normalize-path'
-
-import hash from '../util/hashConfig'
-import log from '../util/log'
-import getModuleDependencies from '../lib/getModuleDependencies'
-import resolveConfig from '../public/resolve-config'
-import resolveConfigPath from '../util/resolveConfigPath'
-import { getContext } from './setupContextUtils'
-
-// This is used to trigger rebuilds. Just updating the timestamp
-// is significantly faster than actually writing to the file (10x).
-
-function touch(filename) {
-  let time = new Date()
-
-  try {
-    fs.utimesSync(filename, time, time)
-  } catch (err) {
-    fs.closeSync(fs.openSync(filename, 'w'))
-  }
-}
-
-let watchers = new WeakMap()
-
-function getWatcher(context) {
-  if (watchers.has(context)) {
-    return watchers.get(context)
-  }
-
-  return null
-}
-
-function setWatcher(context, watcher) {
-  return watchers.set(context, watcher)
-}
-
-let touchFiles = new WeakMap()
-
-function getTouchFile(context) {
-  if (touchFiles.has(context)) {
-    return touchFiles.get(context)
-  }
-
-  return null
-}
-
-function setTouchFile(context, touchFile) {
-  return touchFiles.set(context, touchFile)
-}
-
-let configPaths = new WeakMap()
-
-function getConfigPath(context, configOrPath) {
-  if (!configPaths.has(context)) {
-    configPaths.set(context, resolveConfigPath(configOrPath))
-  }
-
-  return configPaths.get(context)
-}
-
-function rebootWatcher(context, configPath, configDependencies, candidateFiles) {
-  let touchFile = getTouchFile(context)
-
-  if (touchFile === null) {
-    touchFile = tmp.fileSync().name
-    setTouchFile(context, touchFile)
-    touch(touchFile)
-  }
-
-  let watcher = getWatcher(context)
-
-  Promise.resolve(watcher ? watcher.close() : null).then(() => {
-    log.info([
-      'Tailwind CSS is watching for changes...',
-      'https://tailwindcss.com/docs/just-in-time-mode#watch-mode-and-one-off-builds',
-    ])
-
-    watcher = chokidar.watch([...candidateFiles, ...configDependencies], {
-      ignoreInitial: true,
-      awaitWriteFinish:
-        process.platform === 'win32'
-          ? {
-              stabilityThreshold: 50,
-              pollInterval: 10,
-            }
-          : false,
-    })
-
-    setWatcher(context, watcher)
-
-    watcher.on('add', (file) => {
-      let changedFile = path.resolve('.', file)
-      let content = fs.readFileSync(changedFile, 'utf8')
-      let extension = path.extname(changedFile).slice(1)
-      context.changedContent.push({ content, extension })
-      touch(touchFile)
-    })
-
-    watcher.on('change', (file) => {
-      // If it was a config dependency, touch the config file to trigger a new context.
-      // This is not really that clean of a solution but it's the fastest, because we
-      // can do a very quick check on each build to see if the config has changed instead
-      // of having to get all of the module dependencies and check every timestamp each
-      // time.
-      if (configDependencies.has(file)) {
-        for (let dependency of configDependencies) {
-          delete require.cache[require.resolve(dependency)]
-        }
-        touch(configPath)
-      } else {
-        let changedFile = path.resolve('.', file)
-        let content = fs.readFileSync(changedFile, 'utf8')
-        let extension = path.extname(changedFile).slice(1)
-        context.changedContent.push({ content, extension })
-        touch(touchFile)
-      }
-    })
-
-    watcher.on('unlink', (file) => {
-      // Touch the config file if any of the dependencies are deleted.
-      if (configDependencies.has(file)) {
-        for (let dependency of configDependencies) {
-          delete require.cache[require.resolve(dependency)]
-        }
-        touch(configPath)
-      }
-    })
-  })
-}
-
-let configPathCache = new LRU({ maxSize: 100 })
-
-let configDependenciesCache = new WeakMap()
-
-function getConfigDependencies(context) {
-  if (!configDependenciesCache.has(context)) {
-    configDependenciesCache.set(context, new Set())
-  }
-
-  return configDependenciesCache.get(context)
-}
-
-let candidateFilesCache = new WeakMap()
-
-function getCandidateFiles(context, tailwindConfig) {
-  if (candidateFilesCache.has(context)) {
-    return candidateFilesCache.get(context)
-  }
-
-  let candidateFiles = tailwindConfig.content.files
-    .filter((item) => typeof item === 'string')
-    .map((contentPath) => normalizePath(contentPath))
-
-  return candidateFilesCache.set(context, candidateFiles).get(context)
-}
-
-// Get the config object based on a path
-function getTailwindConfig(configOrPath) {
-  let userConfigPath = resolveConfigPath(configOrPath)
-
-  if (userConfigPath !== null) {
-    let [prevConfig, prevModified = -Infinity, prevConfigHash] =
-      configPathCache.get(userConfigPath) || []
-    let modified = fs.statSync(userConfigPath).mtimeMs
-
-    // It hasn't changed (based on timestamp)
-    if (modified <= prevModified) {
-      return [prevConfig, userConfigPath, prevConfigHash, [userConfigPath]]
-    }
-
-    // It has changed (based on timestamp), or first run
-    delete require.cache[userConfigPath]
-    let newConfig = resolveConfig(require(userConfigPath))
-    let newHash = hash(newConfig)
-    configPathCache.set(userConfigPath, [newConfig, modified, newHash])
-    return [newConfig, userConfigPath, newHash, [userConfigPath]]
-  }
-
-  // It's a plain object, not a path
-  let newConfig = resolveConfig(
-    configOrPath.config === undefined ? configOrPath : configOrPath.config
-  )
-
-  return [newConfig, null, hash(newConfig), []]
-}
-
-function resolvedChangedContent(context, candidateFiles) {
-  let changedContent = context.tailwindConfig.content.files
-    .filter((item) => typeof item.raw === 'string')
-    .map(({ raw, extension = 'html' }) => ({ content: raw, extension }))
-
-  for (let changedFile of resolveChangedFiles(context, candidateFiles)) {
-    let content = fs.readFileSync(changedFile, 'utf8')
-    let extension = path.extname(changedFile).slice(1)
-    changedContent.push({ content, extension })
-  }
-  return changedContent
-}
-
-let scannedContentCache = new WeakMap()
-
-function resolveChangedFiles(context, candidateFiles) {
-  let changedFiles = new Set()
-
-  // If we're not set up and watching files ourselves, we need to do
-  // the work of grabbing all of the template files for candidate
-  // detection.
-  if (!scannedContentCache.has(context)) {
-    let files = fastGlob.sync(candidateFiles)
-    for (let file of files) {
-      changedFiles.add(file)
-    }
-    scannedContentCache.set(context, true)
-  }
-
-  return changedFiles
-}
-
-// DISABLE_TOUCH = FALSE
-
-// Retrieve an existing context from cache if possible (since contexts are unique per
-// source path), or set up a new one (including setting up watchers and registering
-// plugins) then return it
-export default function setupWatchingContext(configOrPath) {
-  return ({ tailwindDirectives, registerDependency }) => {
-    return (root, result) => {
-      let [tailwindConfig, userConfigPath, tailwindConfigHash, configDependencies] =
-        getTailwindConfig(configOrPath)
-
-      let contextDependencies = new Set(configDependencies)
-
-      // If there are no @tailwind 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) {
-        // 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, isNewContext] = getContext(
-        root,
-        result,
-        tailwindConfig,
-        userConfigPath,
-        tailwindConfigHash,
-        contextDependencies
-      )
-
-      let candidateFiles = getCandidateFiles(context, tailwindConfig)
-      let contextConfigDependencies = getConfigDependencies(context)
-
-      for (let file of configDependencies) {
-        registerDependency({ type: 'dependency', file })
-      }
-
-      context.disposables.push((oldContext) => {
-        let watcher = getWatcher(oldContext)
-        if (watcher !== null) {
-          watcher.close()
-        }
-      })
-
-      let configPath = getConfigPath(context, configOrPath)
-
-      if (configPath !== null) {
-        for (let dependency of getModuleDependencies(configPath)) {
-          if (dependency.file === configPath) {
-            continue
-          }
-
-          contextConfigDependencies.add(dependency.file)
-        }
-      }
-
-      if (isNewContext) {
-        rebootWatcher(context, configPath, contextConfigDependencies, candidateFiles)
-      }
-
-      // Register our temp file as a dependency — we write to this file
-      // to trigger rebuilds.
-      let touchFile = getTouchFile(context)
-      if (touchFile) {
-        registerDependency({ type: 'dependency', file: touchFile })
-      }
-
-      if (tailwindDirectives.size > 0) {
-        for (let changedContent of resolvedChangedContent(context, candidateFiles)) {
-          context.changedContent.push(changedContent)
-        }
-      }
-
-      return context
-    }
-  }
-}