tailwindcss 3.1.8 → 3.2.0

package/README.md

@@ -1,9 +1,10 @@
 <p align="center">
-  <a href="https://tailwindcss.com/#gh-light-mode-only" target="_blank">
-    <img src="./.github/logo-light.svg" alt="Tailwind CSS" width="350" height="70">
-  </a>
-  <a href="https://tailwindcss.com/#gh-dark-mode-only" target="_blank">
-    <img src="./.github/logo-dark.svg" alt="Tailwind CSS" width="350" height="70">
+  <a href="https://tailwindcss.com" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="./.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="./.github/logo-light.svg">
+      <img alt="Tailwind CSS" src="./.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+    </picture>
   </a>
 </p>
 

package/lib/cli/build/deps.js

@@ -0,0 +1,54 @@
+// @ts-check
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    loadPostcss: ()=>loadPostcss,
+    loadPostcssImport: ()=>loadPostcssImport,
+    loadCssNano: ()=>loadCssNano,
+    loadAutoprefixer: ()=>loadAutoprefixer
+});
+const _indexJs = require("../../../peers/index.js");
+function loadPostcss() {
+    // Try to load a local `postcss` version first
+    try {
+        return require("postcss");
+    } catch  {}
+    return (0, _indexJs.lazyPostcss)();
+}
+function loadPostcssImport() {
+    // Try to load a local `postcss-import` version first
+    try {
+        return require("postcss-import");
+    } catch  {}
+    return (0, _indexJs.lazyPostcssImport)();
+}
+function loadCssNano() {
+    let options = {
+        preset: [
+            "default",
+            {
+                cssDeclarationSorter: false
+            }
+        ]
+    };
+    // Try to load a local `cssnano` version first
+    try {
+        return require("cssnano");
+    } catch  {}
+    return (0, _indexJs.lazyCssnano)()(options);
+}
+function loadAutoprefixer() {
+    // Try to load a local `autoprefixer` version first
+    try {
+        return require("autoprefixer");
+    } catch  {}
+    return (0, _indexJs.lazyAutoprefixer)();
+}

package/lib/cli/build/index.js

@@ -0,0 +1,44 @@
+// @ts-check
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "build", {
+    enumerable: true,
+    get: ()=>build
+});
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _pluginJs = require("./plugin.js");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function build(args, configs) {
+    let input = args["--input"];
+    let shouldWatch = args["--watch"];
+    // TODO: Deprecate this in future versions
+    if (!input && args["_"][1]) {
+        console.error("[deprecation] Running tailwindcss without -i, please provide an input file.");
+        input = args["--input"] = args["_"][1];
+    }
+    if (input && input !== "-" && !_fs.default.existsSync(input = _path.default.resolve(input))) {
+        console.error(`Specified input file ${args["--input"]} does not exist.`);
+        process.exit(9);
+    }
+    if (args["--config"] && !_fs.default.existsSync(args["--config"] = _path.default.resolve(args["--config"]))) {
+        console.error(`Specified config file ${args["--config"]} does not exist.`);
+        process.exit(9);
+    }
+    // TODO: Reference the @config path here if exists
+    let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
+    let processor = await (0, _pluginJs.createProcessor)(args, configPath);
+    if (shouldWatch) {
+        /* Abort the watcher if stdin is closed to avoid zombie processes */ process.stdin.on("end", ()=>process.exit(0));
+        process.stdin.resume();
+        await processor.watch();
+    } else {
+        await processor.build();
+    }
+}

package/lib/cli/build/plugin.js

