From 7778818b65b3723f14dbd56c2d84c543dfafb38c Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Mon, 25 Nov 2024 21:30:52 +0000
Subject: [PATCH] Issue #3467309 by spokje, smustgrave: Replace abandoned, not
working with latest stylelint, leon0399/stylelint-formatter-gitlab with
gitlab-formatters/stylelint-formatter-gitlab
---
.gitlab-ci.yml | 4 +--
core/package.json | 4 +--
core/yarn.lock | 86 +++++++----------------------------------------
3 files changed, 16 insertions(+), 78 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 530926174cf8..ffcbee454a8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -454,10 +454,10 @@ default:
- cd core
- yarn install
- yarn run build:css --check
- - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content --color --custom-formatter=node_modules/stylelint-formatter-gitlab
+ - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content --color --custom-formatter=@gitlab-formatters/stylelint-formatter-gitlab --output-file=$CI_PROJECT_DIR/gl-codequality.json
artifacts:
reports:
- codequality: stylelint-quality-report.json
+ codequality: gl-codequality.json
'📔 Spell-checking':
<<: [ *default-job-settings-lint ]
diff --git a/core/package.json b/core/package.json
index bd5d82271822..cfdad3eccfc7 100644
--- a/core/package.json
+++ b/core/package.json
@@ -16,7 +16,7 @@
"lint:core-js-passing": "node ./node_modules/eslint/bin/eslint.js --quiet --config=.eslintrc.passing.json .",
"lint:core-js-stats": "node ./node_modules/eslint/bin/eslint.js --format=./scripts/js/eslint-stats-by-type.js .",
"lint:css": "stylelint \"**/*.css\"",
- "lint:css-checkstyle": "stylelint \"**/*.css\" --custom-formatter ./node_modules/stylelint-checkstyle-formatter/index.js",
+ "lint:css-checkstyle": "stylelint \"**/*.css\" --custom-formatter=@gitlab-formatters/stylelint-formatter-gitlab --output-file=gl-codequality.json",
"lint:yaml": "node ./node_modules/eslint/bin/eslint.js --ext .yml .",
"test:nightwatch": "node -r dotenv-safe/config ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js",
"prettier": "prettier --write \"./**/*.css\" \"./**/*.js\"",
@@ -58,6 +58,7 @@
"@ckeditor/ckeditor5-table": "~43.3.1",
"@drupal/once": "^1.0.1",
"@floating-ui/dom": "^1.6.8",
+ "@gitlab-formatters/stylelint-formatter-gitlab": "^1.0.2",
"backbone": "^1.6.0",
"chokidar": "^3.6.0",
"ckeditor5": "~43.3.1",
@@ -93,7 +94,6 @@
"stylelint": "^15.11.0",
"stylelint-checkstyle-formatter": "^0.1.2",
"stylelint-config-standard": "^34.0.0",
- "stylelint-formatter-gitlab": "^1.0.2",
"stylelint-order": "^6.0.4",
"stylelint-prettier": "^4.1.0",
"tabbable": "^6.2.0",
diff --git a/core/yarn.lock b/core/yarn.lock
index b8b9b3dfbf88..9ba111c15402 100644
--- a/core/yarn.lock
+++ b/core/yarn.lock
@@ -1872,6 +1872,15 @@ __metadata:
languageName: node
linkType: hard
+"@gitlab-formatters/stylelint-formatter-gitlab@npm:^1.0.2":
+ version: 1.0.2
+ resolution: "@gitlab-formatters/stylelint-formatter-gitlab@npm:1.0.2"
+ peerDependencies:
+ stylelint: ">=14"
+ checksum: 10c0/c9a13612168ce0b587806f088b5749464d2ca5bfb64725360374c917d1cb78bfe1aef11005fb7c312aea8c9e1fbbe40e760b3ad5f6249a444f941c52574556b0
+ languageName: node
+ linkType: hard
+
"@humanwhocodes/config-array@npm:^0.11.14":
version: 0.11.14
resolution: "@humanwhocodes/config-array@npm:0.11.14"
@@ -2397,6 +2406,7 @@ __metadata:
"@ckeditor/ckeditor5-table": "npm:~43.3.1"
"@drupal/once": "npm:^1.0.1"
"@floating-ui/dom": "npm:^1.6.8"
+ "@gitlab-formatters/stylelint-formatter-gitlab": "npm:^1.0.2"
backbone: "npm:^1.6.0"
chokidar: "npm:^3.6.0"
ckeditor5: "npm:~43.3.1"
@@ -2432,7 +2442,6 @@ __metadata:
stylelint: "npm:^15.11.0"
stylelint-checkstyle-formatter: "npm:^0.1.2"
stylelint-config-standard: "npm:^34.0.0"
- stylelint-formatter-gitlab: "npm:^1.0.2"
stylelint-order: "npm:^6.0.4"
stylelint-prettier: "npm:^4.1.0"
tabbable: "npm:^6.2.0"
@@ -2659,15 +2668,6 @@ __metadata:
languageName: node
linkType: hard
-"argparse@npm:^1.0.7":
- version: 1.0.10
- resolution: "argparse@npm:1.0.10"
- dependencies:
- sprintf-js: "npm:~1.0.2"
- checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
- languageName: node
- linkType: hard
-
"argparse@npm:^2.0.1":
version: 2.0.1
resolution: "argparse@npm:2.0.1"
@@ -4514,7 +4514,7 @@ __metadata:
languageName: node
linkType: hard
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+"esprima@npm:^4.0.1":
version: 4.0.1
resolution: "esprima@npm:4.0.1"
bin:
@@ -4801,17 +4801,6 @@ __metadata:
languageName: node
linkType: hard
-"fs-extra@npm:^8.1.0":
- version: 8.1.0
- resolution: "fs-extra@npm:8.1.0"
- dependencies:
- graceful-fs: "npm:^4.2.0"
- jsonfile: "npm:^4.0.0"
- universalify: "npm:^0.1.0"
- checksum: 10c0/259f7b814d9e50d686899550c4f9ded85c46c643f7fe19be69504888e007fcbc08f306fae8ec495b8b998635e997c9e3e175ff2eeed230524ef1c1684cc96423
- languageName: node
- linkType: hard
-
"fs-minipass@npm:^2.0.0":
version: 2.1.0
resolution: "fs-minipass@npm:2.1.0"
@@ -5105,7 +5094,7 @@ __metadata:
languageName: node
linkType: hard
-"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
+"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
version: 4.2.11
resolution: "graceful-fs@npm:4.2.11"
checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
@@ -5879,18 +5868,6 @@ __metadata:
languageName: node
linkType: hard
-"js-yaml@npm:^3.13.1":
- version: 3.14.1
- resolution: "js-yaml@npm:3.14.1"
- dependencies:
- argparse: "npm:^1.0.7"
- esprima: "npm:^4.0.0"
- bin:
- js-yaml: bin/js-yaml.js
- checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
- languageName: node
- linkType: hard
-
"jsbn@npm:1.1.0":
version: 1.1.0
resolution: "jsbn@npm:1.1.0"
@@ -5978,18 +5955,6 @@ __metadata:
languageName: node
linkType: hard
-"jsonfile@npm:^4.0.0":
- version: 4.0.0
- resolution: "jsonfile@npm:4.0.0"
- dependencies:
- graceful-fs: "npm:^4.1.6"
- dependenciesMeta:
- graceful-fs:
- optional: true
- checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480
- languageName: node
- linkType: hard
-
"jszip@npm:^3.10.1":
version: 3.10.1
resolution: "jszip@npm:3.10.1"
@@ -8353,13 +8318,6 @@ __metadata:
languageName: node
linkType: hard
-"sprintf-js@npm:~1.0.2":
- version: 1.0.3
- resolution: "sprintf-js@npm:1.0.3"
- checksum: 10c0/ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb
- languageName: node
- linkType: hard
-
"ssri@npm:^10.0.0":
version: 10.0.5
resolution: "ssri@npm:10.0.5"
@@ -8537,19 +8495,6 @@ __metadata:
languageName: node
linkType: hard
-"stylelint-formatter-gitlab@npm:^1.0.2":
- version: 1.0.2
- resolution: "stylelint-formatter-gitlab@npm:1.0.2"
- dependencies:
- fs-extra: "npm:^8.1.0"
- is-glob: "npm:^4.0.1"
- js-yaml: "npm:^3.13.1"
- peerDependencies:
- stylelint: ">=9"
- checksum: 10c0/fcfc5c83ca39b23300a746c9a7e2327893955670bbb51636becd40b8a58d78ff38abf771ba6464ef79d859663e61deb8e6b9039eb5acae4565c13d1dec84f0d9
- languageName: node
- linkType: hard
-
"stylelint-order@npm:^6.0.4":
version: 6.0.4
resolution: "stylelint-order@npm:6.0.4"
@@ -9036,13 +8981,6 @@ __metadata:
languageName: node
linkType: hard
-"universalify@npm:^0.1.0":
- version: 0.1.2
- resolution: "universalify@npm:0.1.2"
- checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045
- languageName: node
- linkType: hard
-
"universalify@npm:^0.2.0":
version: 0.2.0
resolution: "universalify@npm:0.2.0"
--
GitLab