purgetss 7.1.2 → 7.1.3

package/dist/purgetss.ui.js

@@ -1,4 +1,4 @@
-// PurgeTSS v7.1.0
+// PurgeTSS v7.1.3
 // Created by César Estrada
 // https://purgetss.com
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "purgetss",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "main": "src/index.js",
   "bin": {
     "purgetss": "bin/purgetss"
@@ -31,6 +31,9 @@
     "test:integration": "node tests/run-tests.js integration",
     "test:count": "node tests/unit/shared/function-counter.test.js",
     "test:cli-realtime": "node tests/e2e/cli-commands-realtime.test.js",
+    "test:install-local": "node tests/e2e/installation-simulation.test.js",
+    "test:install-global": "node tests/e2e/global-installation-simulation.test.js",
+    "test:install": "npm run test:install-local && npm run test:install-global",
     "build": "npm run build:all",
     "notifier": "node ./lib/test-function",
     "build:module": "node ./src/dev/builders/module-builder.js",
@@ -70,6 +73,7 @@
     "chroma-js": "^3.1.2",
     "command-exists": "^1.2.9",
     "commander": "^14.0.0",
+    "css": "^3.0.0",
     "fontname": "^1.0.1",
     "framework7-icons": "^5.0.5",
     "glob": "^9.3.5",
@@ -79,7 +83,6 @@
     "ntcjs": "^1.1.3",
     "path": "^0.12.7",
     "prompts": "^2.4.2",
-    "read-css": "^0.3.0",
     "tailwindcss": "^3.4.17",
     "traverse": "^0.6.11",
     "update-notifier": "^7.3.1",
@@ -87,10 +90,12 @@
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-    "eslint": "^9.16.0",
     "@eslint/js": "^9.16.0",
+    "css-tree": "^3.1.0",
+    "eslint": "^9.16.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-import": "^2.31.0"
+    "read-css": "^0.3.0"
   }
 }

package/src/cli/commands/fonts.js

@@ -17,7 +17,7 @@ import path from 'path'
 import FontName from 'fontname'
 import _ from 'lodash'
 import chalk from 'chalk'
