purgetss 7.1.4 → 7.1.5

package/dist/purgetss.ui.js

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

package/experimental/completions2.js

@@ -18,7 +18,10 @@ import { colores } from '../src/shared/brand-colors.js'
 export { colores }
 const purgeLabel = colores.purgeLabel
 
-const projectsConfigJS = cwd + '/purgetss/config.cjs'
+import * as helpers from '../src/shared/helpers.js'
+import { getConfigFile } from '../src/shared/config-manager.js'
+import { projectsConfigJS } from '../src/shared/constants.js'
+const tiCompletionsFile = require('../lib/completions/titanium/completions-v3.json')
 
 const logger = {
   info: (...args) => console.log(purgeLabel, args.join(' ')),
@@ -27,11 +30,7 @@ const logger = {
   file: (...args) => console.log(purgeLabel, chalk.yellow(args.join(' ')), 'file created!')
 }
 
-import * as helpers from '../src/shared/helpers.js'
-const tiCompletionsFile = require('../lib/completions/titanium/completions-v3.json')
-const srcConfigFile = path.resolve(__dirname, '../lib/templates/purgetss.config.js.cjs')
-
-const configFile = (fs.existsSync(projectsConfigJS)) ? require(projectsConfigJS) : require(srcConfigFile)
+const configFile = getConfigFile()
 configFile.purge = configFile.purge ?? { mode: 'all' }
 configFile.theme = configFile.theme ?? {}
 configFile.theme.extend = configFile.theme.extend ?? {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "purgetss",
-  "version": "7.1.4",
+  "version": "7.1.5",
   "main": "src/index.js",
   "bin": {
     "purgetss": "bin/purgetss"

package/src/cli/utils/file-operations.js

@@ -14,12 +14,17 @@ import fs from 'fs'
 import util from 'util'
 import { projectsConfigJS } from '../../shared/constants.js'
 import { createConfigFile } from '../commands/init.js'
+import { migrateConfigIfNeeded } from '../../shared/config-manager.js'
 
 /**
  * Initialize config if it doesn't exist
- * Maintains exact same logic as original initIfNotConfig() function
+ * FIRST migrates any existing config.js, THEN creates default if needed
  */
 export function initIfNotConfig() {
+  // CRITICAL: Migrate config.js to config.cjs BEFORE checking if file exists
+  migrateConfigIfNeeded()
+  
+  // Now check if we need to create default config
   if (!fs.existsSync(projectsConfigJS)) {
     createConfigFile()
   }

package/src/shared/config-manager.js

@@ -25,23 +25,31 @@ import { makeSureFolderExists } from './utils.js'
 const require = createRequire(import.meta.url)
 
 /**
- * Get configuration file with fallback to default template
- * Maintains exact same logic as original getConfigFile()
- *
- * @returns {Object} Configuration object with defaults applied
+ * Migrate config.js to config.cjs for ESM compatibility
+ * This must be called BEFORE any config file creation
  */
-export function getConfigFile() {
-  // Auto-migration: rename config.js to config.cjs for ESM compatibility
+export function migrateConfigIfNeeded() {
   const oldConfigPath = `${projectsPurgeTSSFolder}/config.js`
+
+  // If only config.js exists, migrate it directly
   if (fs.existsSync(oldConfigPath) && !fs.existsSync(projectsConfigJS)) {
     makeSureFolderExists(projectsPurgeTSSFolder)
     fs.renameSync(oldConfigPath, projectsConfigJS)
     logger.info('Migrated config.js to config.cjs for ESM compatibility')
-  } else if (fs.existsSync(oldConfigPath) && fs.existsSync(projectsConfigJS)) {
-    // Remove old config.js if both exist
-    fs.unlinkSync(oldConfigPath)
-    logger.info('Removed duplicate config.js file')
   }
+  // If both exist, preserve config.js (let the user decide)
+  else if (fs.existsSync(oldConfigPath) && fs.existsSync(projectsConfigJS)) {
+    logger.warn('Both config.js and config.cjs exist. Please manually merge and remove config.js')
+  }
+}
+
+/**
+ * Get configuration file with fallback to default template
+ * Maintains exact same logic as original getConfigFile()
+ *
+ * @returns {Object} Configuration object with defaults applied
+ */
+export function getConfigFile() {
 
   const configFile = (fs.existsSync(projectsConfigJS))
     ? require(projectsConfigJS)
@@ -56,7 +64,7 @@ export function getConfigFile() {
   configFile.purge.options.widgets = configFile.purge.options.widgets ?? false
   configFile.purge.options.safelist = configFile.purge.options.safelist ?? []
   configFile.purge.options.plugins = configFile.purge.options.plugins ?? []
-  
+
   configFile.theme = configFile.theme ?? {}
   configFile.theme.extend = configFile.theme.extend ?? {}
 
@@ -160,5 +168,6 @@ export default {
   loadRawConfig,
   getGlobalConfigFile,
   getGlobalConfigOptions,
+  migrateConfigIfNeeded,
   defaultTheme
 }