tailwindcss 0.0.0-insiders.26c4cb3 → 0.0.0-insiders.2702cfc

package/README.md

@@ -12,15 +12,14 @@
   A utility-first CSS framework for rapidly building custom user interfaces.
 </p>
 
-
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=master" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
     <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindcss/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
-------
+---
 
 ## Documentation
 
@@ -38,4 +37,4 @@ For casual chit-chat with others using the framework:
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/master/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.

package/lib/cli/build/deps.js

@@ -0,0 +1,62 @@
+// @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: function() {
+        return loadPostcss;
+    },
+    loadPostcssImport: function() {
+        return loadPostcssImport;
+    },
+    loadCssNano: function() {
+        return loadCssNano;
+    },
+    loadAutoprefixer: function() {
+        return loadAutoprefixer;
+    }
+});
+const _index = require("../../../peers/index.js");
+function loadPostcss() {
+    // Try to load a local `postcss` version first
+    try {
+        return require("postcss");
+    } catch  {}
+    return (0, _index.lazyPostcss)();
+}
+function loadPostcssImport() {
+    // Try to load a local `postcss-import` version first
+    try {
+        return require("postcss-import");
+    } catch  {}
+    return (0, _index.lazyPostcssImport)();
+}
+function loadCssNano() {
+    let options = {
+        preset: [
+            "default",
+            {
+                cssDeclarationSorter: false
+            }
+        ]
+    };
+    // Try to load a local `cssnano` version first
+    try {
+        return require("cssnano");
+    } catch  {}
+    return (0, _index.lazyCssnano)()(options);
+}
+function loadAutoprefixer() {
+    // Try to load a local `autoprefixer` version first
+    try {
+        return require("autoprefixer");
+    } catch  {}
+    return (0, _index.lazyAutoprefixer)();
+}

package/lib/cli/build/index.js

@@ -34,9 +34,6 @@ async function build(args) {
         console.error(`Specified config file ${args["--config"]} does not exist.`);
         process.exit(9);
     }
-    if (args["--no-autoprefixer"]) {
-        console.error("[deprecation] The --no-autoprefixer flag is deprecated and has no effect.");
-    }
     // TODO: Reference the @config path here if exists
     let configPath = args["--config"] ? args["--config"] : (0, _resolveConfigPath.resolveDefaultConfigPath)();
     let processor = await (0, _plugin.createProcessor)(args, configPath);

package/lib/cli/build/plugin.js

@@ -9,19 +9,16 @@ Object.defineProperty(exports, "createProcessor", {
         return createProcessor;
     }
 });
-const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../../package.json"));
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
-const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
 const _postcssloadconfig = /*#__PURE__*/ _interop_require_default(require("postcss-load-config"));
-const _browserslist = /*#__PURE__*/ _interop_require_default(require("browserslist"));
-const _lightningcss = /*#__PURE__*/ _interop_require_wildcard(require("lightningcss"));
 const _lilconfig = require("lilconfig");
 const _plugins = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/plugins" // Little bit scary, looking at private/internal API
 ));
 const _options = /*#__PURE__*/ _interop_require_default(require("postcss-load-config/src/options" // Little bit scary, looking at private/internal API
 ));
 const _processTailwindFeatures = /*#__PURE__*/ _interop_require_default(require("../../processTailwindFeatures"));
+const _deps = require("./deps");
 const _utils = require("./utils");
 const _sharedState = require("../../lib/sharedState");
 const _resolveConfig = /*#__PURE__*/ _interop_require_default(require("../../../resolveConfig.js"));
@@ -32,91 +29,11 @@ const _findAtConfigPath = require("../../lib/findAtConfigPath.js");
 const _log = /*#__PURE__*/ _interop_require_default(require("../../util/log"));
 const _loadconfig = require("../../lib/load-config");
 const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("../../lib/getModuleDependencies"));
