Merge pull request #947 from kethinov/0.19.3

0.19.3

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 - Put your changes here...
 
+## 0.19.3
+
+- Fixed bug which could cause CSS preprocessor to fail if there are subdirectories in your CSS folder.
+- Various dependencies bumped.
+
 ## 0.19.2
 
 - Breaking: `clientViews` no longer exports a function, instead exporting a JSON object.

lib/preprocessCss.js

@@ -240,7 +240,7 @@ module.exports = (app, callback) => {
     file = file.path || file
 
     // filter out non css files
-    if (!gitignoreFiles.includes(path.basename(file)) && !gitignoreFiles.includes(file) && file !== '.' && file !== '..') {
+    if (file !== '.' && file !== '..' && !gitignoreFiles.includes(path.basename(file)) && !gitignoreFiles.includes(file) && !fs.lstatSync(usingAllowlist ? path.join(cssPath, file.split(':')[0]) : file).isDirectory()) {
       // generate a promise for each file
       promises.push(
         new Promise((resolve, reject) => {

package.json

@@ -8,7 +8,7 @@
       "url": "https://github.com/rooseveltframework/roosevelt/graphs/contributors"
     }
   ],
-  "version": "0.19.2",
+  "version": "0.19.3",
   "files": [
     "defaultErrorPages",
     "lib",
@@ -24,47 +24,47 @@
   "engineStrict": true,
   "dependencies": {
     "app-module-path": "~2.2.0",
-    "clean-css": "~4.2.3",
+    "clean-css": "~4.2.0",
     "colors": "~1.4.0",
-    "compression": "~1.7.4",
-    "cookie-parser": "~1.4.5",
-    "es6-template-strings": "~2.0.1",
-    "express": "~4.17.1",
-    "formidable": "~1.2.2",
-    "fs-extra": "~9.0.1",
+    "compression": "~1.7.0",
+    "cookie-parser": "~1.4.0",
+    "es6-template-strings": "~2.0.0",
+    "express": "~4.17.0",
+    "formidable": "~1.2.0",
+    "fs-extra": "~9.0.0",
     "helmet": "~4.0.0",
     "html-minifier": "~4.0.0",
     "klaw": "~3.0.0",
     "klaw-sync": "~6.0.0",
     "method-override": "~3.0.0",
     "morgan": "~1.10.0",
     "parent-require": "~1.0.0",
-    "roosevelt-logger": "~0.2.2",
+    "roosevelt-logger": "~0.2.0",
     "serve-favicon": "~2.5.0",
-    "source-configs": "~0.3.3",
-    "toobusy-js": "~0.5.1",
+    "source-configs": "~0.3.0",
+    "toobusy-js": "~0.5.0",
     "webpack": "~4.44.0"
   },
   "devDependencies": {
     "c8": "~7.3.0",
-    "codecov": "~3.7.1",
+    "codecov": "~3.7.0",
     "eslint": "~7.6.0",
-    "eslint-plugin-mocha": "~7.0.1",
-    "husky": "~4.2.5",
-    "less": "~3.12.2",
-    "lint-staged": "~10.2.11",
+    "eslint-plugin-mocha": "~8.0.0",
+    "husky": "~4.2.0",
+    "less": "~3.12.0",
+    "lint-staged": "~10.2.0",
     "mocha": "~8.1.0",
-    "node-sass": "~4.14.1",
-    "proxyquire": "~2.1.3",
-    "sinon": "~9.0.2",
-    "standard": "~14.3.4",
-    "stylus": "~0.54.8",
-    "supertest": "~4.0.2",
-    "teddy": "~0.5.3"
+    "node-sass": "~4.14.0",
+    "proxyquire": "~2.1.0",
+    "sinon": "~9.0.0",
+    "standard": "~14.3.0",
+    "stylus": "~0.54.0",
+    "supertest": "~4.0.0",
+    "teddy": "~0.5.0"
   },
   "optionalDependencies": {
     "check-dependencies": "~1.1.0",
-    "express-html-validator": "~0.1.2",
+    "express-html-validator": "~0.1.0",
     "reload": "~3.1.0"
   },
   "repository": {