purgetss 6.2.31 → 6.2.33

package/bin/purgetss

@@ -70,14 +70,15 @@ program
   .argument('[hexcode]', 'The base hexcode value')
   .argument('[name]', 'Name of the color')
   .option('-n, --name', 'Specify the name of the color')
-  .option('-q, --quotes', `Keep double quotes in the ${chalk.yellow('config.js')} file`)
+  .option('-q, --quotes', `Keep double quotes in ${chalk.yellow('config.js')}`)
   .option('-r, --random', 'Generate shades from a random color')
+  .option('-o, --override', `Place new shades in ${chalk.yellow('theme.colors')} to override default colors`)
   .option('-s, --single', 'Generate a single color definition')
-  .option('-t, --tailwind', `Log the generated shades with a ${chalk.yellow('tailwind.config.js')} compatible structure`)
-  .option('-l, --log', 'Log the generated shades instead of saving them')
-  .option('-j, --json', `Log a JSON compatible structure, which can be used in ${chalk.yellow('app/config.json')}`)
-  .description('Color shades generator from a given hexcolor')
-  .help('Generate color shades from a given hexcolor to use in your project')
+  .option('-l, --log', 'Log shades instead of saving them')
+  .option('-j, --json', `Log shades in ${chalk.yellow('app/config.json')} format`)
+  .option('-t, --tailwind', `Log shades in ${chalk.yellow('tailwind.config.js')} format`)
+  .description(`Generate color shades for ${chalk.yellow('config.js')} from a given hexcolor`)
+  .help(`Generate color shades from a hexcolor for your project. By default, the new shades are placed in ${chalk.yellow('theme.extend.colors')}`)
   .action((args, options, logger) => {
     purgetss.shades(args, options)
   })
@@ -129,7 +130,7 @@ program
 program
   .command('build-fonts')
   .alias('bf')
