Merge branch 'vs-move-stylelint-commands-in-package-json' into 'master'

Prefix stylelint commands in package.json with lint

See merge request gitlab-org/gitlab!54582

doc/development/contributing/style_guides.md

@@ -59,7 +59,7 @@ Before you push your changes, Lefthook automatically runs the following checks:
 - ES lint: Run `yarn run internal:eslint` checks (with the [`.eslintrc.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.eslintrc.yml) configuration) on the modified `*.{js,vue}` files. Tags: `frontend`, `style`.
 - HAML lint: Run `bundle exec haml-lint` checks (with the [`.haml-lint.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.haml-lint.yml) configuration) on the modified `*.html.haml` files. Tags: `view`, `haml`, `style`.
 - Markdown lint: Run `yarn markdownlint` checks on the modified `*.md` files. Tags: `documentation`, `style`.
-- SCSS lint: Run `yarn stylelint` checks (with the [`.stylelintrc`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.stylelintrc) configuration) on the modified `*.scss{,.css}` files. Tags: `stylesheet`, `css`, `style`.
+- SCSS lint: Run `yarn lint:stylelint` checks (with the [`.stylelintrc`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.stylelintrc) configuration) on the modified `*.scss{,.css}` files. Tags: `stylesheet`, `css`, `style`.
 - RuboCop: Run `bundle exec rubocop` checks (with the [`.rubocop.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.rubocop.yml) configuration) on the modified `*.rb` files. Tags: `backend`, `style`.
 - Vale: Run `vale` checks (with the [`.vale.ini`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.vale.ini) configuration) on the modified `*.md` files. Tags: `documentation`, `style`.
 

doc/development/fe_guide/style/scss.md

@@ -135,7 +135,7 @@ Before adding a new variable for a color or a size, guarantee:
 We use [stylelint](https://stylelint.io) to check for style guide conformity. It uses the
 ruleset in `.stylelintrc` and rules from [our SCSS configuration](https://gitlab.com/gitlab-org/frontend/gitlab-stylelint-config). `.stylelintrc` is located in the home directory of the project.
 
-To check if any warnings are produced by your changes, run `yarn stylelint` in the GitLab directory. Stylelint also runs in GitLab CI/CD to
+To check if any warnings are produced by your changes, run `yarn lint:stylelint` in the GitLab directory. Stylelint also runs in GitLab CI/CD to
 catch any warnings.
 
 If the Rake task is throwing warnings you don't understand, SCSS Lint's

package.json

@@ -5,10 +5,10 @@
     "block-dependencies": "node scripts/frontend/block_dependencies.js",
     "clean": "rm -rf public/assets tmp/cache/*-loader",
     "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" node scripts/frontend/webpack_dev_server.js",
-    "eslint-fix": "echo 'Please use lint:eslint:fix instead' && exit 1",
-    "eslint-staged": "echo 'Please use lint:eslint:staged instead' && exit 1",
-    "eslint-staged-fix": "echo 'Please use lint:eslint:staged:fix instead' && exit 1",
-    "eslint-report": "echo 'Please use lint:eslint:report instead' && exit 1",
+    "eslint-fix": "echo 'Please use `yarn lint:eslint:fix` instead' && exit 1",
+    "eslint-staged": "echo 'Please use `yarn lint:eslint:staged` instead' && exit 1",
+    "eslint-staged-fix": "echo 'Please use `yarn lint:eslint:staged:fix` instead' && exit 1",
+    "eslint-report": "echo 'Please use `yarn lint:eslint:report` instead' && exit 1",
     "file-coverage": "scripts/frontend/file_test_coverage.js",
     "lint-docs": "scripts/lint-doc.sh",
     "internal:eslint": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue",
@@ -30,14 +30,16 @@
     "lint:prettier:fix": "yarn run prettier --write '**/*.{graphql,js,vue}'",
     "lint:prettier:staged": "scripts/frontend/execute-on-staged-files.sh prettier '(graphql|js|vue)' --check",
     "lint:prettier:staged:fix": "scripts/frontend/execute-on-staged-files.sh prettier '(graphql|js|vue)' --write",
+    "lint:stylelint": "stylelint --cache -q '{ee/,}app/assets/stylesheets/**/*.{css,scss}'",
+    "lint:stylelint:fix": "yarn run lint:stylelint --fix",
+    "lint:stylelint:staged": "scripts/frontend/execute-on-staged-files.sh stylelint '(css|scss)' -q",
+    "lint:stylelint:staged:fix": "yarn run lint:stylelint:staged --fix",
     "markdownlint": "markdownlint --config .markdownlint.json",
     "postinstall": "node ./scripts/frontend/postinstall.js",
-    "prettier-all": "echo 'Please use lint:prettier instead' && exit 1",
-    "prettier-all-save": "echo 'Please use lint:prettier:fix instead' && exit 1",
-    "prettier-staged": "echo 'Please use lint:prettier:staged instead' && exit 1",
-    "prettier-staged-save": "echo 'Please use lint:prettier:staged:fixed instead' && exit 1",
-    "stylelint": "yarn stylelint-file 'app/assets/stylesheets/**/*.*'  'ee/app/assets/stylesheets/**/*.*' '!app/assets/stylesheets/startup/startup-*.scss' '!**/vendors/**'",
-    "stylelint-file": "BROWSERSLIST_IGNORE_OLD_DATA=true node node_modules/stylelint/bin/stylelint.js",
+    "prettier-all": "echo 'Please use `yarn lint:prettier` instead' && exit 1",
+    "prettier-all-save": "echo 'Please use `yarn lint:prettier:fix` instead' && exit 1",
+    "prettier-staged": "echo 'Please use `yarn lint:prettier:staged` instead' && exit 1",
+    "prettier-staged-save": "echo 'Please use `yarn lint:prettier:staged:fix` instead' && exit 1",
     "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
     "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js",
     "webpack-vendor": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.vendor.config.js",

scripts/static-analysis

@@ -33,7 +33,7 @@ class StaticAnalysis
     %w[bin/rake gitlab:sidekiq:all_queues_yml:check] => 13,
     (Gitlab.ee? ? %w[bin/rake gitlab:sidekiq:sidekiq_queues_yml:check] : nil) => 13,
     %w[bin/rake config_lint] => 11,
-    %w[yarn run stylelint] => 9,
+    %w[yarn run lint:stylelint] => 9,
     %w[scripts/lint-conflicts.sh] => 0.59,
     %w[yarn run block-dependencies] => 0.35,
     %w[scripts/lint-rugged] => 0.23,