tailwindcss 3.0.13 → 3.0.17

package/CHANGELOG.md

@@ -9,6 +9,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.0.17] - 2022-01-26
+
+### Fixed
+
+- Remove false positive warning in CLI when using the `--content` option ([#7220](https://github.com/tailwindlabs/tailwindcss/pull/7220))
+
+## [3.0.16] - 2022-01-24
+
+### Fixed
+
+- Ensure to transpile the PostCSS Nesting plugin (tailwindcss/nesting) ([#7080](https://github.com/tailwindlabs/tailwindcss/pull/7080))
+- Improve various warnings ([#7118](https://github.com/tailwindlabs/tailwindcss/pull/7118))
+- Fix grammatical mistake ([cca5a38](https://github.com/tailwindlabs/tailwindcss/commit/cca5a3804e1d3ee0214491921e1aec35bf62a813))
+
+## [3.0.15] - 2022-01-15
+
+### Fixed
+
+- Temporarily remove optional chaining in nesting plugin ([#7077](https://github.com/tailwindlabs/tailwindcss/pull/7077))
+
+## [3.0.14] - 2022-01-14
+
+### Added
+
+- Show warnings for invalid content config ([#7065](https://github.com/tailwindlabs/tailwindcss/pull/7065))
+
+### Fixed
+
+- Only emit utility/component variants when those layers exist ([#7066](https://github.com/tailwindlabs/tailwindcss/pull/7066))
+- Ensure nesting plugins can receive options ([#7016](https://github.com/tailwindlabs/tailwindcss/pull/7016))
+
 ## [3.0.13] - 2022-01-11
 
 ### Fixed
@@ -1798,7 +1829,11 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.13...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.17...HEAD
+[3.0.17]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.16...v3.0.17
+[3.0.16]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.15...v3.0.16
+[3.0.15]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.14...v3.0.15
+[3.0.14]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.13...v3.0.14
 [3.0.13]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.12...v3.0.13
 [3.0.12]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.11...v3.0.12
 [3.0.11]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.10...v3.0.11

package/lib/cli.js

@@ -400,7 +400,6 @@ async function build() {
     }
     function resolveConfig() {
         let config = configPath ? require(configPath) : {};
-        let resolvedConfig = (0, _resolveConfig).default(config);
         if (args['--purge']) {
             _log.default.warn('purge-flag-deprecated', [
                 'The `--purge` flag has been deprecated.',
@@ -411,9 +410,16 @@ async function build() {
             }
         }
         if (args['--content']) {
-            resolvedConfig.content.files = args['--content'].split(/(?<!{[^}]+),/);
+            let files = args['--content'].split(/(?<!{[^}]+),/);
+            let resolvedConfig = (0, _resolveConfig).default(config, {
+                content: {
+                    files
+                }
+            });
+            resolvedConfig.content.files = files;
+            return resolvedConfig;
         }
-        return resolvedConfig;
+        return (0, _resolveConfig).default(config);
     }
     function extractFileGlobs(config) {
         return config.content.files.filter((file)=>{

package/lib/corePlugins.js

@@ -184,7 +184,8 @@ let variantPlugins = {
             mode = 'media';
             _log.default.warn('darkmode-false', [
                 'The `darkMode` option in your Tailwind CSS configuration is set to `false`, which now behaves the same as `media`.',
-                'Change `darkMode` to `media` or remove it entirely.', 
+                'Change `darkMode` to `media` or remove it entirely.',
+                'https://tailwindcss.com/docs/upgrade-guide#remove-dark-mode-configuration', 
             ]);
         }
         if (mode === 'class') {

package/lib/lib/expandTailwindAtRules.js

@@ -7,6 +7,7 @@ var _quickLru = _interopRequireDefault(require("quick-lru"));
 var sharedState = _interopRequireWildcard(require("./sharedState"));
 var _generateRules = require("./generateRules");
 var _bigSign = _interopRequireDefault(require("../util/bigSign"));
+var _log = _interopRequireDefault(require("../util/log"));
 var _cloneNodes = _interopRequireDefault(require("../util/cloneNodes"));
 var _defaultExtractor = require("./defaultExtractor");
 function _interopRequireDefault(obj) {
@@ -191,8 +192,6 @@ function expandTailwindAtRules(context) {
                 ...baseNodes,
                 ...defaultNodes
             ], layerNodes.base.source));
-        }
-        if (layerNodes.base) {
             layerNodes.base.remove();
         }
         if (layerNodes.components) {
@@ -207,15 +206,34 @@ function expandTailwindAtRules(context) {
             ], layerNodes.utilities.source));
             layerNodes.utilities.remove();
         }
+        // We do post-filtering to not alter the emitted order of the variants
+        const variantNodes = Array.from(screenNodes).filter((node)=>{
+            var ref;
+            const parentLayer = (ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer;
+            if (parentLayer === 'components') {
+                return layerNodes.components !== null;
+            }
+            if (parentLayer === 'utilities') {
+                return layerNodes.utilities !== null;
+            }
+            return true;
+        });
         if (layerNodes.variants) {
-            layerNodes.variants.before((0, _cloneNodes).default([
-                ...screenNodes
-            ], layerNodes.variants.source));
+            layerNodes.variants.before((0, _cloneNodes).default(variantNodes, layerNodes.variants.source));
             layerNodes.variants.remove();
-        } else {
-            root.append((0, _cloneNodes).default([
-                ...screenNodes
-            ], root.source));
+        } else if (variantNodes.length > 0) {
+            root.append((0, _cloneNodes).default(variantNodes, root.source));
+        }
+        // If we've got a utility layer and no utilities are generated there's likely something wrong
+        const hasUtilityVariants = variantNodes.some((node)=>{
+            var ref;
+            return ((ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.parentLayer) === 'utilities';
+        });
+        if (layerNodes.utilities && utilityNodes.size === 0 && !hasUtilityVariants) {
+            _log.default.warn('content-problems', [
+                'No utility classes were detected in your source files. If this is unexpected, double-check the `content` option in your Tailwind CSS configuration.',
+                'https://tailwindcss.com/docs/content-configuration', 
+            ]);
         }
         // ---
         if (env.DEBUG) {

package/lib/lib/generateRules.js

@@ -217,6 +217,13 @@ function applyVariant(variant, matches, context) {
                         rule.selector = before;
                     });
                 }
+                // This tracks the originating layer for the variant
+                // For example:
+                // .sm:underline {} is a variant of something in the utilities layer
+                // .sm:container {} is a variant of the container component
+                clone.nodes[0].raws.tailwind = {
+                    parentLayer: meta.layer
+                };
                 var _collectedFormats;
                 let withOffset = [
                     {

package/lib/lib/normalizeTailwindDirectives.js

@@ -49,7 +49,8 @@ function normalizeTailwindDirectives(root) {
             ].includes(atRule.name)) {
                 _log.default.warn(`${atRule.name}-at-rule-deprecated`, [
                     `The \`@${atRule.name}\` directive has been deprecated in Tailwind CSS v3.0.`,
-                    `Use \`@layer utilities\` or \`@layer components\` instead.`, 
+                    `Use \`@layer utilities\` or \`@layer components\` instead.`,
+                    'https://tailwindcss.com/docs/upgrade-guide#replace-variants-with-layer', 
                 ]);
             }
             layerDirectives.add(atRule);

package/lib/lib/setupContextUtils.js

@@ -664,7 +664,8 @@ function registerPlugins(plugins, context) {
             if (value1 instanceof RegExp) {
                 _log.default.warn('root-regex', [
                     'Regular expressions in `safelist` work differently in Tailwind CSS v3.0.',
-                    'Update your `safelist` configuration to eliminate this warning.'
+                    'Update your `safelist` configuration to eliminate this warning.',
+                    'https://tailwindcss.com/docs/content-configuration#safelisting-classes', 
                 ]);
                 continue;
             }
@@ -716,7 +717,8 @@ function registerPlugins(plugins, context) {
                 if (count !== 0) continue;
                 _log.default.warn([
                     `The safelist pattern \`${regex}\` doesn't match any Tailwind CSS classes.`,
-                    'Fix this pattern or remove it from your `safelist` configuration.', 
+                    'Fix this pattern or remove it from your `safelist` configuration.',
+                    'https://tailwindcss.com/docs/content-configuration#safelisting-classes', 
                 ]);
             }
         }

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = void 0;
+var _plugin = require("./plugin");
+var _default = Object.assign(function(opts) {
+    return {
+        postcssPlugin: 'tailwindcss/nesting',
+        Once (root, { result  }) {
+            return (0, _plugin).nesting(opts)(root, result);
+        }
+    };
+}, {
+    postcss: true
+});
+exports.default = _default;

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.nesting = nesting;
+var _postcss = _interopRequireDefault(require("postcss"));
+var _postcssNested = _interopRequireDefault(require("postcss-nested"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function nesting(opts = _postcssNested.default) {
+    return (root, result)=>{
+        root.walkAtRules('screen', (rule)=>{
+            rule.name = 'media';
+            rule.params = `screen(${rule.params})`;
+        });
+        root.walkAtRules('apply', (rule)=>{
+            rule.before(_postcss.default.decl({
+                prop: '__apply',
+                value: rule.params,
+                source: rule.source
+            }));
+            rule.remove();
+        });
+        let plugin = (()=>{
+            var ref;
+            if (typeof opts === 'function' || typeof opts === 'object' && (opts === null || opts === void 0 ? void 0 : (ref = opts.hasOwnProperty) === null || ref === void 0 ? void 0 : ref.call(opts, 'postcssPlugin'))) {
+                return opts;
+            }
+            if (typeof opts === 'string') {
+                return require(opts);
+            }
+            if (Object.keys(opts).length <= 0) {
+                return _postcssNested.default;
+            }
+            throw new Error('tailwindcss/nesting should be loaded with a nesting plugin.');
+        })();
+        (0, _postcss).default([
+            plugin
+        ]).process(root, result.opts).sync();
+        root.walkDecls('__apply', (decl)=>{
+            decl.before(_postcss.default.atRule({
+                name: 'apply',
+                params: decl.value,
+                source: decl.source
+            }));
+            decl.remove();
+        });
+        return root;
+    };
+}

package/lib/util/normalizeConfig.js

@@ -123,7 +123,8 @@ function normalizeConfig(config) {
     if (!valid) {
         _log.default.warn('purge-deprecation', [
             'The `purge`/`content` options have changed in Tailwind CSS v3.0.',
-            'Update your configuration file to eliminate this warning.'
+            'Update your configuration file to eliminate this warning.',
+            'https://tailwindcss.com/docs/upgrade-guide#configure-content-sources', 
         ]);
     }
     // Normalize the `safelist`
@@ -140,7 +141,8 @@ function normalizeConfig(config) {
     if (typeof config.prefix === 'function') {
         _log.default.warn('prefix-function', [
             'As of Tailwind CSS v3.0, `prefix` cannot be a function.',
-            'Update `prefix` in your configuration to be a string to eliminate this warning.'
+            'Update `prefix` in your configuration to be a string to eliminate this warning.',
+            'https://tailwindcss.com/docs/upgrade-guide#prefix-cannot-be-a-function', 
         ]);
         config.prefix = '';
     } else {
@@ -221,11 +223,18 @@ function normalizeConfig(config) {
     for (let file of config.content.files){
         if (typeof file === 'string' && /{([^,]*?)}/g.test(file)) {
             _log.default.warn('invalid-glob-braces', [
-                `The glob pattern ${(0, _log).dim(file)} in your config is invalid.`,
-                `    Update it to ${(0, _log).dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`
+                `The glob pattern ${(0, _log).dim(file)} in your Tailwind CSS configuration is invalid.`,
+                `Update it to ${(0, _log).dim(file.replace(/{([^,]*?)}/g, '$1'))} to silence this warning.`
             ]);
             break;
         }
     }
+    if (config.content.files.length === 0) {
+        _log.default.warn('content-problems', [
+            'The `content` option in your Tailwind CSS configuration is missing or empty.',
+            'Configure your content sources or your generated CSS will be missing styles.',
+            'https://tailwindcss.com/docs/content-configuration', 
+        ]);
+    }
     return config;
 }

package/nesting/index.js

@@ -1,12 +1,2 @@
-let nesting = require('./plugin')
-
-module.exports = (opts) => {
-  return {
-    postcssPlugin: 'tailwindcss/nesting',
-    Once(root, { result }) {
-      return nesting(opts)(root, result)
-    },
-  }
-}
-
-module.exports.postcss = true
+let nesting = require('../lib/postcss-plugins/nesting')
+module.exports = (nesting.__esModule ? nesting : { default: nesting }).default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.0.13",
+  "version": "3.0.17",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -45,16 +45,16 @@
   "devDependencies": {
     "@swc/cli": "^0.1.55",
     "@swc/core": "^1.2.127",
-    "@swc/jest": "^0.2.15",
+    "@swc/jest": "^0.2.17",
     "@swc/register": "^0.1.7",
-    "autoprefixer": "^10.4.1",
-    "cssnano": "^5.0.14",
+    "autoprefixer": "^10.4.2",
+    "cssnano": "^5.0.15",
     "esbuild": "^0.14.10",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.4.5",
-    "jest-diff": "^27.4.2",
+    "jest": "^27.4.7",
+    "jest-diff": "^27.4.6",
     "postcss": "^8.4.5",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.0"
@@ -66,13 +66,13 @@
   "dependencies": {
     "arg": "^5.0.1",
     "chalk": "^4.1.2",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
     "cosmiconfig": "^7.0.1",
     "detective": "^5.2.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
-    "fast-glob": "^3.2.7",
+    "fast-glob": "^3.2.11",
     "glob-parent": "^6.0.2",
     "is-glob": "^4.0.3",
     "normalize-path": "^3.0.0",