-const _validateConfig = require("../../util/validateConfig");
-const _handleImportAtRules = require("../../lib/handleImportAtRules");
-const _featureFlags = require("../../featureFlags");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {};
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-function license() {
-    return `/* ! tailwindcss v${_packagejson.default.version} | MIT License | https://tailwindcss.com */\n`;
-}
-async function lightningcss(result, { map = true, minify = true } = {}) {
-    try {
-        var _browserslist_findConfig;
-        var _result_opts_from;
-        let resolvedBrowsersListConfig = (_browserslist_findConfig = _browserslist.default.findConfig((_result_opts_from = result.opts.from) !== null && _result_opts_from !== void 0 ? _result_opts_from : process.cwd())) === null || _browserslist_findConfig === void 0 ? void 0 : _browserslist_findConfig.defaults;
-        let defaultBrowsersListConfig = _packagejson.default.browserslist;
-        let browsersListConfig = resolvedBrowsersListConfig !== null && resolvedBrowsersListConfig !== void 0 ? resolvedBrowsersListConfig : defaultBrowsersListConfig;
-        let transformed = _lightningcss.default.transform({
-            filename: result.opts.from || "input.css",
-            code: Buffer.from(result.css, "utf-8"),
-            minify,
-            sourceMap: result.map === undefined ? map : !!result.map,
-            inputSourceMap: result.map ? result.map.toString() : undefined,
-            targets: _lightningcss.default.browserslistToTargets((0, _browserslist.default)(browsersListConfig)),
-            drafts: {
-                nesting: true
-            },
-            include: _lightningcss.Features.Nesting,
-            exclude: _lightningcss.Features.LogicalProperties
-        });
-        return Object.assign(result, {
-            css: transformed.code.toString("utf8"),
-            map: result.map ? Object.assign(result.map, {
-                toString () {
-                    var _transformed_map;
-                    return (_transformed_map = transformed.map) === null || _transformed_map === void 0 ? void 0 : _transformed_map.toString();
-                }
-            }) : result.map
-        });
-    } catch (err) {
-        console.error("Unable to use Lightning CSS. Using raw version instead.");
-        console.error(err);
-        return result;
-    }
-}
 /**
  *
  * @param {string} [customPostCssPath ]
@@ -126,7 +43,7 @@ async function lightningcss(result, { map = true, minify = true } = {}) {
         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);
+        let { config ={}  } = await (0, _lilconfig.lilconfig)("postcss").load(file);
         if (typeof config === "function") {
             config = config();
         } else {
@@ -159,11 +76,43 @@ async function lightningcss(result, { map = true, minify = true } = {}) {
         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: [],
-    /** @type {{config: import('../../../types').Config, dependencies: Set<string>, dispose: Function } | null} */ configBag: null,
+    /** @type {ReturnType<typeof load> | null} */ configBag: null,
     contextDependencies: new Set(),
     /** @type {import('../../lib/content.js').ContentPath[]} */ contentPaths: [],
     refreshContentPaths () {
@@ -180,7 +129,6 @@ let state = {
         };
     },
     loadConfig (configPath, content) {
-        var _content;
         if (this.watcher && configPath) {
             this.refreshConfigDependencies();
         }
@@ -195,9 +143,14 @@ let state = {
                 }
             }
         };
-        this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config));
+        // @ts-ignore
+        this.configBag.config = (0, _resolveConfig.default)(this.configBag.config, {
+            content: {
+                files: []
+            }
+        });
         // Override content files if `--content` has been passed explicitly
-        if (((_content = content) === null || _content === void 0 ? void 0 : _content.length) > 0) {
+        if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
             this.configBag.config.content.files = content;
         }
         return this.configBag.config;
