@adamlui/scss-to-css 1.1.0 → 1.1.2

package/README.md

@@ -3,7 +3,7 @@
 ### Recursively compile all SCSS files into minified CSS.
 
 <a href="#%EF%B8%8F-mit-license"><img height=31 src="https://img.shields.io/badge/License-MIT-fcde7b.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/@adamlui/scss-to-css"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.1.0-fc7811.svg?logo=npm&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@adamlui/scss-to-css"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.1.2-fc7811.svg?logo=npm&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 
 <img height=8px width="100%" src="https://raw.githubusercontent.com/adamlui/js-utils/main/media/images/separators/aqua.png">
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamlui/scss-to-css",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Recursively compile all SCSS files into minified CSS",
   "author": {
     "name": "Adam Lui",
@@ -15,11 +15,10 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "bump": "bash utils/bump.sh",
-    "bump:patch": "bash utils/bump.sh",
+    "bump:patch": "bash utils/bump.sh patch",
     "bump:minor": "bash utils/bump.sh minor",
     "bump:major": "bash utils/bump.sh major",
-    "publish:patch": "bash utils/bump.sh --publish",
+    "publish:patch": "bash utils/bump.sh patch --publish",
     "publish:minor": "bash utils/bump.sh minor --publish",
     "publish:major": "bash utils/bump.sh major --publish"
   },

package/scss-to-css.js

@@ -23,21 +23,19 @@ if (process.argv[2] && !fs.existsSync(inputArg)) {
 }
 
 // Recursively find all SCSS files or arg-passed file
-const inputPath = path.resolve(process.cwd(), inputArg);
-const scssFiles = inputArg.endsWith('.scss') ? [inputPath]
-  : (() => {
-        const fileList = [];
-        (function findSCSSfiles(dir) {
-            const files = fs.readdirSync(dir);
-            files.forEach(file => {
-                const filePath = path.resolve(dir, file);
-                if (fs.statSync(filePath).isDirectory())
-                    findSCSSfiles(filePath); // recursively find SCSS
-                else if (/\.scss$/.test(file)) // SCSS file found
-                    fileList.push(filePath); // store it for minification
-            });
-        })(inputPath); return fileList;
-    })();
+const inputPath = path.resolve(process.cwd(), inputArg),
+      scssFiles = [];
+if (inputArg.endsWith('.scss')) scssFiles.push(inputPath);
+else (function findSCSSfiles(dir) {
+    const files = fs.readdirSync(dir);
+    files.forEach(file => {
+        const filePath = path.resolve(dir, file);
+        if (fs.statSync(filePath).isDirectory())
+            findSCSSfiles(filePath); // recursively find SCSS
+        else if (/\.scss$/.test(file)) // SCSS file found
+            scssFiles.push(filePath); // store it for minification
+    });
+})(inputPath);
 
 // Compile SCSS files to CSS
 let generatedCnt = 0;
@@ -47,7 +45,7 @@ scssFiles.forEach(scssPath => {
         const outputDir = path.join(
             path.dirname(scssPath), // path of file to be minified
             outputArg.endsWith('.css') ? path.dirname(outputArg) : outputArg, // path from output arg
-            outputArg ? '' : '../css' // ../css/ if no output arg used
+            path.dirname(scssPath).endsWith('scss') ? '../css' : '' // ../css/ if in scss/
         );
         const outputFilename = (
             outputArg.endsWith('.css') && inputArg.endsWith('.scss')