@@ -0,0 +1,335 @@
+// @ts-check
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createProcessor", {
+    enumerable: true,
+    get: ()=>createProcessor
+});
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _postcssLoadConfig = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config"));
+const _lilconfig = require("lilconfig");
+const _plugins = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
+));
+const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
+));
+const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("../../processTailwindFeatures"));
+const _deps = require("./deps");
+const _utils = require("./utils");
+const _shared = require("../shared");
+const _resolveConfigJs = /*#__PURE__*/ _interopRequireDefault(require("../../../resolveConfig.js"));
+const _getModuleDependenciesJs = /*#__PURE__*/ _interopRequireDefault(require("../../lib/getModuleDependencies.js"));
+const _contentJs = require("../../lib/content.js");
+const _watchingJs = require("./watching.js");
+const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
+const _findAtConfigPathJs = require("../../lib/findAtConfigPath.js");
+const _log = /*#__PURE__*/ _interopRequireDefault(require("../../util/log"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+/**
+ *
+ * @param {string} [customPostCssPath ]
+ * @returns
+ */ async function loadPostCssPlugins(customPostCssPath) {
+    let config = customPostCssPath ? await (async ()=>{
+        let file = _path.default.resolve(customPostCssPath);
+        // Implementation, see: https://unpkg.com/browse/postcss-load-config@3.1.0/src/index.js
+        // @ts-ignore
+        let { config ={}  } = await (0, _lilconfig.lilconfig)("postcss").load(file);
+        if (typeof config === "function") {
+            config = config();
+        } else {
+            config = Object.assign({}, config);
+        }
+        if (!config.plugins) {
+            config.plugins = [];
+        }
+        return {
+            file,
+            plugins: (0, _plugins.default)(config, file),
+            options: (0, _options.default)(config, file)
+        };
+    })() : await (0, _postcssLoadConfig.default)();
+    let configPlugins = config.plugins;
+    let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
+        if (typeof plugin === "function" && plugin.name === "tailwindcss") {
+            return true;
+        }
+        if (typeof plugin === "object" && plugin !== null && plugin.postcssPlugin === "tailwindcss") {
+            return true;
+        }
+        return false;
+    });
+    let beforePlugins = configPluginTailwindIdx === -1 ? [] : configPlugins.slice(0, configPluginTailwindIdx);
+    let afterPlugins = configPluginTailwindIdx === -1 ? configPlugins : configPlugins.slice(configPluginTailwindIdx + 1);
+    return [
+        beforePlugins,
+        afterPlugins,
+        config.options
+    ];
+}
+function loadBuiltinPostcssPlugins() {
+    let postcss = (0, _deps.loadPostcss)();
+    let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
+    return [
+        [
+            (root)=>{
+                root.walkAtRules("import", (rule)=>{
+                    if (rule.params.slice(1).startsWith("tailwindcss/")) {
+                        rule.after(postcss.comment({
+                            text: IMPORT_COMMENT + rule.params
+                        }));
+                        rule.remove();
+                    }
+                });
+            },
+            (0, _deps.loadPostcssImport)(),
+            (root)=>{
+                root.walkComments((rule)=>{
+                    if (rule.text.startsWith(IMPORT_COMMENT)) {
+                        rule.after(postcss.atRule({
+                            name: "import",
+                            params: rule.text.replace(IMPORT_COMMENT, "")
+                        }));
+                        rule.remove();
+                    }
+                });
+            }
+        ],
+        [],
+        {}
+    ];
+}
+let state = {
+    /** @type {any} */ context: null,
+    /** @type {ReturnType<typeof createWatcher> | null} */ watcher: null,
+    /** @type {{content: string, extension: string}[]} */ changedContent: [],
+    configDependencies: new Set(),
+    contextDependencies: new Set(),
+    /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
+    refreshContentPaths () {
+        var ref;
+        this.contentPaths = (0, _contentJs.parseCandidateFiles)(this.context, (ref = this.context) === null || ref === void 0 ? void 0 : ref.tailwindConfig);
+    },
+    get config () {
+        return this.context.tailwindConfig;
+    },
+    get contentPatterns () {
+        return {
+            all: this.contentPaths.map((contentPath)=>contentPath.pattern),
+            dynamic: this.contentPaths.filter((contentPath)=>contentPath.glob !== undefined).map((contentPath)=>contentPath.pattern)
+        };
+    },
+    loadConfig (configPath, content) {
+        if (this.watcher && configPath) {
+            this.refreshConfigDependencies(configPath);
+        }
+        let config = configPath ? require(configPath) : {};
+        // @ts-ignore
+        config = (0, _resolveConfigJs.default)(config, {
+            content: {
+                files: []
+            }
+        });
+        // Override content files if `--content` has been passed explicitly
+        if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
+            config.content.files = content;
+        }
+        return config;
+    },
+    refreshConfigDependencies (configPath) {
+        _shared.env.DEBUG && console.time("Module dependencies");
+        for (let file of this.configDependencies){
+            delete require.cache[require.resolve(file)];
+        }
+        if (configPath) {
+            let deps = (0, _getModuleDependenciesJs.default)(configPath).map(({ file  })=>file);
+            for (let dependency of deps){
+                this.configDependencies.add(dependency);
+            }
+        }
+        _shared.env.DEBUG && console.timeEnd("Module dependencies");
+    },
+    readContentPaths () {
+        let content = [];
+        // Resolve globs from the content config
+        // TODO: When we make the postcss plugin async-capable this can become async
+        let files = _fastGlob.default.sync(this.contentPatterns.all);
+        for (let file of files){
+            content.push({
+                content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
+                extension: _path.default.extname(file).slice(1)
+            });
+        }
+        // Resolve raw content in the tailwind config
+        let rawContent = this.config.content.files.filter((file)=>{
+            return file !== null && typeof file === "object";
+        });
+        for (let { raw: content1 , extension ="html"  } of rawContent){
+            content1.push({
+                content: content1,
+                extension
+            });
+        }
+        return content;
+    },
+    getContext ({ createContext , cliConfigPath , root , result , content  }) {
+        if (this.context) {
+            this.context.changedContent = this.changedContent.splice(0);
+            return this.context;
+        }
+        _shared.env.DEBUG && console.time("Searching for config");
+        var ref;
+        let configPath = (ref = (0, _findAtConfigPathJs.findAtConfigPath)(root, result)) !== null && ref !== void 0 ? ref : cliConfigPath;
+        _shared.env.DEBUG && console.timeEnd("Searching for config");
+        _shared.env.DEBUG && console.time("Loading config");
+        let config = this.loadConfig(configPath, content);
+        _shared.env.DEBUG && console.timeEnd("Loading config");
+        _shared.env.DEBUG && console.time("Creating context");
+        this.context = createContext(config, []);
+        Object.assign(this.context, {
+            userConfigPath: configPath
+        });
+        _shared.env.DEBUG && console.timeEnd("Creating context");
+        _shared.env.DEBUG && console.time("Resolving content paths");
+        this.refreshContentPaths();
+        _shared.env.DEBUG && console.timeEnd("Resolving content paths");
+        if (this.watcher) {
+            _shared.env.DEBUG && console.time("Watch new files");
+            this.watcher.refreshWatchedFiles();
+            _shared.env.DEBUG && console.timeEnd("Watch new files");
+        }
+        _shared.env.DEBUG && console.time("Reading content files");
+        for (let file of this.readContentPaths()){
+            this.context.changedContent.push(file);
+        }
+        _shared.env.DEBUG && console.timeEnd("Reading content files");
+        return this.context;
+    }
+};
+async function createProcessor(args, cliConfigPath) {
+    var ref;
+    let postcss = (0, _deps.loadPostcss)();
+    let input = args["--input"];
+    let output = args["--output"];
+    let includePostCss = args["--postcss"];
+    let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
+    let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : loadBuiltinPostcssPlugins();
+    if (args["--purge"]) {
+        _log.default.warn("purge-flag-deprecated", [
+            "The `--purge` flag has been deprecated.",
+            "Please use `--content` instead."
+        ]);
+        if (!args["--content"]) {
+            args["--content"] = args["--purge"];
+        }
+    }
+    var ref1;
+    let content = (ref1 = (ref = args["--content"]) === null || ref === void 0 ? void 0 : ref.split(/(?<!{[^}]+),/)) !== null && ref1 !== void 0 ? ref1 : [];
+    let tailwindPlugin = ()=>{
+        return {
+            postcssPlugin: "tailwindcss",
+            Once (root, { result  }) {
+                _shared.env.DEBUG && console.time("Compiling CSS");
+                (0, _processTailwindFeatures.default)(({ createContext  })=>{
+                    console.error();
+                    console.error("Rebuilding...");
+                    return ()=>{
+                        return state.getContext({
+                            createContext,
+                            cliConfigPath,
+                            root,
+                            result,
+                            content
+                        });
+                    };
+                })(root, result);
+                _shared.env.DEBUG && console.timeEnd("Compiling CSS");
+            }
+        };
+    };
+    tailwindPlugin.postcss = true;
+    let plugins = [
+        ...beforePlugins,
+        tailwindPlugin,
+        !args["--minify"] && _utils.formatNodes,
+        ...afterPlugins,
+        !args["--no-autoprefixer"] && (0, _deps.loadAutoprefixer)(),
+        args["--minify"] && (0, _deps.loadCssNano)()
+    ].filter(Boolean);
+    /** @type {import('postcss').Processor} */ // @ts-ignore
+    let processor = postcss(plugins);
+    async function readInput() {
+        // Piping in data, let's drain the stdin
+        if (input === "-") {
+            return (0, _utils.drainStdin)();
+        }
+        // Input file has been provided
+        if (input) {
+            return _fs.default.promises.readFile(_path.default.resolve(input), "utf8");
+        }
+        // No input file provided, fallback to default atrules
+        return "@tailwind base; @tailwind components; @tailwind utilities";
+    }
+    async function build() {
+        let start = process.hrtime.bigint();
+        return readInput().then((css)=>processor.process(css, {
+                ...postcssOptions,
+                from: input,
+                to: output
+            })).then((result)=>{
+            if (!output) {
+                process.stdout.write(result.css);
+                return;
+            }
+            return Promise.all([
+                (0, _utils.outputFile)(output, result.css),
+                result.map && (0, _utils.outputFile)(output + ".map", result.map.toString())
+            ]);
+        }).then(()=>{
+            let end = process.hrtime.bigint();
+            console.error();
+            console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
+        });
+    }
+    /**
+   * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
+   */ async function parseChanges(changes) {
+        return Promise.all(changes.map(async (change)=>({
+                content: await change.content(),
+                extension: change.extension
+            })));
+    }
+    if (input !== undefined && input !== "-") {
+        state.contextDependencies.add(_path.default.resolve(input));
+    }
+    return {
+        build,
+        watch: async ()=>{
+            state.watcher = (0, _watchingJs.createWatcher)(args, {
+                state,
+                /**
+         * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
+         */ async rebuild (changes) {
+                    let needsNewContext = changes.some((change)=>{
+                        return state.configDependencies.has(change.file) || state.contextDependencies.has(change.file);
+                    });
+                    if (needsNewContext) {
+                        state.context = null;
+                    } else {
+                        for (let change of (await parseChanges(changes))){
+                            state.changedContent.push(change);
+                        }
+                    }
+                    return build();
+                }
+            });
+            await build();
+        }
+    };
+}

