tailwindcss 0.0.0-insiders.e2d5f21 → 0.0.0-insiders.e302ef1

package/lib/cli.js

@@ -40,7 +40,26 @@ function formatNodes(root) {
         root.first.raws.before = '';
     }
 }
-function help({ message , usage , commands , options  }) {
+async function outputFile(file, contents) {
+    if (_fs.default.existsSync(file) && await _fs.default.promises.readFile(file, 'utf8') === contents) {
+        return; // Skip writing the file
+    }
+    // Write the file
+    await _fs.default.promises.writeFile(file, contents, 'utf8');
+}
+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)
+        );
+    });
+}
+function help({ message , usage , commands: commands1 , options  }) {
     let indent = 2;
     // Render header
     console.log();
@@ -61,17 +80,16 @@ function help({ message , usage , commands , options  }) {
         }
     }
     // Render commands
-    if (commands && commands.length > 0) {
+    if (commands1 && commands1.length > 0) {
         console.log();
         console.log('Commands:');
-        for (let command of commands){
-            console.log(' '.repeat(indent), command);
+        for (let command1 of commands1){
+            console.log(' '.repeat(indent), command1);
         }
     }
     // Render options
     if (options) {
-        let groupedOptions = {
-        };
+        let groupedOptions = {};
         for (let [key, value] of Object.entries(options)){
             if (typeof value === 'object') {
                 groupedOptions[key] = {
@@ -86,12 +104,12 @@ function help({ message , usage , commands , options  }) {
         }
         console.log();
         console.log('Options:');
-        for (let { flags , description , deprecated  } of Object.values(groupedOptions)){
+        for (let { flags: flags1 , 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);
+            if (flags1.length === 1) {
+                console.log(' '.repeat(indent + 4 /* 4 = "-i, ".length */ ), flags1.slice().reverse().join(', ').padEnd(20, ' '), description);
             } else {
-                console.log(' '.repeat(indent), flags.slice().reverse().join(', ').padEnd(24, ' '), description);
+                console.log(' '.repeat(indent), flags1.slice().reverse().join(', ').padEnd(24, ' '), description);
             }
         }
     }
@@ -110,7 +128,7 @@ function oneOf(...options) {
         manualParsing: true
     });
 }
-let commands1 = {
+let commands = {
     init: {
         run: init,
         args: {
@@ -187,31 +205,31 @@ 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(commands1).filter((command)=>command !== 'build'
-        ).map((command)=>`${command} [options]`
+        commands: Object.keys(commands).filter((command2)=>command2 !== 'build'
+        ).map((command3)=>`${command3} [options]`
         ),
         options: {
-            ...commands1.build.args,
+            ...commands.build.args,
             ...sharedFlags
         }
     });
     process.exit(0);
 }
-let command1 = ((arg = '')=>arg.startsWith('-') ? undefined : arg
+let command = ((arg = '')=>arg.startsWith('-') ? undefined : arg
 )(process.argv[2]) || 'build';
-if (commands1[command1] === undefined) {
-    if (_fs.default.existsSync(_path.default.resolve(command1))) {
+if (commands[command] === undefined) {
+    if (_fs.default.existsSync(_path.default.resolve(command))) {
         // TODO: Deprecate this in future versions
         // Check if non-existing command, might be a file.
-        command1 = 'build';
+        command = 'build';
     } else {
         help({
-            message: `Invalid command: ${command1}`,
+            message: `Invalid command: ${command}`,
             usage: [
                 'tailwindcss <command> [options]'
             ],
-            commands: Object.keys(commands1).filter((command)=>command !== 'build'
-            ).map((command)=>`${command} [options]`
+            commands: Object.keys(commands).filter((command4)=>command4 !== 'build'
+            ).map((command5)=>`${command5} [options]`
             ),
             options: sharedFlags
         });
@@ -219,11 +237,11 @@ if (commands1[command1] === undefined) {
     }
 }
 // Execute command
-let { args: flags1 , run  } = commands1[command1];
-let args1 = (()=>{
+let { args: flags , run  } = commands[command];
+let args = (()=>{
     try {
         let result = (0, _arg).default(Object.fromEntries(Object.entries({
-            ...flags1,
+            ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
             var ref;
@@ -240,23 +258,23 @@ let args1 = (()=>{
             let flag = result['_'][i];
             if (!flag.startsWith('-')) continue;
             let flagName = flag;
-            let handler = flags1[flag];
+            let handler = flags[flag];
             // Resolve flagName & handler
             while(typeof handler === 'string'){
                 flagName = handler;
-                handler = flags1[handler];
+                handler = flags[handler];
             }
             if (!handler) continue;
-            let args = [];
+            let args1 = [];
             let offset = i + 1;
             // Parse args for current flag
             while(result['_'][offset] && !result['_'][offset].startsWith('-')){
-                args.push(result['_'][offset++]);
+                args1.push(result['_'][offset++]);
             }
             // Cleanup manually parsed flags + args
-            result['_'].splice(i, 1 + args.length);
+            result['_'].splice(i, 1 + args1.length);
             // Set the resolved value in the `result` object
-            result[flagName] = handler.type(args.length === 0 ? undefined : args.length === 1 ? args[0] : args, flagName);
+            result[flagName] = handler.type(args1.length === 0 ? undefined : args1.length === 1 ? args1[0] : args1, 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
@@ -264,8 +282,8 @@ let args1 = (()=>{
         //
         // E.g.: tailwindcss input.css -> _: ['build', 'input.css']
         // E.g.: tailwindcss build input.css -> _: ['build', 'input.css']
-        if (result['_'][0] !== command1) {
-            result['_'].unshift(command1);
+        if (result['_'][0] !== command) {
+            result['_'].unshift(command);
         }
         return result;
     } catch (err) {
@@ -282,14 +300,14 @@ let args1 = (()=>{
         throw err;
     }
 })();
-if (args1['--help']) {
+if (args['--help']) {
     help({
         options: {
-            ...flags1,
+            ...flags,
             ...sharedFlags
         },
         usage: [
-            `tailwindcss ${command1} [options]`
+            `tailwindcss ${command} [options]`
         ]
     });
     process.exit(0);
@@ -299,17 +317,17 @@ run();
 function init() {
     let messages = [];
     var ref;
-    let tailwindConfigLocation = _path.default.resolve((ref = args1['_'][1]) !== null && ref !== void 0 ? ref : './tailwind.config.js');
+    let tailwindConfigLocation = _path.default.resolve((ref = args['_'][1]) !== null && ref !== void 0 ? ref : './tailwind.config.js');
     if (_fs.default.existsSync(tailwindConfigLocation)) {
         messages.push(`${_path.default.basename(tailwindConfigLocation)} already exists.`);
     } else {
-        let stubFile = _fs.default.readFileSync(args1['--full'] ? _path.default.resolve(__dirname, '../stubs/defaultConfig.stub.js') : _path.default.resolve(__dirname, '../stubs/simpleConfig.stub.js'), 'utf8');
+        let stubFile = _fs.default.readFileSync(args['--full'] ? _path.default.resolve(__dirname, '../stubs/defaultConfig.stub.js') : _path.default.resolve(__dirname, '../stubs/simpleConfig.stub.js'), 'utf8');
         // 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 (args1['--postcss']) {
+    if (args['--postcss']) {
         let postcssConfigLocation = _path.default.resolve('./postcss.config.js');
         if (_fs.default.existsSync(postcssConfigLocation)) {
             messages.push(`${_path.default.basename(postcssConfigLocation)} already exists.`);
@@ -327,37 +345,35 @@ function init() {
     }
 }
 async function build() {
-    let input = args1['--input'];
-    let output = args1['--output'];
-    let shouldWatch = args1['--watch'];
-    let includePostCss = args1['--postcss'];
+    let input = args['--input'];
+    let output = args['--output'];
+    let shouldWatch = args['--watch'];
+    let includePostCss = args['--postcss'];
     // TODO: Deprecate this in future versions
-    if (!input && args1['_'][1]) {
+    if (!input && args['_'][1]) {
         console.error('[deprecation] Running tailwindcss without -i, please provide an input file.');
-        input = args1['--input'] = args1['_'][1];
+        input = args['--input'] = args['_'][1];
     }
-    if (input && !_fs.default.existsSync(input = _path.default.resolve(input))) {
-        console.error(`Specified input file ${args1['--input']} does not exist.`);
+    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 (args1['--config'] && !_fs.default.existsSync(args1['--config'] = _path.default.resolve(args1['--config']))) {
-        console.error(`Specified config file ${args1['--config']} does not exist.`);
+    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);
     }
-    let configPath = args1['--config'] ? args1['--config'] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null
+    let configPath = args['--config'] ? args['--config'] : ((defaultPath)=>_fs.default.existsSync(defaultPath) ? defaultPath : null
     )(_path.default.resolve('./tailwind.config.js'));
     async function loadPostCssPlugins() {
-        let customPostCssPath = typeof args1['--postcss'] === 'string' ? args1['--postcss'] : undefined;
+        let customPostCssPath = typeof args['--postcss'] === 'string' ? args['--postcss'] : undefined;
         let { plugins: configPlugins  } = customPostCssPath ? await (async ()=>{
             let file = _path.default.resolve(customPostCssPath);
             // Implementation, see: https://unpkg.com/browse/postcss-load-config@3.0.1/src/index.js
-            let { config ={
-            }  } = await (0, _cosmiconfig).cosmiconfig('postcss').load(file);
+            let { config ={}  } = await (0, _cosmiconfig).cosmiconfig('postcss').load(file);
             if (typeof config === 'function') {
                 config = config();
             } else {
-                config = Object.assign({
-                }, config);
+                config = Object.assign({}, config);
             }
             if (!config.plugins) {
                 config.plugins = [];
@@ -383,22 +399,27 @@ async function build() {
         ];
     }
     function resolveConfig() {
-        let config = configPath ? require(configPath) : {
-        };
-        let resolvedConfig = (0, _resolveConfig).default(config);
-        if (args1['--purge']) {
+        let config = configPath ? require(configPath) : {};
+        if (args['--purge']) {
             _log.default.warn('purge-flag-deprecated', [
                 'The `--purge` flag has been deprecated.',
                 'Please use `--content` instead.', 
             ]);
-            if (!args1['--content']) {
-                args1['--content'] = args1['--purge'];
+            if (!args['--content']) {
+                args['--content'] = args['--purge'];
             }
         }
-        if (args1['--content']) {
-            resolvedConfig.content.files = args1['--content'].split(/(?<!{[^}]+),/);
+        if (args['--content']) {
+            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)=>{
@@ -457,17 +478,16 @@ async function build() {
         let plugins = [
             ...beforePlugins,
             tailwindPlugin,
-            !args1['--minify'] && formatNodes,
+            !args['--minify'] && formatNodes,
             ...afterPlugins,
-            !args1['--no-autoprefixer'] && (()=>{
+            !args['--no-autoprefixer'] && (()=>{
                 // Try to load a local `autoprefixer` version first
                 try {
                     return require('autoprefixer');
-                } catch  {
-                }
+                } catch  {}
                 return (0, _indexJs).lazyAutoprefixer();
             })(),
-            args1['--minify'] && (()=>{
+            args['--minify'] && (()=>{
                 let options = {
                     preset: [
                         'default',
@@ -479,8 +499,7 @@ async function build() {
                 // Try to load a local `cssnano` version first
                 try {
                     return require('cssnano');
-                } catch  {
-                }
+                } catch  {}
                 return (0, _indexJs).lazyCssnano()(options);
             })(), 
         ].filter(Boolean);
@@ -499,10 +518,8 @@ async function build() {
                     return process.stdout.write(result.css);
                 }
                 return Promise.all([
-                    _fs.default.promises.writeFile(output, result.css, ()=>true
-                    ),
-                    result.map && _fs.default.writeFile(output + '.map', result.map.toString(), ()=>true
-                    ), 
+                    outputFile(output, result.css),
+                    result.map && outputFile(output + '.map', result.map.toString()), 
                 ].filter(Boolean));
             }).then(()=>{
                 let end = process.hrtime.bigint();
@@ -510,7 +527,18 @@ async function build() {
                 console.error('Done in', (end - start) / BigInt(1000000) + 'ms.');
             });
         }
-        let css1 = input ? _fs.default.readFileSync(_path.default.resolve(input), 'utf8') : '@tailwind base; @tailwind components; @tailwind utilities';
+        let css1 = await (()=>{
+            // Piping in data, let's drain the stdin
+            if (input === '-') {
+                return drainStdin();
+            }
+            // Input file has been provided
+            if (input) {
+                return _fs.default.readFileSync(_path.default.resolve(input), 'utf8');
+            }
+            // No input file provided, fallback to default atrules
+            return '@tailwind base; @tailwind components; @tailwind utilities';
+        })();
         return processCSS(css1);
     }
     let context = null;
@@ -541,17 +569,16 @@ async function build() {
         let plugins = [
             ...beforePlugins,
             '__TAILWIND_PLUGIN_POSITION__',
-            !args1['--minify'] && formatNodes,
+            !args['--minify'] && formatNodes,
             ...afterPlugins,
-            !args1['--no-autoprefixer'] && (()=>{
+            !args['--no-autoprefixer'] && (()=>{
                 // Try to load a local `autoprefixer` version first
                 try {
                     return require('autoprefixer');
-                } catch  {
-                }
+                } catch  {}
                 return (0, _indexJs).lazyAutoprefixer();
             })(),
-            args1['--minify'] && (()=>{
+            args['--minify'] && (()=>{
                 let options = {
                     preset: [
                         'default',
@@ -563,8 +590,7 @@ async function build() {
                 // Try to load a local `cssnano` version first
                 try {
                     return require('cssnano');
-                } catch  {
-                }
+                } catch  {}
                 return (0, _indexJs).lazyCssnano()(options);
             })(), 
         ].filter(Boolean);
@@ -619,11 +645,9 @@ async function build() {
                     if (!output) {
                         return process.stdout.write(result.css);
                     }
-                    await Promise.all([
-                        _fs.default.promises.writeFile(output, result.css, ()=>true
-                        ),
-                        result.map && _fs.default.writeFile(output + '.map', result.map.toString(), ()=>true
-                        ), 
+                    return Promise.all([
+                        outputFile(output, result.css),
+                        result.map && outputFile(output + '.map', result.map.toString()), 
                     ].filter(Boolean));
                 }).then(()=>{
                     let end = process.hrtime.bigint();
@@ -636,7 +660,18 @@ async function build() {
                     }
                 });
             }
-            let css2 = input ? _fs.default.readFileSync(_path.default.resolve(input), 'utf8') : '@tailwind base; @tailwind components; @tailwind utilities';
+            let css2 = await (()=>{
+                // Piping in data, let's drain the stdin
+                if (input === '-') {
+                    return drainStdin();
+                }
+                // Input file has been provided
+                if (input) {
+                    return _fs.default.readFileSync(_path.default.resolve(input), 'utf8');
+                }
+                // No input file provided, fallback to default atrules
+                return '@tailwind base; @tailwind components; @tailwind utilities';
+            })();
             let result1 = await processCSS(css2);
             env.DEBUG && console.timeEnd('Finished in');
             return result1;