From 47258ff60264bc9acc3ba6a470b6f71d6952fd5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Feb 2021 03:02:44 +0000 Subject: [PATCH 1/2] Bump clean-css-cli from 4.3.0 to 5.2.0 Bumps [clean-css-cli](https://github.com/jakubpawlowicz/clean-css-cli) from 4.3.0 to 5.2.0. - [Release notes](https://github.com/jakubpawlowicz/clean-css-cli/releases) - [Changelog](https://github.com/jakubpawlowicz/clean-css-cli/blob/master/History.md) - [Commits](https://github.com/jakubpawlowicz/clean-css-cli/compare/v4.3.0...v5.2.0) Signed-off-by: dependabot[bot] --- package-lock.json | 26 +++++++++++++++++--------- package.json | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d84f2de2..30a8739c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2996,23 +2996,31 @@ } }, "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.0.tgz", + "integrity": "sha512-98ALLW4NOhZpvUEoSc2dJO23xE4S4SXc4mLieCVFGo8DNLTFQ3gzi7msW1lqSYJeGZSF5r5+W3KF6cEnkILnFQ==", "dev": true, "requires": { "source-map": "~0.6.0" } }, "clean-css-cli": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz", - "integrity": "sha512-8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.0.tgz", + "integrity": "sha512-c7TQ+Lq8azYtThXtWlf0m9Iw66wBLQ0LPUJIEKHWTn8HB2tQlbqY6BMoKdgW4NJVZOYquwQrrRszTqH8NjHgTg==", "dev": true, "requires": { - "clean-css": "^4.2.1", - "commander": "2.x", - "glob": "7.x" + "clean-css": "^5.1.0", + "commander": "7.x", + "glob": "^7.1.6" + }, + "dependencies": { + "commander": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", + "dev": true + } } }, "clean-regexp": { diff --git a/package.json b/package.json index 48dd068ce..73d315a7d 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "autoprefixer": "^10.2.4", "browser-sync": "^2.26.14", "bundlewatch": "^0.3.2", - "clean-css-cli": "^4.3.0", + "clean-css-cli": "^5.2.0", "concurrently": "^5.3.0", "eslint": "^7.20.0", "eslint-config-xo": "^0.34.0", From 116264812851b1d872df775eada77228c648d853 Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Mon, 22 Feb 2021 13:19:46 +0530 Subject: [PATCH 2/2] fix css-minify (#3446) --- package.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index e55605e02..13653310f 100644 --- a/package.json +++ b/package.json @@ -15,14 +15,9 @@ "css-compile-splits": "npm run css-compile-bash -- build/scss/parts -o dist/css/alt/", "css-prefix": "postcss --config build/config/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"", "css-prefix-splits": "postcss --config build/config/postcss.config.js --replace \"dist/css/alt/*.css\" \"!dist/css/alt/*.min.css\"", - "css-minify-bash": "cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output ", - "css-minify": "npm run css-minify-bash -- dist/css/adminlte.min.css dist/css/adminlte.css", - "css-minify-splits": "npm-run-all --parallel css-minify:*", - "css-minify:core": "npm run css-minify-bash -- dist/css/alt/adminlte.core.min.css dist/css/alt/adminlte.core.css", - "css-minify:components": "npm run css-minify-bash -- dist/css/alt/adminlte.components.min.css dist/css/alt/adminlte.components.css", - "css-minify:extra-components": "npm run css-minify-bash -- dist/css/alt/adminlte.extra-components.min.css dist/css/alt/adminlte.extra-components.css", - "css-minify:pages": "npm run css-minify-bash -- dist/css/alt/adminlte.pages.min.css dist/css/alt/adminlte.pages.css", - "css-minify:plugins": "npm run css-minify-bash -- dist/css/alt/adminlte.plugins.min.css dist/css/alt/adminlte.plugins.css", + "css-minify-bash": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output ", + "css-minify": "npm run css-minify-bash -- dist/css/ --batch --batch-suffix \".min\" \"dist/css/*.css\" \"!dist/css/*.min.css\"", + "css-minify-splits": "npm run css-minify-bash -- dist/css/alt/ --batch --batch-suffix \".min\" \"dist/css/alt/*.css\" \"!dist/css/alt/*.min.css\"", "css-lint": "stylelint \"build/scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache", "compile": "npm-run-all --parallel js css-all", "dev": "npm-run-all --parallel watch sync",