From b44588e0d5858b68c79ff65b1d840b052100bfed Mon Sep 17 00:00:00 2001 From: Eric Newport Date: Mon, 10 Aug 2020 13:17:45 -0400 Subject: [PATCH] 0.19.3 - Fixed bug which could cause CSS preprocessor to fail if there are subdirectories in your CSS folder. - Various dependencies bumped. --- CHANGELOG.md | 5 +++++ lib/preprocessCss.js | 2 +- package-lock.json | 52 ++++++++++++++++++++++---------------------- package.json | 48 ++++++++++++++++++++-------------------- 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 062eeea8..6f369964 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/lib/preprocessCss.js b/lib/preprocessCss.js index 9a987253..ef24da64 100644 --- a/lib/preprocessCss.js +++ b/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) => { diff --git a/package-lock.json b/package-lock.json index d174756f..08a1c766 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "roosevelt", - "version": "0.19.2", + "version": "0.19.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -309,9 +309,9 @@ } }, "acorn": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", - "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==" + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==" }, "acorn-jsx": { "version": "5.2.0", @@ -943,15 +943,15 @@ } }, "browserify-sign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz", - "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.2", + "elliptic": "^6.5.3", "inherits": "^2.0.4", "parse-asn1": "^5.1.5", "readable-stream": "^3.6.0", @@ -1195,9 +1195,9 @@ } }, "chokidar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "optional": true, "requires": { "anymatch": "~3.1.1", @@ -2880,13 +2880,13 @@ } }, "eslint-plugin-mocha": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz", - "integrity": "sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz", + "integrity": "sha512-n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ==", "dev": true, "requires": { - "eslint-utils": "^2.0.0", - "ramda": "^0.27.0" + "eslint-utils": "^2.1.0", + "ramda": "^0.27.1" }, "dependencies": { "eslint-utils": { @@ -4924,9 +4924,9 @@ "optional": true }, "is-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz", - "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "requires": { "has-symbols": "^1.0.1" } @@ -5444,9 +5444,9 @@ } }, "listr2": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.4.1.tgz", - "integrity": "sha512-8pYsCZCztr5+KAjReLyBeGhLV0vaQ2Du/eMe/ux9QAfQl7efiWejM1IWjALh0zHIRYuIbhQ8N2KztZ4ci56pnQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.5.0.tgz", + "integrity": "sha512-C7GqFmf+C7LglqYJU1feOBw46hvCRO1Ja58TmKZtXP+JyyHE2m1+ZhoBfliIGeUuiT9PuPU1OJ9kbky93+Qziw==", "dev": true, "requires": { "chalk": "^4.1.0", @@ -5455,7 +5455,7 @@ "indent-string": "^4.0.0", "log-update": "^4.0.0", "p-map": "^4.0.0", - "rxjs": "^6.6.0", + "rxjs": "^6.6.2", "through": "^2.3.8" }, "dependencies": { @@ -9473,9 +9473,9 @@ "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==" }, "v8-to-istanbul": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.0.tgz", - "integrity": "sha512-x4Kbx2kGS+N+095L7Wgim6BECRTQUPtrbDhRFcfL1KLnzvhViKiJOy8Pl9FCRelja9ss4VsIzEHTT3cbc+fNFw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz", + "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.1", diff --git a/package.json b/package.json index 1d4cb251..0558d213 100644 --- a/package.json +++ b/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,14 +24,14 @@ "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", @@ -39,32 +39,32 @@ "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": {