purgetss 6.2.3 → 6.2.5

package/bin/purgetss

@@ -38,7 +38,7 @@ program
 	.description(`Creates a new Alloy Project with ${chalk.green('PurgeTSS')} configured`)
 	.help(`Creates a new Alloy Project with ${chalk.green('PurgeTSS')} configured. You’ll need to have ${chalk.yellow('app.idprefix')} and ${chalk.yellow('app.workspace')} already configured.`)
 	.option('-f, --force', 'To overwrite an existing project')
-	.option('-t, --tailwind', `To install ${chalk.green('Tailwind CSS')} in your project for Tailwind CSS Intellisense VS Code extension`)
+	.option('-t, --tailwind', `Install ${chalk.green('Tailwind CSS')} for Tailwind CSS Intellisense VS Code extension`)
 	.option('-v, --vendor <arguments>', `Use any of the following arguments to copy specific font vendors:\n   ${chalk.yellow('fa')} = Font Awesome Icons\n   ${chalk.yellow('mi')} = Material Icons\n   ${chalk.yellow('ms')} = Material Symbols\n   ${chalk.yellow('f7')} = Framework7 Icons`)
 	.argument('<name>', 'The name of the project')
 	.action((args, options, logger) => {
@@ -68,17 +68,27 @@ program
 	.command('shades')
 	.alias('s')
 	.argument('[hexcode]', 'The base hexcode value')
-	.argument('[name]', 'Name of the color shades')
+	.argument('[name]', 'Name of the color')
+	.option('-n, --name', 'Name of the color')
 	.option('-q, --quotes', 'Keep double quotes in config.js')
 	.option('-r, --random', 'Generates shades from a random color')
 	.option('-l, --log', `Log the generated shades instead of saving them`)
 	.option('-j, --json', `Log a JSON compatible structure, to use it in ${chalk.yellow('app/config.json')}`)
 	.description(`Color shades generator from a given hexcolor`)
-	.help(`Generates color shades from a given hexcolor to use in your project`)
+	.help(`Generate color shades from a given hexcolor to use in your project`)
 	.action((args, options, logger) => {
 		purgetss.shades(args, options);
 	});
 
+program
+	.command('color-module')
+	.alias('cm')
+	.description(`Copy all colors from ${chalk.yellow('config.js')} to your ${chalk.yellow('lib')} folder`)
+	.help(`Copy all colors from ${chalk.yellow('theme.colors')} and ${chalk.yellow('theme.extend.colors')} into a CommonJS module to your project's ${chalk.yellow('lib')} folder`)
+	.action((args, options, logger) => {
+		purgetss.colorModule();
+	});
+
 program
 	.command('watch')
 	.alias('w')
@@ -92,10 +102,23 @@ program
 program
 	.command('fonts')
 	.alias('f')
-	.description('Copies default icon font libraries into your project')
-	.help(`Copy Font Awesome (Brands, Regular, Solid), Material Icons, Material Symbols or Framework 7 icons,\ninto your projects’s ${chalk.yellow('app/assets/fonts/')} folder and their names fixed to work on iOS and Android`)
+	.description(`<deprecated> Will be removed in the next major release. Use ${chalk.yellow('copy-fonts')} instead!`)
+	.help(`Copy Font Awesome (Brands, Regular, Solid), Material Icons, Material Symbols or Framework 7 icons,\nto your project's ${chalk.yellow('app/assets/fonts/')} folder and their names fixed to work on iOS and Android`)
+	.option('-v, --vendor <arguments>', `Use any of the following arguments to copy specific font vendors:\n   ${chalk.yellow('fa')} = Font Awesome Icons\n   ${chalk.yellow('mi')} = Material Icons\n   ${chalk.yellow('ms')} = Material Symbols\n   ${chalk.yellow('f7')} = Framework7 Icons`)
+	.option('-m, --module', `Use the --module option to also copy the corresponding CommonJS module in ${chalk.yellow('./app/lib/')} folder`)
+	.option('-s, --styles', `Copy the corresponding .tss file into ${chalk.yellow('./purgetss/styles/')} folder`)
+	.action((args, options, logger) => {
+		purgetss.copyFonts(options);
+	});
+
+program
+	.command('copy-fonts')
+	.alias('cf')
+	.description('Copy default icon font libraries to your project')
+	.help(`Copy Font Awesome (Brands, Regular, Solid), Material Icons, Material Symbols or Framework 7 icons,\nto your project's ${chalk.yellow('app/assets/fonts/')} folder and their names fixed to work on iOS and Android`)
 	.option('-v, --vendor <arguments>', `Use any of the following arguments to copy specific font vendors:\n   ${chalk.yellow('fa')} = Font Awesome Icons\n   ${chalk.yellow('mi')} = Material Icons\n   ${chalk.yellow('ms')} = Material Symbols\n   ${chalk.yellow('f7')} = Framework7 Icons`)
-	.option('-m, --modules', `Use the --modules option to also copy the corresponding CommonJS module into ${chalk.yellow('./app/lib/')} folder`)
+	.option('-m, --module', `Use the --module option to also copy the corresponding CommonJS module in ${chalk.yellow('./app/lib/')} folder`)
+	.option('-s, --styles', `Copy the corresponding .tss file into ${chalk.yellow('./purgetss/styles/')} folder`)
 	.action((args, options, logger) => {
 		purgetss.copyFonts(options);
 	});
@@ -105,7 +128,7 @@ program
 	.alias('bf')
 	.description(`Builds a ${chalk.yellow('fonts.tss')} file from fonts and styles in ${chalk.yellow('./purgetss/fonts')}`)
 	.help(`It will generate a new ${chalk.yellow('fonts.tss')} file based on the fonts and css files located in ${chalk.yellow('./purgetss/fonts')} folder`)
-	.option('-m, --modules', `Use the --modules option to also generate a CommonJS module into ${chalk.yellow('./app/lib/')} folder called ${chalk.yellow('purgetss-fonts.js')}`)
+	.option('-m, --module', `Use the --module option to also generate a CommonJS module in ${chalk.yellow('./app/lib/')} folder called ${chalk.yellow('purgetss-fonts.js')}`)
 	.action((args, options, logger) => {
 		purgetss.buildFonts(options);
 	});
@@ -113,7 +136,7 @@ program
 program
 	.command('module')
 	.alias('m')
-	.description(`Copies ${chalk.yellow('purgetss.ui.js')} module into your project’s ${chalk.yellow('lib')} folder`)
+	.description(`Copy ${chalk.yellow('purgetss.ui.js')} module to your project's ${chalk.yellow('lib')} folder`)
 	.help('This file contains the Animation module\n')
 	.action((args, options, logger) => {
 		purgetss.copyModulesLibrary();

package/dist/tailwind.tss

@@ -1,4 +1,4 @@
-// Based on Tailwind CSS v3.2.0: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
+// Based on Tailwind CSS v3.2.1: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
 // Created by Adam Wathan ( https://twitter.com/adamwathan ).
 
 // Tailwind-like styles

package/experimental/completions2.js

@@ -31,7 +31,6 @@ const tiCompletionsFile = require('../lib/completions/titanium/completions-v3.js
 const srcConfigFile = path.resolve(__dirname, '../lib/templates/purgetss.config.js');
 
 const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile);
-configFile.plugins = configFile.plugins ?? [];
 configFile.purge = configFile.purge ?? { mode: 'all' };
 configFile.theme.extend = configFile.theme.extend ?? {};
 configFile.fonts = configFile.fonts ?? { mode: 'fileName' };
@@ -39,7 +38,8 @@ configFile.fonts = configFile.fonts ?? { mode: 'fileName' };
 const configOptions = (configFile.purge && configFile.purge.options) ? configFile.purge.options : false;
 if (configOptions) {
 	configOptions.widgets = configOptions.widgets ?? false;
-	configOptions.missing = configOptions.missing ?? false;
+	configOptions.missing = configOptions.missing ?? true;
+	configOptions.plugins = configOptions.plugins ?? [];
 }
 
 function autoBuildTailwindTSS(options = {}) {
@@ -60,8 +60,9 @@ function autoBuildTailwindTSS(options = {}) {
 	tailwindStyles = helpers.compileApplyDirectives(tailwindStyles);
 
 	if (fs.existsSync(projectsConfigJS)) {
-		saveFile(cwd + '/purgetss/tailwind.tss', tailwindStyles);
-		logger.file('./purgetss/tailwind.tss');
+		makeSureFolderExists(cwd + '/purgetss/styles/');
+		saveFile(cwd + '/purgetss/styles/tailwind.tss', tailwindStyles);
+		logger.file('./purgetss/styles/tailwind.tss');
 		// if (saveGlossary) {
 		// 	saveFile(cwd + '/purgetss/experimental/baseValues.json', JSON.stringify(baseValues, null, 2));
 		// 	saveFile(cwd + '/purgetss/experimental/tiUIComponents.json', JSON.stringify(tiUIComponents, null, 2));
@@ -413,7 +414,7 @@ function combineDefaultThemeWithConfigFile() {
 		: _.merge({ default: { width: 'Ti.UI.SIZE', height: 'Ti.UI.SIZE' } }, configFile.theme.View);
 
 	// !Delete plugins specified in the config file
-	let deletePlugins = Array.isArray(configFile.plugins) ? configFile.plugins : Object.keys(configFile.plugins).map(key => key);
+	let deletePlugins = checkDeletePlugins();
 	_.each(deletePlugins, value => {
 		delete base[value];
 		delete configFile.theme[value];
@@ -423,6 +424,11 @@ function combineDefaultThemeWithConfigFile() {
 	return base;
 }
 
+function checkDeletePlugins() {
+	let deletePlugins = configFile.plugins ?? configOptions.plugins;
+	return Array.isArray(deletePlugins) ? deletePlugins : Object.keys(deletePlugins).map(key => key);
+}
+
 //! Helper Functions
 function removeDeprecatedColors(theObject) {
 	delete theObject.blueGray;

package/index.js

@@ -42,9 +42,10 @@ const projectsFontAwesomeJS = cwd + '/app/lib/fontawesome.js';
 
 const projectsPurgeTSSFolder = cwd + '/purgetss';
 const projectsConfigJS = cwd + '/purgetss/config.js';
-const projectsTailwind_TSS = cwd + '/purgetss/tailwind.tss';
+const projectsTailwind_TSS = cwd + '/purgetss/styles/tailwind.tss';
 const projectsPurge_TSS_Fonts_Folder = cwd + '/purgetss/fonts';
-const projectsFA_TSS_File = cwd + '/purgetss/fontawesome.tss';
+const projectsPurge_TSS_Styles_Folder = cwd + '/purgetss/styles';
+const projectsFA_TSS_File = cwd + '/purgetss/styles/fontawesome.tss';
 
 // js icon modules
 const srcLibFA = path.resolve(__dirname, './dist/fontawesome.js');
@@ -99,7 +100,6 @@ const srcMaterialSymbolsTSSFile = path.resolve(__dirname, './dist/materialsymbol
 const srcConfigFile = path.resolve(__dirname, './lib/templates/purgetss.config.js');
 
 const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile);
-configFile.plugins = configFile.plugins ?? {};
 configFile.purge = configFile.purge ?? { mode: 'all' };
 configFile.theme.extend = configFile.theme.extend ?? {};
 configFile.fonts = configFile.fonts ?? { mode: 'fileName' };
@@ -109,6 +109,7 @@ if (configOptions) {
 	configOptions.legacy = configOptions.legacy ?? false;
 	configOptions.widgets = configOptions.widgets ?? false;
 	configOptions.missing = configOptions.missing ?? true;
+	configOptions.plugins = configOptions.plugins ?? [];
 }
 
 const srcJMKFile = path.resolve(__dirname, './lib/templates/alloy.jmk');
@@ -166,7 +167,7 @@ function init(options) {
 	}
 
 	// definitios file
-	if (!fs.existsSync(cwd + '/purgetss/definitions.css') || options.all) {
+	if (!fs.existsSync(cwd + '/purgetss/styles/definitions.css') || options.all) {
 		createDefinitionsFile();
 	}
 
@@ -230,10 +231,12 @@ function copyFonts(options) {
 
 		if (options.vendor && typeof options.vendor === 'string') {
 			let selected = _.uniq(options.vendor.replace(/ /g, '').split(','));
+			logger.info('Copying Fonts...');
 			_.each(selected, vendor => {
 				copyFont(vendor);
 			});
 		} else {
+			logger.info('Copying Fonts to', chalk.yellow('./app/assets/fonts'), 'folder');
 			copyFont('fa');
 			copyFont('mi');
 			copyFont('ms');
@@ -241,8 +244,16 @@ function copyFonts(options) {
 		}
 
 		if (options.modules) {
+			console.log();
+			logger.info('Copying Modules to', chalk.yellow('./app/lib'), 'folder');
 			copyFontLibraries(options);
 		}
+
+		if (options.styles) {
+			console.log();
+			logger.info('Copying Styles to', chalk.yellow('./purgetss/styles'), 'folder');
+			copyFontStyles(options);
+		}
 	}
 }
 module.exports.copyFonts = copyFonts;
@@ -260,11 +271,33 @@ function copyFontLibraries(options) {
 		} else {
 			copyFontLibrary('fa');
 			copyFontLibrary('mi');
+			copyFontLibrary('ms');
 			copyFontLibrary('f7');
 		}
 	}
 }
 
+//! Command: copy-font-liraries
+function copyFontStyles(options) {
+	if (alloyProject()) {
+		makeSureFolderExists(projectsPurgeTSSFolder);
+
+		makeSureFolderExists(projectsPurge_TSS_Styles_Folder);
+
+		if (options.vendor && typeof options.vendor === 'string') {
+			let selected = _.uniq(options.vendor.replace(/ /g, '').split(','));
+			_.each(selected, vendor => {
+				copyFontStyle(vendor);
+			});
+		} else {
+			copyFontStyle('fa');
+			copyFontStyle('mi');
+			copyFontStyle('ms');
+			copyFontStyle('f7');
+		}
+	}
+}
+
 function copyModulesLibrary() {
 	if (alloyProject()) {
 		makeSureFolderExists(projectsLibFolder);
@@ -377,8 +410,10 @@ function shades(args, options) {
 
 	let colorFamily = (options.random || !args.hexcode) ? generateColorShades(chroma.random(), referenceColorFamilies) : generateColorShades(args.hexcode, referenceColorFamilies);
 
-	if (args.name) colorFamily.name = args.name;
-	colorFamily.name = colorFamily.name.replace(/'/g, '').replace(/\//g, '').replace('  ', ' ');
+	if (args.name) colorFamily.name = args.name
+	else if (options.name) colorFamily.name = options.name;
+
+	colorFamily.name = colorFamily.name.replace(/'/g, '').replace(/\//g, '').replace(/\s+/g, ' ');
 
 	let colorObject = createColorObject(colorFamily, colorFamily.hexcode, options);
 
@@ -387,6 +422,10 @@ function shades(args, options) {
 		configFile['theme']['extend']['colors'][colorObject.name] = colorObject.shades;
 		fs.writeFileSync(projectsConfigJS, 'module.exports = ' + cleanDoubleQuotes(configFile, options), 'utf8', err => { throw err; });
 		logger.info(`${chalk.hex(colorFamily.hexcode).bold(`“${colorFamily.name}”`)} (${chalk.bgHex(colorFamily.hexcode)(`${colorFamily.hexcode}`)}) saved in`, chalk.yellow('config.js'));
+
+		if (options.module) {
+			colorModule();
+		}
 	} else if (options.json) {
 		logger.info(`${chalk.hex(colorFamily.hexcode).bold(`“${colorFamily.name}”`)} (${chalk.bgHex(colorFamily.hexcode)(`${colorFamily.hexcode}`)})\n${JSON.stringify(colorObject, null, 2)}`);
 	} else {
@@ -395,6 +434,16 @@ function shades(args, options) {
 }
 exports.shades = shades;
 
+function colorModule() {
+	// read config.js
+	let configFile = require(projectsConfigJS);
+	makeSureFolderExists(projectsLibFolder);
+	let mainColors = { ...configFile.theme.colors, ...configFile.theme.extend.colors };
+	fs.writeFileSync(`${projectsLibFolder}/purgetss.colors.js`, 'exports.colors = ' + cleanDoubleQuotes(mainColors, {}), 'utf8', err => { throw err; });
+	logger.info(`All colors copied to ${chalk.yellow('lib/purgetss.colors.js')} module`);
+}
+exports.colorModule = colorModule;
+
 function cleanDoubleQuotes(configFile, options) {
 	const regexUnicode = /[^\u0000-\u00FF]/g;
 
@@ -403,6 +452,8 @@ function cleanDoubleQuotes(configFile, options) {
 	let util = require('util');
 	let inspected = util.inspect(configFile, false, 10);
 
+	if (inspected === 'undefined') return '{}';
+
 	return inspected.replace(regexUnicode, match => `\\u${match.charCodeAt(0).toString(16)}`);
 }
 
@@ -580,15 +631,17 @@ function buildFonts(options) {
 
 		if (files.length > 0) {
 			makeSureFolderExists(projectsPurgeTSSFolder);
+			makeSureFolderExists(projectsPurge_TSS_Styles_Folder);
 
-			fs.writeFileSync(cwd + '/purgetss/fonts.tss', tssClasses, err => {
+			fs.writeFileSync(cwd + '/purgetss/styles/fonts.tss', tssClasses, err => {
 				throw err;
 			});
 
-			makeSureFolderExists(projectsLibFolder);
 		}
 
 		if (fontJS) {
+			makeSureFolderExists(projectsLibFolder);
+
 			let exportIcons = 'const icons = {';
 			exportIcons += fontJS.slice(0, -1);
 			exportIcons += '\n};\n';
@@ -601,14 +654,14 @@ function buildFonts(options) {
 
 			exportIcons += '\n// Helper Functions\n' + fs.readFileSync(path.resolve(__dirname, './lib/templates/icon-functions.js'), 'utf8');
 
-			fs.writeFileSync(projectsLibFolder + '/purgetss.fonts.js', exportIcons, err => {
+			fs.writeFileSync(`${projectsLibFolder}/purgetss.fonts.js'`, exportIcons, err => {
 				throw err;
 			});
 
 			logger.info(`${chalk.yellow('./app/lib/purgetss.fonts.js')} file created!`);
 		} else {
-			if (fs.existsSync(projectsLibFolder + '/purgetss.fonts.js')) {
-				fs.unlinkSync(projectsLibFolder + '/purgetss.fonts.js');
+			if (fs.existsSync(`${projectsLibFolder}/purgetss.fonts.js'`)) {
+				fs.unlinkSync(`${projectsLibFolder}/purgetss.fonts.js'`);
 			}
 		}
 
@@ -735,13 +788,13 @@ function copyFreeFonts() {
 	fs.copyFile(srcFonts_Folder + '/FontAwesome6Free-Regular.ttf', projectsFontsFolder + '/FontAwesome6Free-Regular.ttf', callback);
 	fs.copyFile(srcFonts_Folder + '/FontAwesome6Free-Solid.ttf', projectsFontsFolder + '/FontAwesome6Free-Solid.ttf', callback);
 
-	logger.info('Font Awesome Free Icons Fonts copied to', chalk.yellow('./app/assets/fonts'), 'folder');
+	logger.warn(' - Font Awesome Free');
 }
 
 function copyProFonts(fontFamilies, webFonts) {
 	_.each(fontFamilies, (dest, src) => {
 		if (copyFile(`${webFonts}/${src}`, dest)) {
-			logger.info(`${dest} Font copied to`, chalk.yellow('./app/assets/fonts'), 'folder');
+			logger.warn(` - ${dest} Font copied to`, chalk.yellow('./app/assets/fonts'), 'folder');
 		}
 	});
 }
@@ -760,7 +813,7 @@ function copyMaterialIconsFonts() {
 		copyFile(`${srcFonts_Folder}/${familyName}`, familyName);
 	});
 
-	logger.info('Material Icons Font copied to', chalk.yellow('./app/assets/fonts'), 'folder');
+	logger.warn(' - Material Icons');
 }
 
 function copyMaterialSymbolsFonts() {
@@ -775,13 +828,13 @@ function copyMaterialSymbolsFonts() {
 		copyFile(`${srcFonts_Folder}/${familyName}`, familyName);
 	});
 
-	logger.info('Material Symbols Icons Font copied to', chalk.yellow('./app/assets/fonts'), 'folder');
+	logger.warn(' - Material Symbols');
 }
 
 function copyFramework7IconsFonts() {
 	// Framework7 Font
 	copyFile(srcFonts_Folder + '/Framework7-Icons.ttf', 'Framework7-Icons.ttf');
-	logger.info('Framework7-Icons Font copied to', chalk.yellow('./app/assets/fonts'), 'folder');
+	logger.warn(' - Framework 7');
 }
 
 function processFontsCSS(data) {
@@ -939,14 +992,14 @@ function findPrefix(rules) {
 		return `${firstPrefix}-${secondPrefix}`;
 	} else if (firstCounter == 1) {
 		return `${firstPrefix}`;
-	};
+	}
 }
 
 //! Purge Fonts
 function purgeFonts(uniqueClasses, cleanUniqueClasses) {
-	if (fs.existsSync(cwd + '/purgetss/fonts.tss')) {
+	if (fs.existsSync(cwd + '/purgetss/styles/fonts.tss')) {
 		let purgedClasses = '\n// Font Styles\n';
-		purgedClasses += purgeFontIcons(cwd + '/purgetss/fonts.tss', uniqueClasses, 'Purging Font styles...', cleanUniqueClasses, []);
+		purgedClasses += purgeFontIcons(cwd + '/purgetss/styles/fonts.tss', uniqueClasses, 'Purging Font styles...', cleanUniqueClasses, []);
 		return (purgedClasses === '\n// Font Styles\n') ? '' : purgedClasses;
 	}
 
@@ -969,7 +1022,7 @@ function prettifyFontName(str, prefix) {
 
 	let pretty = withoutPrefix.join('').replace(':', '');
 	return pretty.replace(/^.{1}/g, pretty[0].toLowerCase());
-};
+}
 
 //! Helper Functions
 function findMissingClasses(tempPurged) {
@@ -1595,7 +1648,7 @@ function combineAllValues(base, defaultTheme) {
 	}
 
 	// !Delete plugins specified in the config file
-	let deletePlugins = Array.isArray(configFile.plugins) ? configFile.plugins : Object.keys(configFile.plugins).map(key => key);
+	let deletePlugins = checkDeletePlugins();
 	_.each(deletePlugins, value => {
 		delete allValues[value];
 		delete configFile.theme[value];
@@ -1609,6 +1662,11 @@ function combineAllValues(base, defaultTheme) {
 	return allValues;
 }
 
+function checkDeletePlugins() {
+	let deletePlugins = configFile.plugins ?? configOptions.plugins;
+	return Array.isArray(deletePlugins) ? deletePlugins : Object.keys(deletePlugins).map(key => key);
+}
+
 //! Build Tailwind ( AUTO )
 function buildTailwind(options) {
 	helpers.globalOptions.legacy = configOptions.legacy;
@@ -1666,8 +1724,9 @@ function buildTailwindLegacy() {
 	let finalTailwindStyles = helpers.compileApplyDirectives(tailwindStyles);
 
 	if (fs.existsSync(projectsConfigJS)) {
+		makeSureFolderExists(projectsPurge_TSS_Styles_Folder);
 		fs.writeFileSync(projectsTailwind_TSS, finalTailwindStyles);
-		logger.file('./purgetss/tailwind.tss', '( Legacy )');
+		logger.file('./purgetss/styles/tailwind.tss', '( Legacy )');
 	} else {
 		fs.writeFileSync(srcTailwindTSS, finalTailwindStyles);
 		logger.file('./dist/tailwind.tss', '( Legacy )');
@@ -1738,8 +1797,8 @@ function createDefinitionsFile() {
 		});
 	}
 
-	if (fs.existsSync(cwd + '/purgetss/fonts.tss')) {
-		classDefinitions += fs.readFileSync(cwd + '/purgetss/fonts.tss', 'utf8');
+	if (fs.existsSync(cwd + '/purgetss/styles/fonts.tss')) {
+		classDefinitions += fs.readFileSync(cwd + '/purgetss/styles/fonts.tss', 'utf8');
 	}
 
 	classDefinitions += (fs.existsSync(projectsFA_TSS_File)) ? fs.readFileSync(projectsFA_TSS_File, 'utf8') : fs.readFileSync(srcFontAwesomeTSSFile, 'utf8');
@@ -1762,9 +1821,9 @@ function createDefinitionsFile() {
 
 	classDefinitions += '.ios{}.android{}.handheld{}.tablet{}.open{}.close{}.complete{}.drag{}.drop{}.bounds{}';
 
-	fs.writeFileSync(cwd + '/purgetss/definitions.css', `/* Class definitions (v6.x) */${classDefinitions}`);
+	fs.writeFileSync(cwd + '/purgetss/styles/definitions.css', `/* Class definitions (v6.x) */${classDefinitions}`);
 
-	logger.file('./purgetss/definitions.css');
+	logger.file('./purgetss/styles/definitions.css');
 }
 
 //! Build tailwind's custom values
@@ -2146,7 +2205,7 @@ function encodeHTML(str) {
 	const code = {
 		'&': '&',
 	};
-	return str.replace(/[&]/gm, i => code[i]);
+	return str.replace(/&/gm, i => code[i]);
 }
 
 function callback(err) {
@@ -2210,23 +2269,53 @@ function copyFontLibrary(vendor) {
 				buildFontAwesomeJS();
 			} else {
 				fs.copyFileSync(srcLibFA, projectsLibFolder + '/fontawesome.js');
-				logger.info('FontAwesome CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
+				logger.warn(' - fontawesome.js');
 			}
 			break;
 		case 'mi':
 		case 'materialicons':
 			fs.copyFileSync(srcLibMI, projectsLibFolder + '/materialicons.js');
-			logger.info('Material Icons CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
+			logger.warn(' - materialicons.js');
 			break;
 		case 'ms':
 		case 'materialsymbol':
 			fs.copyFileSync(srcLibMS, projectsLibFolder + '/materialsymbols.js');
-			logger.info('Material Symbols CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
+			logger.warn(' - materialsymbols.js');
 			break;
 		case 'f7':
 		case 'framework7':
 			fs.copyFileSync(srcLibF7, projectsLibFolder + '/framework7icons.js');
-			logger.info('Framework7-Icons CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
+			logger.warn(' - framework7icons.js');
+			break;
+	}
+}
+
+//! Copy Font Styles
+function copyFontStyle(vendor) {
+	switch (vendor) {
+		case 'fa':
+		case 'fontawesome':
+			if (fs.existsSync(srcFA_Beta_CSSFile) || fs.existsSync(srcFA_Pro_CSS)) {
+				buildFontAwesomeJS();
+			} else {
+				fs.copyFileSync(srcLibFA, projectsPurge_TSS_Styles_Folder + '/fontawesome.tss');
+				logger.warn(' - fontawesome.tss');
+			}
+			break;
+		case 'mi':
+		case 'materialicons':
+			fs.copyFileSync(srcLibMI, projectsPurge_TSS_Styles_Folder + '/materialicons.tss');
+			logger.warn(' - materialicons.tss');
+			break;
+		case 'ms':
+		case 'materialsymbol':
+			fs.copyFileSync(srcLibMS, projectsPurge_TSS_Styles_Folder + '/materialsymbols.tss');
+			logger.warn(' - materialsymbols.tss');
+			break;
+		case 'f7':
+		case 'framework7':
+			fs.copyFileSync(srcFramework7FontTSSFile, projectsPurge_TSS_Styles_Folder + '/framework7icons.tss');
+			logger.warn(' - framework7icons.tss');
 			break;
 	}
 }
@@ -2470,8 +2559,8 @@ function purgeFontAwesome(uniqueClasses, cleanUniqueClasses) {
 	let fontAwesome = false;
 
 	// check if fonts.tss exists and if it includes Font Awesome
-	if (fs.existsSync(cwd + '/purgetss/fonts.tss')) {
-		let fontsTSS = fs.readFileSync(cwd + '/purgetss/fonts.tss', 'utf8');
+	if (fs.existsSync(cwd + '/purgetss/styles/fonts.tss')) {
+		let fontsTSS = fs.readFileSync(cwd + '/purgetss/styles/fonts.tss', 'utf8');
 		fontAwesome = fontsTSS.includes('Font Awesome');
 	}
 

package/lib/templates/purgetss.config.js

@@ -8,11 +8,11 @@ module.exports = {
 			legacy: false, // Generates & Purge tailwind.tss v5.x classes
 			missing: true, // Report missing classes
 			widgets: false, // Purge widgets too
-			safelist: [] // Array of classes to keep
+			safelist: [], // Array of classes to keep
+			plugins: [] // Array of properties to ignore
 		}
 	},
 	theme: {
 		extend: {}
-	},
-	plugins: []
+	}
 };

package/lib/templates/tailwind/template.tss

@@ -1,2 +1,2 @@
-// Based on Tailwind CSS v3.2.0: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
+// Based on Tailwind CSS v3.2.1: A utility-first CSS framework for rapidly building custom designs. ( https://tailwindcss.com )
 // Created by Adam Wathan ( https://twitter.com/adamwathan ).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "purgetss",
-	"version": "6.2.3",
+	"version": "6.2.5",
 	"description": "An extension for Titanium SDK that contains a set of Tailwind-like classes to easily and quickly create beautifully designed mobile apps.",
 	"main": "index.js",
 	"bin": {
@@ -46,9 +46,9 @@
 		"@fortawesome/fontawesome-free": "^6.2.0",
 		"caporal": "^1.4.0",
 		"chalk": "^4.1.2",
-		"chroma-js": "^2.4.2",
+		"chroma-js": "2.1.2",
 		"command-exists": "^1.2.9",
-		"fontname": "^1.0.0",
+		"fontname": "^1.0.1",
 		"framework7-icons": "^5.0.5",
 		"glob": "^7.2.0",
 		"inquirer": "^8.2.4",
@@ -58,7 +58,7 @@
 		"path": "^0.12.7",
 		"prompts": "^2.4.2",
 		"read-css": "^0.3.0",
-		"tailwindcss": "^3.2.0",
+		"tailwindcss": "^3.2.1",
 		"traverse": "^0.6.7",
 		"update-notifier": "^5.1.0",
 		"uuid": "^9.0.0",