-  .description(`Generate a ${chalk.yellow('fonts.tss')} file based on the font and css files located in ${chalk.yellow('./purgetss/fonts')}`)
+  .description(`Generate ${chalk.yellow('fonts.tss')} from font and CSS files in ${chalk.yellow('./purgetss/fonts')}`)
   .help(`Generate a ${chalk.yellow('./purgetss/styles/fonts.tss')} file based on the font and css files located in ${chalk.yellow('./purgetss/fonts')} folder`)
   .option('-m, --module', `To also generate a CommonJS module in ${chalk.yellow('./app/lib/')} folder called ${chalk.yellow('purgetss-fonts.js')}`)
   .action((args, options, logger) => {

package/index.js

@@ -415,14 +415,8 @@ exports.create = create
 // ! Command: shades
 function shades(args, options) {
   const chroma = require('chroma-js')
+  const referenceColorFamilies = require('./lib/color-shades/tailwindColors')
   const generateColorShades = require('./lib/color-shades/generateColorShades')
-  const referenceColorFamilies = require('./lib/color-shades/tailwindColors').filter((item) => {
-    return item.name !== 'warmGray' &&
-      item.name !== 'trueGray' &&
-      item.name !== 'gray' &&
-      item.name !== 'coolGray' &&
-      item.name !== 'blueGray'
-  })
 
   const colorFamily = (options.random || !args.hexcode) ? generateColorShades(chroma.random(), referenceColorFamilies) : generateColorShades(args.hexcode, referenceColorFamilies)
 
@@ -435,8 +429,24 @@ function shades(args, options) {
 
   const silent = options.tailwind || options.json || options.log
   if (alloyProject(silent) && !silent) {
-    if (!configFile.theme.extend.colors) configFile.theme.extend.colors = {}
-    configFile.theme.extend.colors[colorObject.name] = colorObject.shades
+    if (options.override) {
+      if (!configFile.theme.colors) configFile.theme.colors = {}
+      configFile.theme.colors[colorObject.name] = colorObject.shades
+
+      if (configFile.theme.extend.colors) {
+        if (configFile.theme.extend.colors[colorObject.name]) delete configFile.theme.extend.colors[colorObject.name]
+        if (Object.keys(configFile.theme.extend.colors).length === 0) delete configFile.theme.extend.colors
+      }
+    } else {
+      if (!configFile.theme.extend.colors) configFile.theme.extend.colors = {}
+      configFile.theme.extend.colors[colorObject.name] = colorObject.shades
+
+      if (configFile.theme.colors) {
+        if (configFile.theme.colors[colorObject.name]) delete configFile.theme.colors[colorObject.name]
+        if (Object.keys(configFile.theme.colors).length === 0) delete configFile.theme.colors
+      }
+    }
+
     fs.writeFileSync(projectsConfigJS, 'module.exports = ' + cleanDoubleQuotes(configFile, options), 'utf8', err => { throw err })
     checkIfColorModule()
     logger.info(`${chalk.hex(colorFamily.hexcode).bold(`“${colorFamily.name}”`)} (${chalk.bgHex(colorFamily.hexcode)(colorFamily.hexcode)}) saved in`, chalk.yellow('config.js'))

package/lib/color-shades/tailwindColors.js

@@ -1,84 +1,4 @@
 module.exports = [
-  {
-    name: 'slate',
-    shades: [
-      { number: '50', hexcode: '#f8fafc' },
-      { number: '100', hexcode: '#f1f5f9' },
-      { number: '200', hexcode: '#e2e8f0' },
-      { number: '300', hexcode: '#cbd5e1' },
-      { number: '400', hexcode: '#94a3b8' },
-      { number: '500', hexcode: '#64748b' },
-      { number: '600', hexcode: '#475569' },
-      { number: '700', hexcode: '#334155' },
-      { number: '800', hexcode: '#1e293b' },
-      { number: '900', hexcode: '#0f172a' },
-      { number: '950', hexcode: '#020617' }
-    ]
-  },
-  {
-    name: 'gray',
-    shades: [
-      { number: '50', hexcode: '#f9fafb' },
-      { number: '100', hexcode: '#f3f4f6' },
-      { number: '200', hexcode: '#e5e7eb' },
-      { number: '300', hexcode: '#d1d5db' },
-      { number: '400', hexcode: '#9ca3af' },
-      { number: '500', hexcode: '#6b7280' },
-      { number: '600', hexcode: '#4b5563' },
-      { number: '700', hexcode: '#374151' },
-      { number: '800', hexcode: '#1f2937' },
-      { number: '900', hexcode: '#111827' },
-      { number: '950', hexcode: '#030712' }
-    ]
-  },
-  {
-    name: 'zinc',
-    shades: [
-      { number: '50', hexcode: '#fafafa' },
-      { number: '100', hexcode: '#f4f4f5' },
-      { number: '200', hexcode: '#e4e4e7' },
-      { number: '300', hexcode: '#d4d4d8' },
-      { number: '400', hexcode: '#a1a1aa' },
-      { number: '500', hexcode: '#71717a' },
-      { number: '600', hexcode: '#52525b' },
-      { number: '700', hexcode: '#3f3f46' },
-      { number: '800', hexcode: '#27272a' },
-      { number: '900', hexcode: '#18181b' },
-      { number: '950', hexcode: '#09090b' }
-    ]
-  },
-  {
-    name: 'neutral',
-    shades: [
-      { number: '50', hexcode: '#fafafa' },
-      { number: '100', hexcode: '#f5f5f5' },
-      { number: '200', hexcode: '#e5e5e5' },
-      { number: '300', hexcode: '#d4d4d4' },
-      { number: '400', hexcode: '#a3a3a3' },
-      { number: '500', hexcode: '#737373' },
-      { number: '600', hexcode: '#525252' },
-      { number: '700', hexcode: '#404040' },
-      { number: '800', hexcode: '#262626' },
-      { number: '900', hexcode: '#171717' },
-      { number: '950', hexcode: '#0a0a0a' }
-    ]
-  },
-  {
-    name: 'stone',
-    shades: [
-      { number: '50', hexcode: '#fafaf9' },
-      { number: '100', hexcode: '#f5f5f4' },
-      { number: '200', hexcode: '#e7e5e4' },
-      { number: '300', hexcode: '#d6d3d1' },
-      { number: '400', hexcode: '#a8a29e' },
-      { number: '500', hexcode: '#78716c' },
-      { number: '600', hexcode: '#57534e' },
-      { number: '700', hexcode: '#44403c' },
-      { number: '800', hexcode: '#292524' },
-      { number: '900', hexcode: '#1c1917' },
-      { number: '950', hexcode: '#0c0a09' }
-    ]
-  },
   {
     name: 'red',
     shades: [
@@ -366,69 +286,5 @@ module.exports = [
       { number: '900', hexcode: '#0c4a6e' },
       { number: '950', hexcode: '#082f49' }
     ]
-  },
-  {
-    name: 'warmGray',
-    shades: [
-      { number: '50', hexcode: '#fafaf9' },
-      { number: '100', hexcode: '#f5f5f4' },
-      { number: '200', hexcode: '#e7e5e4' },
-      { number: '300', hexcode: '#d6d3d1' },
-      { number: '400', hexcode: '#a8a29e' },
-      { number: '500', hexcode: '#78716c' },
-      { number: '600', hexcode: '#57534e' },
-      { number: '700', hexcode: '#44403c' },
-      { number: '800', hexcode: '#292524' },
-      { number: '900', hexcode: '#1c1917' },
-      { number: '950', hexcode: '#0c0a09' }
-    ]
-  },
-  {
-    name: 'trueGray',
-    shades: [
-      { number: '50', hexcode: '#fafafa' },
-      { number: '100', hexcode: '#f5f5f5' },
-      { number: '200', hexcode: '#e5e5e5' },
-      { number: '300', hexcode: '#d4d4d4' },
-      { number: '400', hexcode: '#a3a3a3' },
-      { number: '500', hexcode: '#737373' },
-      { number: '600', hexcode: '#525252' },
-      { number: '700', hexcode: '#404040' },
-      { number: '800', hexcode: '#262626' },
-      { number: '900', hexcode: '#171717' },
-      { number: '950', hexcode: '#0a0a0a' }
-    ]
-  },
-  {
-    name: 'coolGray',
-    shades: [
-      { number: '50', hexcode: '#f9fafb' },
-      { number: '100', hexcode: '#f3f4f6' },
-      { number: '200', hexcode: '#e5e7eb' },
-      { number: '300', hexcode: '#d1d5db' },
-      { number: '400', hexcode: '#9ca3af' },
-      { number: '500', hexcode: '#6b7280' },
-      { number: '600', hexcode: '#4b5563' },
-      { number: '700', hexcode: '#374151' },
-      { number: '800', hexcode: '#1f2937' },
-      { number: '900', hexcode: '#111827' },
-      { number: '950', hexcode: '#030712' }
-    ]
-  },
-  {
-    name: 'blueGray',
-    shades: [
-      { number: '50', hexcode: '#f8fafc' },
-      { number: '100', hexcode: '#f1f5f9' },
-      { number: '200', hexcode: '#e2e8f0' },
-      { number: '300', hexcode: '#cbd5e1' },
-      { number: '400', hexcode: '#94a3b8' },
-      { number: '500', hexcode: '#64748b' },
-      { number: '600', hexcode: '#475569' },
-      { number: '700', hexcode: '#334155' },
-      { number: '800', hexcode: '#1e293b' },
-      { number: '900', hexcode: '#0f172a' },
-      { number: '950', hexcode: '#020617' }
-    ]
   }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "purgetss",
-	"version": "6.2.31",
+	"version": "6.2.33",
 	"description": "A package that simplifies mobile app creation for Titanium developers.",
 	"main": "index.js",
 	"bin": {