tailwindcss 0.0.0-insiders.b49dc7c → 0.0.0-insiders.b4e637e

package/CHANGELOG.md

@@ -7,6 +7,62 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Nothing yet!
+
+## [3.1.5] - 2022-07-07
+
+### Added
+
+- Support configuring a default `font-weight` for each font size utility ([#8763](https://github.com/tailwindlabs/tailwindcss/pull/8763))
+- Add support for alpha values in safe list ([#8774](https://github.com/tailwindlabs/tailwindcss/pull/8774))
+ 
+### Fixed
+
+- Improve types to support fallback values in the CSS-in-JS syntax used in plugin APIs ([#8762](https://github.com/tailwindlabs/tailwindcss/pull/8762))
+- Support including `tailwindcss` and `autoprefixer` in `postcss.config.js` in standalone CLI ([#8769](https://github.com/tailwindlabs/tailwindcss/pull/8769))
+- Fix using special-characters as prefixes ([#8772](https://github.com/tailwindlabs/tailwindcss/pull/8772))
+- Don’t prefix classes used within arbitrary variants ([#8773](https://github.com/tailwindlabs/tailwindcss/pull/8773))
+- Add more explicit types for the default theme ([#8780](https://github.com/tailwindlabs/tailwindcss/pull/8780))
+
+## [3.1.4] - 2022-06-21
+
+### Fixed
+
+- Provide default to `<alpha-value>` when using `theme()` ([#8652](https://github.com/tailwindlabs/tailwindcss/pull/8652))
+- Detect arbitrary variants with quotes ([#8687](https://github.com/tailwindlabs/tailwindcss/pull/8687))
+- Don’t add spaces around raw `/` that are preceded by numbers ([#8688](https://github.com/tailwindlabs/tailwindcss/pull/8688))
+
+## [3.1.3] - 2022-06-14
+
+### Fixed
+
+- Fix extraction of multi-word utilities with arbitrary values and quotes ([#8604](https://github.com/tailwindlabs/tailwindcss/pull/8604))
+- Fix casing of import of `corePluginList` type definition ([#8587](https://github.com/tailwindlabs/tailwindcss/pull/8587))
+- Ignore PostCSS nodes returned by `addVariant` ([#8608](https://github.com/tailwindlabs/tailwindcss/pull/8608))
+- Fix missing spaces around arithmetic operators ([#8615](https://github.com/tailwindlabs/tailwindcss/pull/8615))
+- Detect alpha value in CSS `theme()` function when using quotes ([#8625](https://github.com/tailwindlabs/tailwindcss/pull/8625))
+- Fix "Maximum call stack size exceeded" bug ([#8636](https://github.com/tailwindlabs/tailwindcss/pull/8636))
+- Allow functions returning parallel variants to mutate the container ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+- Remove text opacity CSS variables from `::marker` ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+
+## [3.1.2] - 2022-06-10
+
+### Fixed
+
+- Ensure `\` is a valid arbitrary variant token ([#8576](https://github.com/tailwindlabs/tailwindcss/pull/8576))
+- Enable `postcss-import` in the CLI by default in watch mode ([#8574](https://github.com/tailwindlabs/tailwindcss/pull/8574), [#8580](https://github.com/tailwindlabs/tailwindcss/pull/8580))
+
+## [3.1.1] - 2022-06-09
+
+### Fixed
+
+- Fix candidate extractor regression ([#8558](https://github.com/tailwindlabs/tailwindcss/pull/8558))
+- Split `::backdrop` into separate defaults group ([#8567](https://github.com/tailwindlabs/tailwindcss/pull/8567))
+- Fix postcss plugin type ([#8564](https://github.com/tailwindlabs/tailwindcss/pull/8564))
+- Fix class detection in markdown code fences and slim templates ([#8569](https://github.com/tailwindlabs/tailwindcss/pull/8569))
+
+## [3.1.0] - 2022-06-08
+
 ### Fixed
 
 - Types: allow for arbitrary theme values (for 3rd party plugins) ([#7926](https://github.com/tailwindlabs/tailwindcss/pull/7926))
@@ -21,15 +77,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Only check selectors containing base apply candidates for circular dependencies ([#8222](https://github.com/tailwindlabs/tailwindcss/pull/8222))
 - Rewrite default class extractor ([#8204](https://github.com/tailwindlabs/tailwindcss/pull/8204))
 - Move `important` selector to the front when `@apply`-ing selector-modifying variants in custom utilities ([#8313](https://github.com/tailwindlabs/tailwindcss/pull/8313))
+- Error when registering an invalid custom variant ([#8345](https://github.com/tailwindlabs/tailwindcss/pull/8345))
+- Create tailwind.config.cjs file in ESM package when running init ([#8363](https://github.com/tailwindlabs/tailwindcss/pull/8363))
+- Fix `matchVariants` that use at-rules and placeholders ([#8392](https://github.com/tailwindlabs/tailwindcss/pull/8392))
+- Improve types of the `tailwindcss/plugin` ([#8400](https://github.com/tailwindlabs/tailwindcss/pull/8400))
+- Allow returning parallel variants from `addVariant` or `matchVariant` callback functions ([#8455](https://github.com/tailwindlabs/tailwindcss/pull/8455))
+- Try using local `postcss` installation first in the CLI ([#8270](https://github.com/tailwindlabs/tailwindcss/pull/8270))
+- Allow default ring color to be a function ([#7587](https://github.com/tailwindlabs/tailwindcss/pull/7587))
+- Don't inherit `to` value from parent gradients ([#8489](https://github.com/tailwindlabs/tailwindcss/pull/8489))
+- Remove process dependency from log functions ([#8530](https://github.com/tailwindlabs/tailwindcss/pull/8530))
+- Ensure we can use `@import 'tailwindcss/...'` without node_modules ([#8537](https://github.com/tailwindlabs/tailwindcss/pull/8537))
 
 ### Changed
 
-- Try using local `postcss` installation first in the CLI ([#8270](https://github.com/tailwindlabs/tailwindcss/pull/8270))
+- Only apply hover styles when supported (future) ([#8394](https://github.com/tailwindlabs/tailwindcss/pull/8394))
+- Respect default ring color opacity (future) ([#8448](https://github.com/tailwindlabs/tailwindcss/pull/8448), [3f4005e](https://github.com/tailwindlabs/tailwindcss/commit/3f4005e833445f7549219eb5ae89728cbb3a2630))
 
 ### Added
 
-- Allow default ring color to be a function ([#7587](https://github.com/tailwindlabs/tailwindcss/pull/7587))
-- Add `rgb` and `hsl` color helpers for CSS variables ([#7665](https://github.com/tailwindlabs/tailwindcss/pull/7665))
 - Support PostCSS `Document` nodes ([#7291](https://github.com/tailwindlabs/tailwindcss/pull/7291))
 - Add `text-start` and `text-end` utilities ([#6656](https://github.com/tailwindlabs/tailwindcss/pull/6656))
 - Support customizing class name when using `darkMode: 'class'` ([#5800](https://github.com/tailwindlabs/tailwindcss/pull/5800))
@@ -37,10 +102,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add new `border-spacing` utilities ([#7102](https://github.com/tailwindlabs/tailwindcss/pull/7102))
 - Add `enabled` variant ([#7905](https://github.com/tailwindlabs/tailwindcss/pull/7905))
 - Add TypeScript types for the `tailwind.config.js` file ([#7891](https://github.com/tailwindlabs/tailwindcss/pull/7891))
-- Add `backdrop` variant ([#7924](https://github.com/tailwindlabs/tailwindcss/pull/7924))
+- Add `backdrop` variant ([#7924](https://github.com/tailwindlabs/tailwindcss/pull/7924), [#8526](https://github.com/tailwindlabs/tailwindcss/pull/8526))
 - Add `grid-flow-dense` utility ([#8193](https://github.com/tailwindlabs/tailwindcss/pull/8193))
 - Add `mix-blend-plus-lighter` utility ([#8288](https://github.com/tailwindlabs/tailwindcss/pull/8288))
 - Add arbitrary variants ([#8299](https://github.com/tailwindlabs/tailwindcss/pull/8299))
+- Add experimental `matchVariant` API ([#8310](https://github.com/tailwindlabs/tailwindcss/pull/8310), [34fd0fb8](https://github.com/tailwindlabs/tailwindcss/commit/34fd0fb82aa574cddc5c7aa3ad7d1af5e3735e5d))
+- Add `prefers-contrast` media query variants ([#8410](https://github.com/tailwindlabs/tailwindcss/pull/8410))
+- Add opacity support when referencing colors with `theme` function ([#8416](https://github.com/tailwindlabs/tailwindcss/pull/8416))
+- Add `postcss-import` support to the CLI ([#8437](https://github.com/tailwindlabs/tailwindcss/pull/8437))
+- Add `optional` variant ([#8486](https://github.com/tailwindlabs/tailwindcss/pull/8486))
+- Add `<alpha-value>` placeholder support for custom colors ([#8501](https://github.com/tailwindlabs/tailwindcss/pull/8501))
 
 ## [3.0.24] - 2022-04-12
 
@@ -1933,7 +2004,13 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...HEAD
+[3.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...v3.1.5
+[3.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.3...v3.1.4
+[3.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.2...v3.1.3
+[3.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...v3.1.2
+[3.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.0...v3.1.1
+[3.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...v3.1.0
 [3.0.24]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.23...v3.0.24
 [3.0.23]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.22...v3.0.23
 [3.0.22]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.21...v3.0.22

package/defaultTheme.d.ts

@@ -1,3 +1,4 @@
 import type { Config } from './types/config'
-declare const theme: Config['theme']
+import { DefaultTheme } from './types/generated/default-theme'
+declare const theme: Config['theme'] & DefaultTheme
 export = theme

package/lib/cli-peer-dependencies.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.lazyPostcss = lazyPostcss;
+exports.lazyPostcssImport = lazyPostcssImport;
 exports.lazyAutoprefixer = lazyAutoprefixer;
 exports.lazyCssnano = lazyCssnano;
 function lazyPostcss() {
     return require("postcss");
 }
+function lazyPostcssImport() {
+    return require("postcss-import");
+}
 function lazyAutoprefixer() {
     return require("autoprefixer");
 }

package/lib/cli.js

@@ -18,6 +18,7 @@ var _getModuleDependencies = _interopRequireDefault(require("./lib/getModuleDepe
 var _log = _interopRequireDefault(require("./util/log"));
 var _packageJson = _interopRequireDefault(require("../package.json"));
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
+var _validateConfigJs = require("./util/validateConfig.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -26,6 +27,22 @@ function _interopRequireDefault(obj) {
 let env = {
     DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== "0"
 };
+function isESM() {
+    const pkgPath = _path.default.resolve("./package.json");
+    try {
+        let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
+        return pkg.type && pkg.type === "module";
+    } catch (err) {
+        return false;
+    }
+}
+let configs = isESM() ? {
+    tailwind: "tailwind.config.cjs",
+    postcss: "postcss.config.cjs"
+} : {
+    tailwind: "tailwind.config.js",
+    postcss: "postcss.config.js"
+};
 // ---
 function indentRecursive(node, indent = 0) {
     node.each && node.each((child, i)=>{
@@ -55,10 +72,8 @@ function drainStdin() {
         process.stdin.on("data", (chunk)=>{
             result += chunk;
         });
-        process.stdin.on("end", ()=>resolve(result)
-        );
-        process.stdin.on("error", (err)=>reject(err)
-        );
+        process.stdin.on("end", ()=>resolve(result));
+        process.stdin.on("error", (err)=>reject(err));
     });
 }
 function help({ message , usage , commands: commands1 , options  }) {
@@ -143,15 +158,11 @@ let commands = {
         args: {
             "--full": {
                 type: Boolean,
-                description: "Initialize a full `tailwind.config.js` file"
+                description: `Initialize a full \`${configs.tailwind}\` file`
             },
             "--postcss": {
                 type: Boolean,
-                description: "Initialize a `postcss.config.js` file"
-            },
-            "--types": {
-                type: Boolean,
-                description: "Add TypeScript types for the `tailwind.config.js` file"
+                description: `Initialize a \`${configs.postcss}\` file`
             },
             "-f": "--full",
             "-p": "--postcss"
@@ -216,16 +227,13 @@ let sharedFlags = {
     },
     "-h": "--help"
 };
-if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.argv[2] === undefined || process.argv.slice(2).every((flag)=>sharedFlags[flag] !== undefined
-))) {
+if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.argv[2] === undefined || process.argv.slice(2).every((flag)=>sharedFlags[flag] !== undefined))) {
     help({
         usage: [
             "tailwindcss [--input input.css] [--output output.css] [--watch] [options...]",
-            "tailwindcss init [--full] [--postcss] [--types] [options...]", 
+            "tailwindcss init [--full] [--postcss] [options...]", 
         ],
-        commands: Object.keys(commands).filter((command2)=>command2 !== "build"
-        ).map((command3)=>`${command3} [options]`
-        ),
+        commands: Object.keys(commands).filter((command2)=>command2 !== "build").map((command3)=>`${command3} [options]`),
         options: {
             ...commands.build.args,
             ...sharedFlags
@@ -233,8 +241,7 @@ if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.
     });
     process.exit(0);
 }
-let command = ((arg = "")=>arg.startsWith("-") ? undefined : arg
-)(process.argv[2]) || "build";
+let command = ((arg = "")=>arg.startsWith("-") ? undefined : arg)(process.argv[2]) || "build";
 if (commands[command] === undefined) {
     if (_fs.default.existsSync(_path.default.resolve(command))) {
         // TODO: Deprecate this in future versions
@@ -246,9 +253,7 @@ if (commands[command] === undefined) {
             usage: [
                 "tailwindcss <command> [options]"
             ],
-            commands: Object.keys(commands).filter((command4)=>command4 !== "build"
-            ).map((command5)=>`${command5} [options]`
-            ),
+            commands: Object.keys(commands).filter((command4)=>command4 !== "build").map((command5)=>`${command5} [options]`),
             options: sharedFlags
         });
         process.exit(1);
@@ -267,8 +272,7 @@ let args = (()=>{
         }).map(([key, value])=>[
                 key,
                 typeof value === "object" ? value.type : value
-            ]
-        )), {
+            ])), {
             permissive: true
         });
         // Manual parsing of flags to allow for special flags like oneOf(Boolean, String)
@@ -335,22 +339,18 @@ run();
 function init() {
     let messages = [];
     var ref;
-    let tailwindConfigLocation = _path.default.resolve((ref = args["_"][1]) !== null && ref !== void 0 ? ref : "./tailwind.config.js");
+    let tailwindConfigLocation = _path.default.resolve((ref = args["_"][1]) !== null && ref !== void 0 ? ref : `./${configs.tailwind}`);
     if (_fs.default.existsSync(tailwindConfigLocation)) {
         messages.push(`${_path.default.basename(tailwindConfigLocation)} already exists.`);
     } else {
         let stubFile = _fs.default.readFileSync(args["--full"] ? _path.default.resolve(__dirname, "../stubs/defaultConfig.stub.js") : _path.default.resolve(__dirname, "../stubs/simpleConfig.stub.js"), "utf8");
-        if (args["--types"]) {
-            let typesHeading = "/** @type {import('tailwindcss/types').Config} */";
-            stubFile = stubFile.replace(`module.exports = `, `${typesHeading}\nconst config = `) + "\nmodule.exports = config";
-        }
         // Change colors import
         stubFile = stubFile.replace("../colors", "tailwindcss/colors");
         _fs.default.writeFileSync(tailwindConfigLocation, stubFile, "utf8");
         messages.push(`Created Tailwind CSS config file: ${_path.default.basename(tailwindConfigLocation)}`);
     }
     if (args["--postcss"]) {
-        let postcssConfigLocation = _path.default.resolve("./postcss.config.js");
+        let postcssConfigLocation = _path.default.resolve(`./${configs.postcss}`);
         if (_fs.default.existsSync(postcssConfigLocation)) {
             messages.push(`${_path.default.basename(postcssConfigLocation)} already exists.`);
         } else {
@@ -389,8 +389,7 @@ async function build() {
         console.error(`Specified config file ${args["--config"]} does not exist.`);
         process.exit(9);
     }
-    let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null
-    )(_path.default.resolve("./tailwind.config.js"));
+    let configPath = args["--config"] ? args["--config"] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null)(_path.default.resolve(`./${configs.tailwind}`));
     async function loadPostCssPlugins() {
         let customPostCssPath = typeof args["--postcss"] === "string" ? args["--postcss"] : undefined;
         let config1 = customPostCssPath ? await (async ()=>{
@@ -429,6 +428,43 @@ async function build() {
             config1.options
         ];
     }
+    function loadBuiltinPostcssPlugins() {
+        let postcss = 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();
+                        }
+                    });
+                },
+                (()=>{
+                    try {
+                        return require("postcss-import");
+                    } catch  {}
+                    return (0, _indexJs).lazyPostcssImport();
+                })(),
+                (root)=>{
+                    root.walkComments((rule)=>{
+                        if (rule.text.startsWith(IMPORT_COMMENT)) {
+                            rule.after(postcss.atRule({
+                                name: "import",
+                                params: rule.text.replace(IMPORT_COMMENT, "")
+                            }));
+                            rule.remove();
+                        }
+                    });
+                }, 
+            ],
+            [],
+            {}, 
+        ];
+    }
     function resolveConfig() {
         let config = configPath ? require(configPath) : {};
         if (args["--purge"]) {
@@ -448,9 +484,12 @@ async function build() {
                 }
             });
             resolvedConfig.content.files = files;
+            resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
             return resolvedConfig;
         }
-        return (0, _resolveConfig).default(config);
+        let resolvedConfig = (0, _resolveConfig).default(config);
+        resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
+        return resolvedConfig;
     }
     function extractFileGlobs(config) {
         return config.content.files.filter((file)=>{
@@ -458,8 +497,7 @@ async function build() {
             // like an object it's probably a raw content object. But this object
             // is not watchable, so let's remove it.
             return typeof file === "string";
-        }).map((glob)=>(0, _normalizePath).default(glob)
-        );
+        }).map((glob)=>(0, _normalizePath).default(glob));
     }
     function extractRawContent(config) {
         return config.content.files.filter((file)=>{
@@ -502,11 +540,7 @@ async function build() {
             };
         };
         tailwindPlugin.postcss = true;
-        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : [
-            [],
-            [],
-            {}
-        ];
+        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             tailwindPlugin,
@@ -541,13 +575,11 @@ async function build() {
             let start = process.hrtime.bigint();
             return Promise.resolve().then(()=>output ? _fs.default.promises.mkdir(_path.default.dirname(output), {
                     recursive: true
-                }) : null
-            ).then(()=>processor.process(css, {
+                }) : null).then(()=>processor.process(css, {
                     ...postcssOptions,
                     from: input,
                     to: output
-                })
-            ).then((result)=>{
+                })).then((result)=>{
                 if (!output) {
                     return process.stdout.write(result.css);
                 }
@@ -558,7 +590,7 @@ async function build() {
             }).then(()=>{
                 let end = process.hrtime.bigint();
                 console.error();
-                console.error("Done in", (end - start) / BigInt(1000000) + "ms.");
+                console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
             });
         }
         let css1 = await (()=>{
@@ -587,8 +619,7 @@ async function build() {
                 delete require.cache[require.resolve(file1)];
             }
             if (configPath) {
-                configDependencies = (0, _getModuleDependencies).default(configPath).map(({ file  })=>file
-                );
+                configDependencies = (0, _getModuleDependencies).default(configPath).map(({ file  })=>file);
                 for (let dependency of configDependencies){
                     contextDependencies.add(dependency);
                 }
@@ -596,10 +627,7 @@ async function build() {
             env.DEBUG && console.timeEnd("Module dependencies");
             return resolveConfig();
         }
-        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : [
-            [],
-            []
-        ];
+        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             "__TAILWIND_PLUGIN_POSITION__",
@@ -663,12 +691,10 @@ async function build() {
                 let start = process.hrtime.bigint();
                 return Promise.resolve().then(()=>output ? _fs.default.promises.mkdir(_path.default.dirname(output), {
                         recursive: true
-                    }) : null
-                ).then(()=>processor.process(css, {
+                    }) : null).then(()=>processor.process(css, {
                         from: input,
                         to: output
-                    })
-                ).then(async (result)=>{
+                    })).then(async (result)=>{
                     for (let message of result.messages){
                         if (message.type === "dependency") {
                             contextDependencies.add(message.file);
@@ -686,7 +712,7 @@ async function build() {
                     ].filter(Boolean));
                 }).then(()=>{
                     let end = process.hrtime.bigint();
-                    console.error("Done in", (end - start) / BigInt(1000000) + "ms.");
+                    console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
                 }).catch((err)=>{
                     if (err.name === "CssSyntaxError") {
                         console.error(err.toString());
@@ -768,9 +794,10 @@ async function build() {
         });
     }
     if (shouldWatch) {
-        /* Abort the watcher if stdin is closed to avoid zombie processes */ process.stdin.on("end", ()=>process.exit(0)
-        );
-        process.stdin.resume();
+        /* Abort the watcher if stdin is closed to avoid zombie processes */ if (process.stdin.isTTY) {
+            process.stdin.on("end", ()=>process.exit(0));
+            process.stdin.resume();
+        }
         startWatcher();
     } else {
         buildOnce();