-import readCSS from 'read-css'
+import css from 'css'
 import { alloyProject, makeSureFolderExists } from '../../shared/utils.js'
 import { getFiles, getFileName } from '../utils/font-utilities.js'
 import {
@@ -343,7 +343,7 @@ export function buildFonts(options) {
     // Process styles files
     _.each(files, file => {
       if (file.endsWith('.css') || file.endsWith('.CSS')) {
-        const cssFile = readCSS(file)
+        const cssFile = css.parse(fs.readFileSync(file, 'utf8'))
         const theFile = file.split('/')
         const theCSSFile = theFile.pop()
         const prefix = options.fontClassFromFilename ? theCSSFile.split('.').shift() : null

package/src/dev/builders/fontawesome-builder.js

@@ -12,7 +12,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import _ from 'lodash'
-import readCSS from 'read-css'
+import css from 'css'
 import { logger } from '../../shared/logger.js'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -148,25 +148,24 @@ export function processFontawesomeStyles(data) {
  * @param {string} webFonts - Web fonts folder path
  */
 export function processFontAwesomeTSS(CSSFile, templateTSS, resetTSS, fontFamilies, webFonts) {
-  readCSS(CSSFile, (err, data) => {
-    if (err) throw err
+  const cssContent = fs.readFileSync(CSSFile, 'utf8')
+  const data = css.parse(cssContent)
 
-    let tssClasses = fs.readFileSync(path.resolve(projectRoot, templateTSS), 'utf8') + '\n'
+  let tssClasses = fs.readFileSync(path.resolve(projectRoot, templateTSS), 'utf8') + '\n'
 
-    tssClasses += fs.readFileSync(path.resolve(projectRoot, resetTSS), 'utf8') + '\n'
+  tssClasses += fs.readFileSync(path.resolve(projectRoot, resetTSS), 'utf8') + '\n'
 
-    tssClasses += processFontawesomeStyles(data)
+  tssClasses += processFontawesomeStyles(data)
 
-    fs.writeFileSync(projectsFA_TSS_File, tssClasses, err2 => {
-      throw err2
-    })
+  fs.writeFileSync(projectsFA_TSS_File, tssClasses, err2 => {
+    throw err2
+  })
 
-    logger.file('./purgetss/styles/fontawesome.tss')
+  logger.file('./purgetss/styles/fontawesome.tss')
 
-    makeSureFolderExists(projectsFontsFolder)
+  makeSureFolderExists(projectsFontsFolder)
 
-    copyProFonts(fontFamilies, webFonts)
-  })
+  copyProFonts(fontFamilies, webFonts)
 }
 
 /**
@@ -175,8 +174,9 @@ export function processFontAwesomeTSS(CSSFile, templateTSS, resetTSS, fontFamili
  * @param {string} faJS - Path to FontAwesome JS template
  */
 export function processFontAwesomeJS(CSSFile, faJS) {
-  readCSS(CSSFile, (err, data) => {
-    if (err) throw err
+  try {
+    const cssContent = fs.readFileSync(CSSFile, 'utf8')
+    const data = css.parse(cssContent)
 
     const rules = _.map(data.stylesheet.rules, rule => {
       if (rule.type === 'rule' && rule.selectors[0].includes(':before') && !rule.selectors[0].includes('.fad')) {
@@ -214,7 +214,9 @@ export function processFontAwesomeJS(CSSFile, faJS) {
     })
 
     logger.file('./app/lib/fontawesome.js')
-  })
+  } catch (err) {
+    throw err
+  }
 }
 
 /**

package/src/dev/builders/icon-builders/fontawesome-builder.js

@@ -14,7 +14,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import _ from 'lodash'
-import readCSS from 'read-css'
+import css from 'css'
 import { logger } from '../../../shared/logger.js'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -31,27 +31,26 @@ if (!fs.existsSync(path.resolve(projectRoot, './dist'))) {
  * COPIED exactly from original constructor() function
  */
 export function buildFontAwesome() {
-  readCSS(path.resolve(projectRoot, './node_modules/@fortawesome/fontawesome-free/css/all.css'), (err, data) => {
-    if (err) throw err
+  const cssContent = fs.readFileSync(path.resolve(projectRoot, './node_modules/@fortawesome/fontawesome-free/css/all.css'), 'utf8')
+  const data = css.parse(cssContent)
 
-    let tssClasses = fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-template.tss'), 'utf8') + '\n'
+  let tssClasses = fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-template.tss'), 'utf8') + '\n'
 
-    tssClasses += fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-reset.tss'), 'utf8')
+  tssClasses += fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-reset.tss'), 'utf8')
 
-    tssClasses += processCSS(data)
+  tssClasses += processCSS(data)
 
-    fs.writeFileSync(path.resolve(projectRoot, './dist/fontawesome.tss'), tssClasses, _err => {
-      throw _err
-    })
-
-    logger.file('./dist/fontawesome.tss')
+  fs.writeFileSync(path.resolve(projectRoot, './dist/fontawesome.tss'), tssClasses, _err => {
+    throw _err
   })
+
+  logger.file('./dist/fontawesome.tss')
 }
 
 /**
  * Process CSS data to TSS format
  * COPIED exactly from original processCSS() function - NO CHANGES
- * 
+ *
  * @param {Object} data - CSS data from readCSS
  * @returns {string} Processed TSS classes
  */
@@ -79,4 +78,4 @@ export function processCSS(data) {
 // Execute if run directly
 if (import.meta.url === `file://${process.argv[1]}`) {
   buildFontAwesome()
-}
+}

package/src/dev/builders/icon-builders/fontawesome-js-builder.js

@@ -14,7 +14,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import _ from 'lodash'
-import read from 'read-css'
+import css from 'css'
 import { logger } from '../../../shared/logger.js'
 
 const __filename = fileURLToPath(import.meta.url)
@@ -31,44 +31,43 @@ if (!fs.existsSync(path.resolve(projectRoot, './dist'))) {
  * COPIED exactly from original constructor() function
  */
 export function buildFontAwesomeJS() {
-  read(path.resolve(projectRoot, './node_modules/@fortawesome/fontawesome-free/css/all.css'), (err, data) => {
-    if (err) throw err
-
-    const rules = _.map(data.stylesheet.rules, rule => {
-      if (rule.type === 'rule' && rule.selectors && rule.declarations[0].value.includes('"\\')) {
-        return {
-          selector: rule.selectors[0].replace('::before', '').replace(':before', '').replace('.', ''),
-          property: ('0000' + rule.declarations[0].value.replace('\"\\', '').replace('\"', '')).slice(-4)
-        }
+  const cssContent = fs.readFileSync(path.resolve(projectRoot, './node_modules/@fortawesome/fontawesome-free/css/all.css'), 'utf8')
+  const data = css.parse(cssContent)
+
+  const rules = _.map(data.stylesheet.rules, rule => {
+    if (rule.type === 'rule' && rule.selectors && rule.declarations[0].value.includes('"\\')) {
+      return {
+        selector: rule.selectors[0].replace('::before', '').replace(':before', '').replace('.', ''),
+        property: ('0000' + rule.declarations[0].value.replace('\"\\', '').replace('\"', '')).slice(-4)
       }
-    })
-
-    let fontawesome = fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-template.js.cjs'), 'utf8')
+    }
+  })
 
-    fontawesome += '\n' + fs.readFileSync(path.resolve(projectRoot, './lib/templates/icon-functions.js.cjs'), 'utf8')
+  let fontawesome = fs.readFileSync(path.resolve(projectRoot, './lib/templates/fontawesome/free-template.js.cjs'), 'utf8')
 
-    let exportIcons = '\nconst icons = {\n'
+  fontawesome += '\n' + fs.readFileSync(path.resolve(projectRoot, './lib/templates/icon-functions.js.cjs'), 'utf8')
 
-    _.each(rules, rule => {
-      if (rule) {
-        exportIcons += `\t'${prettifyFontName(rule.selector)}': '\\u${rule.property}',\n`
-      }
-    })
+  let exportIcons = '\nconst icons = {\n'
 
-    exportIcons += '};\n'
+  _.each(rules, rule => {
+    if (rule) {
+      exportIcons += `\t'${prettifyFontName(rule.selector)}': '\\u${rule.property}',\n`
+    }
+  })
 
-    exportIcons += 'exports.icons = icons;\n'
+  exportIcons += '};\n'
 
-    exportIcons += '\nconst iconKeys = Object.keys(icons)\n'
+  exportIcons += 'exports.icons = icons;\n'
 
-    fontawesome += exportIcons
+  exportIcons += '\nconst iconKeys = Object.keys(icons)\n'
 
-    fs.writeFileSync(path.resolve(projectRoot, './dist/fontawesome.js'), fontawesome, _err => {
-      throw _err
-    })
+  fontawesome += exportIcons
 
-    logger.file('./dist/fontawesome.js')
+  fs.writeFileSync(path.resolve(projectRoot, './dist/fontawesome.js'), fontawesome, _err => {
+    throw _err
   })
+
+  logger.file('./dist/fontawesome.js')
 }
 
 /**

package/src/index-legacy.js

@@ -17,7 +17,7 @@ import { isNotJunk } from 'junk'
 import glob from 'glob'
 import chalk from 'chalk'
 import convert from 'xml-js'
-import readCSS from 'read-css'
+import css from 'css'
 import traverse from 'traverse'
 import inquirer from 'inquirer'
 import FontName from 'fontname'
@@ -718,7 +718,7 @@ function buildFonts(options) {
     // ! Process styles files
     _.each(files, file => {
       if (file.endsWith('.css') || file.endsWith('.CSS')) {
-        const cssFile = readCSS(file)
+        const cssFile = css.parse(fs.readFileSync(file, 'utf8'))
         const theFile = file.split('/')
         const theCSSFile = theFile.pop()
         const prefix = options.fontClassFromFilename ? theCSSFile.split('.').shift() : null