tailwindcss 3.1.6 → 3.1.7

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Nothing yet!
+
+## [3.1.7] - 2022-07-29
+
+### Fixed
+
+- Don't rewrite source maps for `@layer` rules ([#8971](https://github.com/tailwindlabs/tailwindcss/pull/8971))
+
+### Added
+
+- Added types for `resolveConfig` ([#8924](https://github.com/tailwindlabs/tailwindcss/pull/8924))
+
+## [3.1.6] - 2022-07-11
+
 ### Fixed
 
 - Fix usage on Node 12.x ([b4e637e](https://github.com/tailwindlabs/tailwindcss/commit/b4e637e2e096a9d6f2210efba9541f6fd4f28e56))
@@ -1641,7 +1655,7 @@ No release notes
 
 - Make it possible to disable all core plugins using `corePlugins: false`
 - Make it possible to configure a single list of variants that applies to all utility plugins
-- Make it possible to whitelist which core plugins should be enabled
+- Make it possible to safelist which core plugins should be enabled
 
 ### Fixed
 
@@ -2007,7 +2021,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...HEAD
+[3.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...v3.1.7
+[3.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...v3.1.6
 [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

package/lib/cli-peer-dependencies.js

@@ -2,10 +2,18 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.lazyPostcss = lazyPostcss;
-exports.lazyPostcssImport = lazyPostcssImport;
-exports.lazyAutoprefixer = lazyAutoprefixer;
-exports.lazyCssnano = lazyCssnano;
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    lazyPostcss: ()=>lazyPostcss,
+    lazyPostcssImport: ()=>lazyPostcssImport,
+    lazyAutoprefixer: ()=>lazyAutoprefixer,
+    lazyCssnano: ()=>lazyCssnano
+});
 function lazyPostcss() {
     return require("postcss");
 }

package/lib/cli.js

@@ -1,24 +1,27 @@
 #!/usr/bin/env node
 "use strict";
-var _indexJs = require("../peers/index.js");
-var _chokidar = _interopRequireDefault(require("chokidar"));
-var _path = _interopRequireDefault(require("path"));
-var _arg = _interopRequireDefault(require("arg"));
-var _fs = _interopRequireDefault(require("fs"));
-var _postcssLoadConfig = _interopRequireDefault(require("postcss-load-config"));
-var _lilconfig = require("lilconfig");
-var _plugins // Little bit scary, looking at private/internal API
- = _interopRequireDefault(require("postcss-load-config/src/plugins"));
-var _options // Little bit scary, looking at private/internal API
- = _interopRequireDefault(require("postcss-load-config/src/options"));
-var _processTailwindFeatures = _interopRequireDefault(require("./processTailwindFeatures"));
-var _resolveConfig = _interopRequireDefault(require("../resolveConfig"));
-var _fastGlob = _interopRequireDefault(require("fast-glob"));
-var _getModuleDependencies = _interopRequireDefault(require("./lib/getModuleDependencies"));
-var _log = _interopRequireDefault(require("./util/log"));
-var _packageJson = _interopRequireDefault(require("../package.json"));
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-var _validateConfigJs = require("./util/validateConfig.js");
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _indexJs = require("../peers/index.js");
+const _chokidar = /*#__PURE__*/ _interopRequireDefault(require("chokidar"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
+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 _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../resolveConfig"));
+const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
+const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("./lib/getModuleDependencies"));
+const _log = /*#__PURE__*/ _interopRequireDefault(require("./util/log"));
+const _packageJson = /*#__PURE__*/ _interopRequireDefault(require("../package.json"));
+const _normalizePath = /*#__PURE__*/ _interopRequireDefault(require("normalize-path"));
+const _validateConfigJs = require("./util/validateConfig.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -76,7 +79,7 @@ function drainStdin() {
         process.stdin.on("error", (err)=>reject(err));
     });
 }
-function help({ message , usage , commands: commands1 , options  }) {
+function help({ message , usage , commands , options  }) {
     let indent = 2;
     // Render header
     console.log();
@@ -97,11 +100,11 @@ function help({ message , usage , commands: commands1 , options  }) {
         }
     }
     // Render commands
-    if (commands1 && commands1.length > 0) {
+    if (commands && commands.length > 0) {
         console.log();
         console.log("Commands:");
-        for (let command1 of commands1){
-            console.log(" ".repeat(indent), command1);
+        for (let command of commands){
+            console.log(" ".repeat(indent), command);
         }
     }
     // Render options
@@ -121,12 +124,12 @@ function help({ message , usage , commands: commands1 , options  }) {
         }
         console.log();
         console.log("Options:");
-        for (let { flags: flags1 , description , deprecated  } of Object.values(groupedOptions)){
+        for (let { flags , description , deprecated  } of Object.values(groupedOptions)){
             if (deprecated) continue;
-            if (flags1.length === 1) {
-                console.log(" ".repeat(indent + 4 /* 4 = "-i, ".length */ ), flags1.slice().reverse().join(", ").padEnd(20, " "), description);
+            if (flags.length === 1) {
+                console.log(" ".repeat(indent + 4 /* 4 = "-i, ".length */ ), flags.slice().reverse().join(", ").padEnd(20, " "), description);
             } else {
-                console.log(" ".repeat(indent), flags1.slice().reverse().join(", ").padEnd(24, " "), description);
+                console.log(" ".repeat(indent), flags.slice().reverse().join(", ").padEnd(24, " "), description);
             }
         }
     }
@@ -150,7 +153,7 @@ function loadPostcss() {
     try {
         return require("postcss");
     } catch  {}
-    return (0, _indexJs).lazyPostcss();
+    return (0, _indexJs.lazyPostcss)();
 }
 let commands = {
     init: {
@@ -233,7 +236,7 @@ if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.
             "tailwindcss [--input input.css] [--output output.css] [--watch] [options...]",
             "tailwindcss init [--full] [--postcss] [options...]", 
         ],
-        commands: Object.keys(commands).filter((command2)=>command2 !== "build").map((command3)=>`${command3} [options]`),
+        commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
         options: {
             ...commands.build.args,
             ...sharedFlags
@@ -253,7 +256,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((command)=>command !== "build").map((command)=>`${command} [options]`),
             options: sharedFlags
         });
         process.exit(1);
@@ -263,7 +266,7 @@ if (commands[command] === undefined) {
 let { args: flags , run  } = commands[command];
 let args = (()=>{
     try {
-        let result = (0, _arg).default(Object.fromEntries(Object.entries({
+        let result = (0, _arg.default)(Object.fromEntries(Object.entries({
             ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
@@ -287,16 +290,16 @@ let args = (()=>{
                 handler = flags[handler];
             }
             if (!handler) continue;
-            let args1 = [];
+            let args = [];
             let offset = i + 1;
             // Parse args for current flag
             while(result["_"][offset] && !result["_"][offset].startsWith("-")){
-                args1.push(result["_"][offset++]);
+                args.push(result["_"][offset++]);
             }
             // Cleanup manually parsed flags + args
-            result["_"].splice(i, 1 + args1.length);
+            result["_"].splice(i, 1 + args.length);
             // Set the resolved value in the `result` object
-            result[flagName] = handler.type(args1.length === 0 ? undefined : args1.length === 1 ? args1[0] : args1, flagName);
+            result[flagName] = handler.type(args.length === 0 ? undefined : args.length === 1 ? args[0] : args, flagName);
         }
         // Ensure that the `command` is always the first argument in the `args`.
         // This is important so that we don't have to check if a default command
@@ -354,8 +357,8 @@ function init() {
         if (_fs.default.existsSync(postcssConfigLocation)) {
             messages.push(`${_path.default.basename(postcssConfigLocation)} already exists.`);
         } else {
-            let stubFile = _fs.default.readFileSync(_path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js"), "utf8");
-            _fs.default.writeFileSync(postcssConfigLocation, stubFile, "utf8");
+            let stubFile1 = _fs.default.readFileSync(_path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js"), "utf8");
+            _fs.default.writeFileSync(postcssConfigLocation, stubFile1, "utf8");
             messages.push(`Created PostCSS config file: ${_path.default.basename(postcssConfigLocation)}`);
         }
     }
@@ -392,10 +395,10 @@ async function build() {
     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 ()=>{
+        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
-            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 {
@@ -406,11 +409,11 @@ async function build() {
             }
             return {
                 file,
-                plugins: (0, _plugins).default(config, file),
-                options: (0, _options).default(config, file)
+                plugins: (0, _plugins.default)(config, file),
+                options: (0, _options.default)(config, file)
             };
-        })() : await (0, _postcssLoadConfig).default();
-        let configPlugins = config1.plugins;
+        })() : await (0, _postcssLoadConfig.default)();
+        let configPlugins = config.plugins;
         let configPluginTailwindIdx = configPlugins.findIndex((plugin)=>{
             if (typeof plugin === "function" && plugin.name === "tailwindcss") {
                 return true;
@@ -425,7 +428,7 @@ async function build() {
         return [
             beforePlugins,
             afterPlugins,
-            config1.options
+            config.options
         ];
     }
     function loadBuiltinPostcssPlugins() {
@@ -447,7 +450,7 @@ async function build() {
                     try {
                         return require("postcss-import");
                     } catch  {}
-                    return (0, _indexJs).lazyPostcssImport();
+                    return (0, _indexJs.lazyPostcssImport)();
                 })(),
                 (root)=>{
                     root.walkComments((rule)=>{
@@ -478,18 +481,18 @@ async function build() {
         }
         if (args["--content"]) {
             let files = args["--content"].split(/(?<!{[^}]+),/);
-            let resolvedConfig = (0, _resolveConfig).default(config, {
+            let resolvedConfig = (0, _resolveConfig.default)(config, {
                 content: {
                     files
                 }
             });
             resolvedConfig.content.files = files;
-            resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
+            resolvedConfig = (0, _validateConfigJs.validateConfig)(resolvedConfig);
             return resolvedConfig;
         }
-        let resolvedConfig = (0, _resolveConfig).default(config);
-        resolvedConfig = (0, _validateConfigJs).validateConfig(resolvedConfig);
-        return resolvedConfig;
+        let resolvedConfig1 = (0, _resolveConfig.default)(config);
+        resolvedConfig1 = (0, _validateConfigJs.validateConfig)(resolvedConfig1);
+        return resolvedConfig1;
     }
     function extractFileGlobs(config) {
         return config.content.files.filter((file)=>{
@@ -497,7 +500,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)=>{
@@ -531,7 +534,7 @@ async function build() {
             return {
                 postcssPlugin: "tailwindcss",
                 Once (root, { result  }) {
-                    (0, _processTailwindFeatures).default(({ createContext  })=>{
+                    (0, _processTailwindFeatures.default)(({ createContext  })=>{
                         return ()=>{
                             return createContext(config, changedContent);
                         };
@@ -551,7 +554,7 @@ async function build() {
                 try {
                     return require("autoprefixer");
                 } catch  {}
-                return (0, _indexJs).lazyAutoprefixer();
+                return (0, _indexJs.lazyAutoprefixer)();
             })(),
             args["--minify"] && (()=>{
                 let options = {
@@ -566,7 +569,7 @@ async function build() {
                 try {
                     return require("cssnano");
                 } catch  {}
-                return (0, _indexJs).lazyCssnano()(options);
+                return (0, _indexJs.lazyCssnano)()(options);
             })(), 
         ].filter(Boolean);
         let postcss = loadPostcss();
@@ -593,7 +596,7 @@ async function build() {
                 console.error("Done in", (end - start) / BigInt(1e6) + "ms.");
             });
         }
-        let css1 = await (()=>{
+        let css = await (()=>{
             // Piping in data, let's drain the stdin
             if (input === "-") {
                 return drainStdin();
@@ -605,7 +608,7 @@ async function build() {
             // No input file provided, fallback to default atrules
             return "@tailwind base; @tailwind components; @tailwind utilities";
         })();
-        return processCSS(css1);
+        return processCSS(css);
     }
     let context = null;
     async function startWatcher() {
@@ -615,11 +618,11 @@ async function build() {
         let watcher = null;
         function refreshConfig() {
             env.DEBUG && console.time("Module dependencies");
-            for (let file1 of configDependencies){
-                delete require.cache[require.resolve(file1)];
+            for (let file of configDependencies){
+                delete require.cache[require.resolve(file)];
             }
             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);
                 }
@@ -638,7 +641,7 @@ async function build() {
                 try {
                     return require("autoprefixer");
                 } catch  {}
-                return (0, _indexJs).lazyAutoprefixer();
+                return (0, _indexJs.lazyAutoprefixer)();
             })(),
             args["--minify"] && (()=>{
                 let options = {
@@ -653,7 +656,7 @@ async function build() {
                 try {
                     return require("cssnano");
                 } catch  {}
-                return (0, _indexJs).lazyCssnano()(options);
+                return (0, _indexJs.lazyCssnano)()(options);
             })(), 
         ].filter(Boolean);
         async function rebuild(config) {
@@ -663,7 +666,7 @@ async function build() {
                     postcssPlugin: "tailwindcss",
                     Once (root, { result  }) {
                         env.DEBUG && console.time("Compiling CSS");
-                        (0, _processTailwindFeatures).default(({ createContext  })=>{
+                        (0, _processTailwindFeatures.default)(({ createContext  })=>{
                             console.error();
                             console.error("Rebuilding...");
                             return ()=>{
@@ -721,7 +724,7 @@ async function build() {
                     }
                 });
             }
-            let css2 = await (()=>{
+            let css = await (()=>{
                 // Piping in data, let's drain the stdin
                 if (input === "-") {
                     return drainStdin();
@@ -733,17 +736,17 @@ async function build() {
                 // No input file provided, fallback to default atrules
                 return "@tailwind base; @tailwind components; @tailwind utilities";
             })();
-            let result1 = await processCSS(css2);
+            let result = await processCSS(css);
             env.DEBUG && console.timeEnd("Finished in");
-            return result1;
+            return result;
         }
-        let config2 = refreshConfig(configPath);
+        let config = refreshConfig(configPath);
         if (input) {
             contextDependencies.add(_path.default.resolve(input));
         }
         watcher = _chokidar.default.watch([
             ...contextDependencies,
-            ...extractFileGlobs(config2)
+            ...extractFileGlobs(config)
         ], {
             usePolling: shouldPoll,
             interval: shouldPoll ? pollInterval : undefined,
@@ -758,16 +761,16 @@ async function build() {
             if (contextDependencies.has(file)) {
                 env.DEBUG && console.time("Resolve config");
                 context = null;
-                config2 = refreshConfig(configPath);
+                config = refreshConfig(configPath);
                 env.DEBUG && console.timeEnd("Resolve config");
                 env.DEBUG && console.time("Watch new files");
-                let globs = extractFileGlobs(config2);
+                let globs = extractFileGlobs(config);
                 watcher.add(configDependencies);
                 watcher.add(globs);
                 env.DEBUG && console.timeEnd("Watch new files");
                 chain = chain.then(async ()=>{
-                    changedContent.push(...getChangedContent(config2));
-                    await rebuild(config2);
+                    changedContent.push(...getChangedContent(config));
+                    await rebuild(config);
                 });
             } else {
                 chain = chain.then(async ()=>{
@@ -775,7 +778,7 @@ async function build() {
                         content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
                         extension: _path.default.extname(file).slice(1)
                     });
-                    await rebuild(config2);
+                    await rebuild(config);
                 });
             }
         });
@@ -785,12 +788,12 @@ async function build() {
                     content: _fs.default.readFileSync(_path.default.resolve(file), "utf8"),
                     extension: _path.default.extname(file).slice(1)
                 });
-                await rebuild(config2);
+                await rebuild(config);
             });
         });
         chain = chain.then(()=>{
-            changedContent.push(...getChangedContent(config2));
-            return rebuild(config2);
+            changedContent.push(...getChangedContent(config));
+            return rebuild(config);
         });
     }
     if (shouldWatch) {

package/lib/constants.js

@@ -2,36 +2,43 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.defaultPostCssConfigStubFile = exports.simpleConfigStubFile = exports.defaultConfigStubFile = exports.supportedPostCssConfigFile = exports.supportedConfigFiles = exports.cjsPostCssConfigFile = exports.cjsConfigFile = exports.defaultPostCssConfigFile = exports.defaultConfigFile = exports.cli = void 0;
-var _path = _interopRequireDefault(require("path"));
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    cli: ()=>cli,
+    defaultConfigFile: ()=>defaultConfigFile,
+    defaultPostCssConfigFile: ()=>defaultPostCssConfigFile,
+    cjsConfigFile: ()=>cjsConfigFile,
+    cjsPostCssConfigFile: ()=>cjsPostCssConfigFile,
+    supportedConfigFiles: ()=>supportedConfigFiles,
+    supportedPostCssConfigFile: ()=>supportedPostCssConfigFile,
+    defaultConfigStubFile: ()=>defaultConfigStubFile,
+    simpleConfigStubFile: ()=>simpleConfigStubFile,
+    defaultPostCssConfigStubFile: ()=>defaultPostCssConfigStubFile
+});
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 const cli = "tailwind";
-exports.cli = cli;
 const defaultConfigFile = "./tailwind.config.js";
-exports.defaultConfigFile = defaultConfigFile;
 const defaultPostCssConfigFile = "./postcss.config.js";
-exports.defaultPostCssConfigFile = defaultPostCssConfigFile;
 const cjsConfigFile = "./tailwind.config.cjs";
-exports.cjsConfigFile = cjsConfigFile;
 const cjsPostCssConfigFile = "./postcss.config.cjs";
-exports.cjsPostCssConfigFile = cjsPostCssConfigFile;
 const supportedConfigFiles = [
     cjsConfigFile,
     defaultConfigFile
 ];
-exports.supportedConfigFiles = supportedConfigFiles;
 const supportedPostCssConfigFile = [
     cjsPostCssConfigFile,
     defaultPostCssConfigFile
 ];
-exports.supportedPostCssConfigFile = supportedPostCssConfigFile;
 const defaultConfigStubFile = _path.default.resolve(__dirname, "../stubs/defaultConfig.stub.js");
-exports.defaultConfigStubFile = defaultConfigStubFile;
 const simpleConfigStubFile = _path.default.resolve(__dirname, "../stubs/simpleConfig.stub.js");
-exports.simpleConfigStubFile = simpleConfigStubFile;
 const defaultPostCssConfigStubFile = _path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js");
-exports.defaultPostCssConfigStubFile = defaultPostCssConfigStubFile;

package/lib/corePluginList.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _default = [
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _default = [
     "preflight",
     "container",
     "accessibility",
@@ -176,4 +179,3 @@ var _default = [
     "willChange",
     "content"
 ];
-exports.default = _default;