From a6460d972743ecf4cf1fc382dafd06af945fff0a Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 30 Aug 2019 11:52:22 +0300
Subject: [PATCH] Merge lint scripts (#29329)
* Merge js-lint scripts into one script.
* Merge stylelint scripts into one.
---
.stylelintignore | 1 +
package.json | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.stylelintignore b/.stylelintignore
index 7bc488e5f8..e42e889384 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -2,3 +2,4 @@
**/dist/
**/vendor/
/_gh_pages/
+/js/coverage/
diff --git a/package.json b/package.json
index 035711a512..8ff9e2e8bf 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,7 @@
"css-compile-main": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist/css/",
"css-compile-docs": "cross-env-shell node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 site/static/docs/$npm_package_version_short/assets/scss/docs.scss site/static/docs/$npm_package_version_short/assets/css/docs.min.css",
"css-lint": "npm-run-all --continue-on-error --parallel css-lint-*",
- "css-lint-main": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache",
- "css-lint-docs": "stylelint \"site/static/**/assets/scss/*.scss\" \"site/content/**/*.css\" --cache --cache-location .cache/.stylelintcache",
+ "css-lint-stylelint": "stylelint \"**/*.{css,scss}\" --cache --cache-location .cache/.stylelintcache",
"css-lint-vars": "fusv scss/ site/static/",
"css-minify": "npm-run-all --parallel css-minify-*",
"css-minify-main": "cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-utilities.min.css dist/css/bootstrap-utilities.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
@@ -39,15 +38,13 @@
"css-prefix-docs-examples": "postcss --config build/postcss.config.js --replace \"site/content/**/*.css\"",
"js": "npm-run-all js-compile js-minify",
"js-main": "npm-run-all js-lint js-compile js-minify-main",
- "js-docs": "npm-run-all js-lint-docs js-minify-docs",
+ "js-docs": "npm-run-all js-lint js-minify-docs",
"js-compile": "npm-run-all --parallel js-compile-*",
"js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",
"js-compile-standalone-esm": "rollup --environment ESM:true,BUNDLE:false --config build/rollup.config.js --sourcemap",
"js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap",
"js-compile-plugins": "node build/build-plugins.js",
- "js-lint": "npm-run-all --continue-on-error --parallel js-lint-*",
- "js-lint-main": "eslint --cache --cache-location .cache/.eslintcache js/ build/",
- "js-lint-docs": "eslint --cache --cache-location .cache/.eslintcache site/",
+ "js-lint": "eslint --cache --cache-location .cache/.eslintcache .",
"js-minify": "npm-run-all --parallel js-minify-main js-minify-docs",
"js-minify-main": "npm-run-all js-minify-standalone* js-minify-bundle",
"js-minify-standalone": "terser --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
--
GitLab