purgecss 7.0.2 → 8.0.0

package/README.md

@@ -18,7 +18,6 @@ This is where PurgeCSS comes into play. PurgeCSS analyzes your content and your
 
 ## Sponsors 🥰
 
-[<img src="https://avatars0.githubusercontent.com/u/67109815?v=4" height="85" style="margin-right: 10px">](https://tailwindcss.com)
 [<img src="https://avatars.githubusercontent.com/u/133211198?v=4" height="85" style="margin-right: 10px">](https://www.bairesdev.com/sponsoring-open-source-projects/)
 
 ## Documentation

package/bin/purgecss.js

@@ -3,7 +3,7 @@
 
 var commander = require('commander');
 var fs = require('fs');
-var glob = require('glob');
+var glob = require('fast-glob');
 var path = require('path');
 var postcss = require('postcss');
 var selectorParser = require('postcss-selector-parser');
@@ -31,79 +31,11 @@ var glob__namespace = /*#__PURE__*/_interopNamespaceDefault(glob);
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var postcss__namespace = /*#__PURE__*/_interopNamespaceDefault(postcss);
 
-var name = "purgecss";
-var version = "6.0.0";
+var version = "8.0.0";
 var description = "Remove unused css selectors";
-var author = "Ffloriel";
-var homepage = "https://purgecss.com";
-var keywords = [
-	"optimize",
-	"optimization",
-	"remove",
-	"unused",
-	"css",
-	"html",
-	"rules",
-	"purge",
-	"uncss",
-	"purify"
-];
-var license = "MIT";
-var main$1 = "lib/purgecss.js";
-var module$1 = "./lib/purgecss.esm.js";
-var types = "./lib/purgecss.d.ts";
-var bin = {
-	purgecss: "bin/purgecss.js"
-};
-var directories = {
-	lib: "lib",
-	test: "__tests__"
-};
-var files = [
-	"bin",
-	"lib"
-];
-var repository = {
-	type: "git",
-	url: "git+https://github.com/FullHuman/purgecss.git"
-};
-var scripts = {
-	build: "ts-node build.ts",
-	test: "jest"
-};
-var dependencies = {
-	commander: "^12.1.0",
-	glob: "^11.0.0",
-	postcss: "^8.4.47",
-	"postcss-selector-parser": "^6.1.2"
-};
-var bugs = {
-	url: "https://github.com/FullHuman/purgecss/issues"
-};
-var publishConfig = {
-	access: "public",
-	registry: "https://registry.npmjs.org/"
-};
 var packageJson = {
-	name: name,
 	version: version,
-	description: description,
-	author: author,
-	homepage: homepage,
-	keywords: keywords,
-	license: license,
-	main: main$1,
-	module: module$1,
-	types: types,
-	bin: bin,
-	directories: directories,
-	files: files,
-	repository: repository,
-	scripts: scripts,
-	dependencies: dependencies,
-	bugs: bugs,
-	publishConfig: publishConfig
-};
+	description: description};
 
 const IGNORE_ANNOTATION_CURRENT = "purgecss ignore current";
 const IGNORE_ANNOTATION_NEXT = "purgecss ignore";
@@ -370,7 +302,12 @@ async function setOptions(configFile = CONFIG_FILENAME) {
     let options;
     try {
         const t = path__namespace.resolve(process.cwd(), configFile);
-        options = await import(t);
+        const importedConfig = await import(t);
+        // Handle both ES modules (direct export) and CommonJS (default export)
+        options =
+            importedConfig.default && typeof importedConfig.default === "object"
+                ? importedConfig.default
+                : importedConfig;
     }
     catch (err) {
         if (err instanceof Error) {
@@ -625,6 +562,13 @@ class PurgeCSS {
                 }
                 return;
             }
+            // Also check CSS custom properties for animation names
+            // e.g., --my-animation: fadeIn 0.4s;
+            if (prop.startsWith("--")) {
+                for (const word of value.split(/[\s,]+/)) {
+                    this.usedAnimations.add(word);
+                }
+            }
         }
         // collect font faces data
         if (this.options.fontFace) {
@@ -665,7 +609,7 @@ class PurgeCSS {
             }
             catch (err) {
                 filesNames.push(...glob__namespace.sync(globFile, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs.map((glob) => glob.replace(/^\.\//, "")),
                 }));
             }
@@ -831,7 +775,7 @@ class PurgeCSS {
         for (const option of cssOptions) {
             if (typeof option === "string") {
                 processedOptions.push(...glob__namespace.sync(option, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs,
                 }));
             }
@@ -859,9 +803,12 @@ class PurgeCSS {
                 this.removeUnusedCSSVariables();
             const postCSSResult = root.toResult({
                 map: this.options.sourceMap,
-                to: typeof this.options.sourceMap === "object"
+                to: typeof this.options.sourceMap === "object" &&
+                    this.options.sourceMap.to
                     ? this.options.sourceMap.to
-                    : undefined,
+                    : isFromFile
+                        ? option
+                        : undefined,
             });
             const result = {
                 css: postCSSResult.toString(),
@@ -1154,11 +1101,12 @@ function parseCommandOptions(program) {
         .option("-rejected-css, --rejected-css", "option to output rejected css")
         .option("-s, --safelist <list...>", "list of classes that should not be removed")
         .option("-b, --blocklist <list...>", "list of selectors that should be removed")
-        .option("-k, --skippedContentGlobs <list...>", "list of glob patterns for folders/files that should not be scanned");
+        .option("-k, --skippedContentGlobs <list...>", "list of glob patterns for folders/files that should not be scanned")
+        .option("-p, --preserve-paths", "preserve folder hierarchy in the output");
     return program;
 }
 async function getOptions(program) {
-    const { config, css, content, output, fontFace, keyframes, variables, rejected, rejectedCss, safelist, blocklist, skippedContentGlobs, } = program.opts();
+    const { config, css, content, output, fontFace, keyframes, variables, rejected, rejectedCss, safelist, blocklist, skippedContentGlobs, preservePaths, } = program.opts();
     // config file is not specified or the content and css are not,
     // PurgeCSS will not run
     if (!config && !(content && css)) {
@@ -1213,12 +1161,13 @@ async function getOptions(program) {
         options.skippedContentGlobs = skippedContentGlobs;
     if (output)
         options.output = output;
-    return options;
+    return { ...options, preservePaths };
 }
 async function run(program) {
     var _a;
     const options = await getOptions(program);
-    const purged = await new PurgeCSS().purge(options);
+    const { preservePaths, ...purgeOptions } = options;
+    const purged = await new PurgeCSS().purge(purgeOptions);
     // output results in specified directory
     if (options.output) {
         if (purged.length === 1 && options.output.endsWith(".css")) {
@@ -1226,8 +1175,20 @@ async function run(program) {
             return;
         }
         for (const purgedResult of purged) {
-            const fileName = (_a = purgedResult === null || purgedResult === void 0 ? void 0 : purgedResult.file) === null || _a === void 0 ? void 0 : _a.split("/").pop();
-            await writeCSSToFile(`${options.output}/${fileName}`, purgedResult.css);
+            let outputPath;
+            if (preservePaths && (purgedResult === null || purgedResult === void 0 ? void 0 : purgedResult.file)) {
+                // Preserve the folder hierarchy
+                outputPath = `${options.output}/${purgedResult.file}`;
+            }
+            else {
+                // Default behavior: flatten to just the filename
+                const fileName = (_a = purgedResult === null || purgedResult === void 0 ? void 0 : purgedResult.file) === null || _a === void 0 ? void 0 : _a.split("/").pop();
+                outputPath = `${options.output}/${fileName}`;
+            }
+            // Ensure the directory exists
+            const dir = outputPath.substring(0, outputPath.lastIndexOf("/"));
+            await fs__namespace.promises.mkdir(dir, { recursive: true });
+            await writeCSSToFile(outputPath, purgedResult.css);
         }
     }
     else {

package/lib/purgecss.esm.js

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as glob from 'glob';
+import * as glob from 'fast-glob';
 import * as path from 'path';
 import * as postcss from 'postcss';
 import selectorParser from 'postcss-selector-parser';
@@ -270,7 +270,12 @@ async function setOptions(configFile = CONFIG_FILENAME) {
     let options;
     try {
         const t = path.resolve(process.cwd(), configFile);
-        options = await import(t);
+        const importedConfig = await import(t);
+        // Handle both ES modules (direct export) and CommonJS (default export)
+        options =
+            importedConfig.default && typeof importedConfig.default === "object"
+                ? importedConfig.default
+                : importedConfig;
     }
     catch (err) {
         if (err instanceof Error) {
@@ -525,6 +530,13 @@ class PurgeCSS {
                 }
                 return;
             }
+            // Also check CSS custom properties for animation names
+            // e.g., --my-animation: fadeIn 0.4s;
+            if (prop.startsWith("--")) {
+                for (const word of value.split(/[\s,]+/)) {
+                    this.usedAnimations.add(word);
+                }
+            }
         }
         // collect font faces data
         if (this.options.fontFace) {
@@ -565,7 +577,7 @@ class PurgeCSS {
             }
             catch (err) {
                 filesNames.push(...glob.sync(globFile, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs.map((glob) => glob.replace(/^\.\//, "")),
                 }));
             }
@@ -731,7 +743,7 @@ class PurgeCSS {
         for (const option of cssOptions) {
             if (typeof option === "string") {
                 processedOptions.push(...glob.sync(option, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs,
                 }));
             }
@@ -759,9 +771,12 @@ class PurgeCSS {
                 this.removeUnusedCSSVariables();
             const postCSSResult = root.toResult({
                 map: this.options.sourceMap,
-                to: typeof this.options.sourceMap === "object"
+                to: typeof this.options.sourceMap === "object" &&
+                    this.options.sourceMap.to
                     ? this.options.sourceMap.to
-                    : undefined,
+                    : isFromFile
+                        ? option
+                        : undefined,
             });
             const result = {
                 css: postCSSResult.toString(),

package/lib/purgecss.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs');
-var glob = require('glob');
+var glob = require('fast-glob');
 var path = require('path');
 var postcss = require('postcss');
 var selectorParser = require('postcss-selector-parser');
@@ -294,7 +294,12 @@ async function setOptions(configFile = CONFIG_FILENAME) {
     let options;
     try {
         const t = path__namespace.resolve(process.cwd(), configFile);
-        options = await import(t);
+        const importedConfig = await import(t);
+        // Handle both ES modules (direct export) and CommonJS (default export)
+        options =
+            importedConfig.default && typeof importedConfig.default === "object"
+                ? importedConfig.default
+                : importedConfig;
     }
     catch (err) {
         if (err instanceof Error) {
@@ -549,6 +554,13 @@ class PurgeCSS {
                 }
                 return;
             }
+            // Also check CSS custom properties for animation names
+            // e.g., --my-animation: fadeIn 0.4s;
+            if (prop.startsWith("--")) {
+                for (const word of value.split(/[\s,]+/)) {
+                    this.usedAnimations.add(word);
+                }
+            }
         }
         // collect font faces data
         if (this.options.fontFace) {
@@ -589,7 +601,7 @@ class PurgeCSS {
             }
             catch (err) {
                 filesNames.push(...glob__namespace.sync(globFile, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs.map((glob) => glob.replace(/^\.\//, "")),
                 }));
             }
@@ -755,7 +767,7 @@ class PurgeCSS {
         for (const option of cssOptions) {
             if (typeof option === "string") {
                 processedOptions.push(...glob__namespace.sync(option, {
-                    nodir: true,
+                    onlyFiles: true,
                     ignore: this.options.skippedContentGlobs,
                 }));
             }
@@ -783,9 +795,12 @@ class PurgeCSS {
                 this.removeUnusedCSSVariables();
             const postCSSResult = root.toResult({
                 map: this.options.sourceMap,
-                to: typeof this.options.sourceMap === "object"
+                to: typeof this.options.sourceMap === "object" &&
+                    this.options.sourceMap.to
                     ? this.options.sourceMap.to
-                    : undefined,
+                    : isFromFile
+                        ? option
+                        : undefined,
             });
             const result = {
                 css: postCSSResult.toString(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "purgecss",
-  "version": "7.0.2",
+  "version": "8.0.0",
   "description": "Remove unused css selectors",
   "author": "Ffloriel",
   "homepage": "https://purgecss.com",
@@ -41,9 +41,9 @@
   },
   "dependencies": {
     "commander": "^12.1.0",
-    "glob": "^11.0.0",
+    "fast-glob": "^3.3.2",
     "postcss": "^8.4.47",
-    "postcss-selector-parser": "^6.1.2"
+    "postcss-selector-parser": "^7.0.0"
   },
   "bugs": {
     "url": "https://github.com/FullHuman/purgecss/issues"
@@ -52,5 +52,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "e95398d961e03a809b5e3da75e3dae1813b46b68"
+  "gitHead": "9269dbc8b589832bab90d29f5821fc4cf55077d6"
 }