@@ -213,24 +166,19 @@ let state = {
         // 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);
+        let checkBroadPattern = (0, _content.createBroadPatternCheck)(this.contentPatterns.all);
         for (let file of files){
-            if ((0, _featureFlags.flagEnabled)(this.config, "oxideParser")) {
-                content.push({
-                    file,
-                    extension: _path.default.extname(file).slice(1)
-                });
-            } else {
-                content.push({
-                    content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
-                    extension: _path.default.extname(file).slice(1)
-                });
-            }
+            checkBroadPattern(file);
+            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: htmlContent, extension = "html" } of rawContent){
+        for (let { raw: htmlContent , extension ="html"  } of rawContent){
             content.push({
                 content: htmlContent,
                 extension
@@ -238,15 +186,15 @@ let state = {
         }
         return content;
     },
-    getContext ({ createContext, cliConfigPath, root, result, content }) {
-        if (this.context) {
-            this.context.changedContent = this.changedContent.splice(0);
-            return this.context;
-        }
+    getContext ({ createContext , cliConfigPath , root , result , content  }) {
         _sharedState.env.DEBUG && console.time("Searching for config");
         var _findAtConfigPath1;
         let configPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : cliConfigPath;
         _sharedState.env.DEBUG && console.timeEnd("Searching for config");
+        if (this.context) {
+            this.context.changedContent = this.changedContent.splice(0);
+            return this.context;
+        }
         _sharedState.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
         _sharedState.env.DEBUG && console.timeEnd("Loading config");
@@ -272,16 +220,12 @@ let state = {
 };
 async function createProcessor(args, cliConfigPath) {
     var _args_content;
+    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) : [
-        [],
-        [],
-        {}
-    ];
-    beforePlugins.unshift(...(0, _handleImportAtRules.handleImportAtRules)());
+    let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins(customPostCssPath) : loadBuiltinPostcssPlugins();
     if (args["--purge"]) {
         _log.default.warn("purge-flag-deprecated", [
             "The `--purge` flag has been deprecated.",
@@ -296,9 +240,9 @@ async function createProcessor(args, cliConfigPath) {
     let tailwindPlugin = ()=>{
         return {
             postcssPlugin: "tailwindcss",
-            async Once (root, { result }) {
+            async Once (root, { result  }) {
                 _sharedState.env.DEBUG && console.time("Compiling CSS");
-                await (0, _processTailwindFeatures.default)(({ createContext })=>{
+                await (0, _processTailwindFeatures.default)(({ createContext  })=>{
                     console.error();
                     console.error("Rebuilding...");
                     return ()=>{
@@ -320,10 +264,12 @@ async function createProcessor(args, cliConfigPath) {
         ...beforePlugins,
         tailwindPlugin,
         !args["--minify"] && _utils.formatNodes,
-        ...afterPlugins
+        ...afterPlugins,
+        !args["--no-autoprefixer"] && (0, _deps.loadAutoprefixer)(),
+        args["--minify"] && (0, _deps.loadCssNano)()
     ].filter(Boolean);
     /** @type {import('postcss').Processor} */ // @ts-ignore
-    let processor = (0, _postcss.default)(plugins);
+    let processor = postcss(plugins);
     async function readInput() {
         // Piping in data, let's drain the stdin
         if (input === "-") {
@@ -333,19 +279,15 @@ async function createProcessor(args, cliConfigPath) {
         if (input) {
             return _fs.default.promises.readFile(_path.default.resolve(input), "utf8");
         }
-        // No input file provided, fallback to default atrules
+        // No input file provided, fallback to default at-rules
         return "@tailwind base; @tailwind components; @tailwind utilities";
     }
     async function build() {
         let start = process.hrtime.bigint();
-        let options = {
-            ...postcssOptions,
-            from: input,
-            to: output
-        };
-        return readInput().then((css)=>processor.process(css, options)).then((result)=>lightningcss(result, {
-                ...options,
-                minify: !!args["--minify"]
+        return readInput().then((css)=>processor.process(css, {
+                ...postcssOptions,
+                from: input,
+                to: output
             })).then((result)=>{
             if (!state.watcher) {
                 return result;
@@ -364,11 +306,11 @@ async function createProcessor(args, cliConfigPath) {
             return result;
         }).then((result)=>{
             if (!output) {
-                process.stdout.write(license() + result.css);
+                process.stdout.write(result.css);
                 return;
             }
             return Promise.all([
-                (0, _utils.outputFile)(result.opts.to, license() + result.css),
+                (0, _utils.outputFile)(result.opts.to, result.css),
                 result.map && (0, _utils.outputFile)(result.opts.to + ".map", result.map.toString())
             ]);
         }).then(()=>{

package/lib/cli/build/watching.js

@@ -20,7 +20,7 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function createWatcher(args, { state, rebuild }) {
+function createWatcher(args, { state , rebuild  }) {
     let shouldPoll = args["--poll"];
     let shouldCoalesceWriteEvents = shouldPoll || process.platform === "win32";
     // Polling interval in milliseconds
@@ -126,7 +126,7 @@ function createWatcher(args, { state, rebuild }) {
     // 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") {
+        if (evt !== "rename" || filePath === null) {
             return;
         }
         let watchedPath = meta.watchedPath;

package/lib/cli/help/index.js

@@ -15,7 +15,7 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function help({ message, usage, commands, options }) {
+function help({ message , usage , commands , options  }) {
     let indent = 2;
     // Render header
     console.log();
@@ -60,7 +60,7 @@ function help({ message, usage, commands, options }) {
         }
         console.log();
         console.log("Options:");
-        for (let { flags, description, deprecated } of Object.values(groupedOptions)){
+        for (let { flags , description , deprecated  } of Object.values(groupedOptions)){
             if (deprecated) continue;
             if (flags.length === 1) {
                 console.log(" ".repeat(indent + 4 /* 4 = "-i, ".length */ ), flags.slice().reverse().join(", ").padEnd(20, " "), description);

package/lib/cli/index.js

@@ -91,7 +91,6 @@ let commands = {
                 description: "Path to a custom config file"
             },
             "--no-autoprefixer": {
-                deprecated: true,
                 type: Boolean,
                 description: "Disable autoprefixer"
             },
@@ -144,15 +143,15 @@ if (commands[command] === undefined) {
     }
 }
 // Execute command
-let { args: flags, run } = commands[command];
+let { args: flags , run  } = commands[command];
 let args = (()=>{
     try {
         let result = (0, _arg.default)(Object.fromEntries(Object.entries({
             ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
-            var _value_type, _value;
-            return !((_value = value) === null || _value === void 0 ? void 0 : (_value_type = _value.type) === null || _value_type === void 0 ? void 0 : _value_type.manualParsing);
+            var _value_type;
+            return !(value === null || value === void 0 ? void 0 : (_value_type = value.type) === null || _value_type === void 0 ? void 0 : _value_type.manualParsing);
         }).map(([key, value])=>[
                 key,
                 typeof value === "object" ? value.type : value

package/lib/cli-peer-dependencies.js

@@ -0,0 +1,36 @@
+"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, {
+    lazyPostcss: function() {
+        return lazyPostcss;
+    },
+    lazyPostcssImport: function() {
+        return lazyPostcssImport;
+    },
+    lazyAutoprefixer: function() {
+        return lazyAutoprefixer;
+    },
+    lazyCssnano: function() {
+        return lazyCssnano;
+    }
+});
+function lazyPostcss() {
+    return require("postcss");
+}
+function lazyPostcssImport() {
+    return require("postcss-import");
+}
+function lazyAutoprefixer() {
+    return require("autoprefixer");
+}
+function lazyCssnano() {
+    return require("cssnano");
+}

package/lib/corePluginList.js

@@ -32,6 +32,7 @@ const _default = [
     "lineClamp",
     "display",
     "aspectRatio",
+    "size",
     "height",
     "maxHeight",
     "minHeight",
@@ -184,5 +185,7 @@ const _default = [
     "transitionDuration",
     "transitionTimingFunction",
     "willChange",
-    "content"
+    "contain",
+    "content",
+    "forcedColorAdjust"
 ];