Closes #6 - fixed file overwrite bug

Author: codewithkyle

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0] - 2020-09-10
+
+### Added
+
+-   preflight resets `<button>` padding
+-   preflight resets `<a>` text color and decoration styles
+-   CSSMonster will throw an error when two files have the same name
+-   `autoresolve` config value -- boolean
+
+### Updated
+
+-   npm packages
+
 ## [0.2.1] - 2020-06-05
 
 ### Updated

README.md

@@ -27,9 +27,6 @@ Add the config file:
 ```javascript
 module.exports = {
     sources: "./src", // Also accepts an array
-    purgeCSS: {
-        content: ["./templates/**/*.html"],
-    },
 };
 ```
 
@@ -57,6 +54,7 @@ module.exports = {
     },
     blacklist: [],
     include: [], // Paths that will be included while compiling the SCSS
+    autoresolve: false, // when true files with the same name are merged together
 };
 ```
 

cssmonster.js

@@ -53,11 +53,10 @@ class CSSMonster {
             sources: [path.resolve(cwd, "src")],
             minify: true,
             purge: true,
-            purgeCSS: {
-                content: [path.resolve(cwd, "**/*.html")],
-            },
+            purgeCSS: null,
             blacklist: [],
             include: [],
+            autoresolve: false,
         };
         this.run();
     }
@@ -67,7 +66,7 @@ class CSSMonster {
             if (fs.existsSync(this.tempDir)) {
                 fs.rmdirSync(this.tempDir, { recursive: true });
             }
-            fs.mkdir(this.tempDir, error => {
+            fs.mkdir(this.tempDir, (error) => {
                 if (error) {
                     reject(error);
                 }
@@ -179,12 +178,21 @@ class CSSMonster {
                 }
             }
 
+            /** autoresolve */
+            if (typeof config.autoresolve !== "undefined") {
+                if (typeof config.autoresolve === "boolean") {
+                    this.config.autoresolve = config.autoresolve;
+                } else {
+                    reject("Incorrect configuration: autoresolve must be a boolean.");
+                }
+            }
+
             resolve();
         });
     }
 
     removeIgnored(files) {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             if (!files.length || !this.config.blacklist.length) {
                 resolve(files);
             }
@@ -225,17 +233,39 @@ class CSSMonster {
                 resolve(files);
             }
             const movedFiles = [];
+            let count = 0;
             for (let i = 0; i < files.length; i++) {
                 const filename = files[i].replace(/(.*\/)|(.*\\)/, "");
-                fs.copyFile(files[i], `${this.tempDir}/${filename}`, error => {
-                    if (error) {
-                        reject(error);
-                    }
-                    movedFiles.push(`${this.tempDir}/${filename}`);
-                    if (movedFiles.length === files.length) {
-                        resolve(movedFiles);
+                if (!fs.existsSync(`${this.tempDir}/${filename}`)) {
+                    fs.copyFile(files[i], `${this.tempDir}/${filename}`, (error) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        movedFiles.push(`${this.tempDir}/${filename}`);
+                        count++;
+                        if (count === files.length) {
+                            resolve(movedFiles);
+                        }
+                    });
+                } else {
+                    if (this.config.autoresolve) {
+                        const newFileData = fs.readFileSync(files[i]).toString();
+                        let tempFileData = fs.readFileSync(`${this.tempDir}/${filename}`).toString();
+                        tempFileData += "\n";
+                        tempFileData += newFileData;
+                        fs.writeFile(`${this.tempDir}/${filename}`, tempFileData, (error) => {
+                            if (error) {
+                                reject(error);
+                            }
+                            count++;
+                            if (count === files.length) {
+                                resolve(movedFiles);
+                            }
+                        });
+                    } else {
+                        reject(`Two files have the same name "${filename}" rename one of the files or enable the CSSMonster autoresolve setting.`);
                     }
-                });
+                }
             }
         });
     }
@@ -253,7 +283,7 @@ class CSSMonster {
             if (fs.existsSync(`${this.tempDir}/normalize.css`)) {
                 fs.unlinkSync(`${this.tempDir}/normalize.css`);
             }
-            fs.writeFile(`${this.tempDir}/normalize.css`, data, error => {
+            fs.writeFile(`${this.tempDir}/normalize.css`, data, (error) => {
                 if (error) {
                     reject(error);
                 }
@@ -297,7 +327,7 @@ class CSSMonster {
                             let fileName = result.stats.entry.replace(/(.*\/)|(.*\\)/, "").replace(/(.scss)$/g, "");
                             if (fileName) {
                                 const newFile = `${this.tempDir}/${fileName}.css`;
-                                fs.writeFile(newFile, result.css.toString(), error => {
+                                fs.writeFile(newFile, result.css.toString(), (error) => {
                                     if (error) {
                                         reject("Something went wrong saving the file" + error);
                                     }
@@ -327,12 +357,12 @@ class CSSMonster {
                 let minified = 0;
                 for (let i = 0; i < files.length; i++) {
                     minify(files[i])
-                        .then(css => {
-                            fs.unlink(files[i], error => {
+                        .then((css) => {
+                            fs.unlink(files[i], (error) => {
                                 if (error) {
                                     reject(error);
                                 }
-                                fs.writeFile(files[i], css, error => {
+                                fs.writeFile(files[i], css, (error) => {
                                     if (error) {
                                         reject(error);
                                     }
@@ -343,7 +373,7 @@ class CSSMonster {
                                 });
                             });
                         })
-                        .catch(error => {
+                        .catch((error) => {
                             reject(error);
                         });
                 }
@@ -362,12 +392,12 @@ class CSSMonster {
         purgeCSSConfig.css = [`${this.tempDir}/**/*.css`];
         const purgecssResult = await new PurgeCSS().purge(purgeCSSConfig);
         const purgedFiles = [];
-        purgecssResult.forEach(result => {
-            fs.unlink(result.file, error => {
+        purgecssResult.forEach((result) => {
+            fs.unlink(result.file, (error) => {
                 if (error) {
                     throw error;
                 }
-                fs.writeFile(result.file, result.css, error => {
+                fs.writeFile(result.file, result.css, (error) => {
                     if (error) {
                         throw error;
                     }
@@ -385,7 +415,7 @@ class CSSMonster {
             if (fs.existsSync(this.config.outDir)) {
                 fs.rmdirSync(this.config.outDir, { recursive: true });
             }
-            fs.rename(this.tempDir, this.config.outDir, error => {
+            fs.rename(this.tempDir, this.config.outDir, (error) => {
                 if (error) {
                     reject(error);
                 }
@@ -395,7 +425,7 @@ class CSSMonster {
     }
 
     cleanup() {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             if (fs.existsSync(this.tempDir)) {
                 fs.rmdirSync(this.tempDir, { recursive: true });
             }

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "cssmonster",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "CSSMonster helps developers manage normalize.css, node-sass, and purgeCSS with ease.",
     "main": "cssmonster.js",
     "author": "Kyle Andrews",
@@ -20,9 +20,9 @@
         "minify": "^5.1.1",
         "node-sass": "^4.14.1",
         "normalize.css": "^8.0.1",
-        "ora": "^4.0.4",
-        "purgecss": "^2.2.1",
+        "ora": "^4.1.1",
+        "purgecss": "^2.3.0",
         "semver": "^7.3.2",
-        "yargs": "^15.3.1"
+        "yargs": "^15.4.1"
     }
 }

package.json

@@ -68,4 +68,10 @@ button
     user-select: none;
     font-size: inherit;
     font-weight: inherit;
+    padding: 0;
+}
+
+a{
+    text-decoration: none;
+    color: inherit;
 }