package/lib/cli/build/utils.js

@@ -0,0 +1,78 @@
+// @ts-check
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    indentRecursive: ()=>indentRecursive,
+    formatNodes: ()=>formatNodes,
+    readFileWithRetries: ()=>readFileWithRetries,
+    drainStdin: ()=>drainStdin,
+    outputFile: ()=>outputFile
+});
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function indentRecursive(node, indent = 0) {
+    node.each && node.each((child, i)=>{
+        if (!child.raws.before || !child.raws.before.trim() || child.raws.before.includes("\n")) {
+            child.raws.before = `\n${node.type !== "rule" && i > 0 ? "\n" : ""}${"  ".repeat(indent)}`;
+        }
+        child.raws.after = `\n${"  ".repeat(indent)}`;
+        indentRecursive(child, indent + 1);
+    });
+}
+function formatNodes(root) {
+    indentRecursive(root);
+    if (root.first) {
+        root.first.raws.before = "";
+    }
+}
+async function readFileWithRetries(path, tries = 5) {
+    for(let n = 0; n <= tries; n++){
+        try {
+            return await _fs.default.promises.readFile(path, "utf8");
+        } catch (err) {
+            if (n !== tries) {
+                if (err.code === "ENOENT" || err.code === "EBUSY") {
+                    await new Promise((resolve)=>setTimeout(resolve, 10));
+                    continue;
+                }
+            }
+            throw err;
+        }
+    }
+}
+function drainStdin() {
+    return new Promise((resolve, reject)=>{
+        let result = "";
+        process.stdin.on("data", (chunk)=>{
+            result += chunk;
+        });
+        process.stdin.on("end", ()=>resolve(result));
+        process.stdin.on("error", (err)=>reject(err));
+    });
+}
+async function outputFile(file, newContents) {
+    try {
+        let currentContents = await _fs.default.promises.readFile(file, "utf8");
+        if (currentContents === newContents) {
+            return; // Skip writing the file
+        }
+    } catch  {}
+    // Write the file
+    await _fs.default.promises.mkdir(_path.default.dirname(file), {
+        recursive: true
+    });
+    await _fs.default.promises.writeFile(file, newContents, "utf8");
+}

package/lib/cli/build/watching.js

@@ -0,0 +1,113 @@
+// @ts-check
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createWatcher", {
+    enumerable: true,
+    get: ()=>createWatcher
+});
+const _chokidar = /*#__PURE__*/ _interopRequireDefault(require("chokidar"));
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _micromatch = /*#__PURE__*/ _interopRequireDefault(require("micromatch"));
+const _normalizePath = /*#__PURE__*/ _interopRequireDefault(require("normalize-path"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _utilsJs = require("./utils.js");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function createWatcher(args, { state , rebuild  }) {
+    let shouldPoll = args["--poll"];
+    let shouldCoalesceWriteEvents = shouldPoll || process.platform === "win32";
+    // Polling interval in milliseconds
+    // Used only when polling or coalescing add/change events on Windows
+    let pollInterval = 10;
+    let watcher = _chokidar.default.watch([], {
+        // Force checking for atomic writes in all situations
+        // This causes chokidar to wait up to 100ms for a file to re-added after it's been unlinked
+        // This only works when watching directories though
+        atomic: true,
+        usePolling: shouldPoll,
+        interval: shouldPoll ? pollInterval : undefined,
+        ignoreInitial: true,
+        awaitWriteFinish: shouldCoalesceWriteEvents ? {
+            stabilityThreshold: 50,
+            pollInterval: pollInterval
+        } : false
+    });
+    let chain = Promise.resolve();
+    let pendingRebuilds = new Set();
+    let changedContent = [];
+    /**
+   *
+   * @param {*} file
+   * @param {(() => Promise<string>) | null} content
+   */ function recordChangedFile(file, content = null) {
+        file = _path.default.resolve(file);
+        content = content !== null && content !== void 0 ? content : async ()=>await _fs.default.promises.readFile(file, "utf8");
+        changedContent.push({
+            file,
+            content,
+            extension: _path.default.extname(file).slice(1)
+        });
+        chain = chain.then(()=>rebuild(changedContent));
+        return chain;
+    }
+    watcher.on("change", (file)=>recordChangedFile(file));
+    watcher.on("add", (file)=>recordChangedFile(file));
+    // Restore watching any files that are "removed"
+    // This can happen when a file is pseudo-atomically replaced (a copy is created, overwritten, the old one is unlinked, and the new one is renamed)
+    // TODO: An an optimization we should allow removal when the config changes
+    watcher.on("unlink", (file)=>{
+        file = (0, _normalizePath.default)(file);
+        // Only re-add the file if it's not covered by a dynamic pattern
+        if (!_micromatch.default.some([
+            file
+        ], state.contentPatterns.dynamic)) {
+            watcher.add(file);
+        }
+    });
+    // Some applications such as Visual Studio (but not VS Code)
+    // will only fire a rename event for atomic writes and not a change event
+    // This is very likely a chokidar bug but it's one we need to work around
+    // We treat this as a change event and rebuild the CSS
+    watcher.on("raw", (evt, filePath, meta)=>{
+        if (evt !== "rename") {
+            return;
+        }
+        let watchedPath = meta.watchedPath;
+        // Watched path might be the file itself
+        // Or the directory it is in
+        filePath = watchedPath.endsWith(filePath) ? watchedPath : _path.default.join(watchedPath, filePath);
+        // Skip this event since the files it is for does not match any of the registered content globs
+        if (!_micromatch.default.some([
+            filePath
+        ], state.contentPatterns.all)) {
+            return;
+        }
+        // Skip since we've already queued a rebuild for this file that hasn't happened yet
+        if (pendingRebuilds.has(filePath)) {
+            return;
+        }
+        pendingRebuilds.add(filePath);
+        chain = chain.then(async ()=>{
+            let content;
+            try {
+                content = await (0, _utilsJs.readFileWithRetries)(_path.default.resolve(filePath));
+            } finally{
+                pendingRebuilds.delete(filePath);
+            }
+            return recordChangedFile(filePath, ()=>content);
+        });
+    });
+    return {
+        fswatcher: watcher,
+        refreshWatchedFiles () {
+            watcher.add(Array.from(state.contextDependencies));
+            watcher.add(Array.from(state.configDependencies));
+            watcher.add(state.contentPatterns.all);
+        }
+    };
+}