Verified Commit 4079ec4a authored by Dave Long's avatar Dave Long
Browse files

Issue #3467309 by spokje, smustgrave: Replace abandoned, not working with... 

Issue #3467309 by spokje, smustgrave: Replace abandoned, not working with latest stylelint, leon0399/stylelint-formatter-gitlab with gitlab-formatters/stylelint-formatter-gitlab

(cherry picked from commit 07aa9ecb)
parent 568ce2c6

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -435,10 +435,10 @@ default: 
    - cd core

    - yarn install

    - yarn run build:css --check

    - yarn run lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab

    - yarn run lint:css --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 ]

core/package.json

+2 −2
Original line number Diff line number Diff line
@@ -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\"",
@@ -57,6 +57,7 @@ 
    "@ckeditor/ckeditor5-style": "~43.3.1",

    "@ckeditor/ckeditor5-table": "~43.3.1",

    "@drupal/once": "1.0.x",

    "@gitlab-formatters/stylelint-formatter-gitlab": "^1.0.2",

    "@floating-ui/dom": "^1.6.3",

    "backbone": "^1.5.0",

    "chokidar": "^3.3.1",
@@ -94,7 +95,6 @@ 
    "stylelint": "^15.10.1",

    "stylelint-checkstyle-formatter": "^0.1.2",

    "stylelint-config-standard": "^34.0.0",

    "stylelint-formatter-gitlab": "^1.0.2",

    "stylelint-order": "^6.0.3",

    "stylelint-prettier": "^4.1.0",

    "tabbable": "^6.1.2",

core/yarn.lock

+6 −51
Original line number Diff line number Diff line
@@ -1408,6 +1408,11 @@ 
  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"

  integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==



"@gitlab-formatters/stylelint-formatter-gitlab@^1.0.2":

  version "1.0.2"

  resolved "https://registry.yarnpkg.com/@gitlab-formatters/stylelint-formatter-gitlab/-/stylelint-formatter-gitlab-1.0.2.tgz#f8e19ab170caa33f440175141135bf64cb010956"

  integrity sha512-pzrRWC4ZpydkyeGIdt0YqrODFsmuXb73O4Uad5N8hMY3oUwl/BERBuHD1pKZlg4p0Ws70QAogqp/c1lNqeyTKQ==



"@humanwhocodes/config-array@^0.11.14":

  version "0.11.14"

  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
@@ -1817,13 +1822,6 @@ anymatch@~3.1.2: 
    normalize-path "^3.0.0"

    picomatch "^2.0.4"



argparse@^1.0.7:

  version "1.0.10"

  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"

  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==

  dependencies:

    sprintf-js "~1.0.2"



argparse@^2.0.1:

  version "2.0.1"

  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -3132,7 +3130,7 @@ espree@^9.6.0, espree@^9.6.1: 
    acorn-jsx "^5.3.2"

    eslint-visitor-keys "^3.4.1"



esprima@^4.0.0, esprima@^4.0.1:

esprima@^4.0.1:

  version "4.0.1"

  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"

  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -3345,15 +3343,6 @@ fs-extra@^10.1.0: 
    jsonfile "^6.0.1"

    universalify "^2.0.0"



fs-extra@^8.1.0:

  version "8.1.0"

  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"

  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==

  dependencies:

    graceful-fs "^4.2.0"

    jsonfile "^4.0.0"

    universalify "^0.1.0"



fs.realpath@^1.0.0:

  version "1.0.0"

  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -4014,14 +4003,6 @@ js-yaml@4.1.0, js-yaml@^4.1.0: 
  dependencies:

    argparse "^2.0.1"



js-yaml@^3.13.1:

  version "3.14.1"

  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"

  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==

  dependencies:

    argparse "^1.0.7"

    esprima "^4.0.0"



jsdom@^24.0.0:

  version "24.0.0"

  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.0.0.tgz#e2dc04e4c79da368481659818ee2b0cd7c39007c"
@@ -4081,13 +4062,6 @@ json5@^1.0.2: 
  dependencies:

    minimist "^1.2.0"



jsonfile@^4.0.0:

  version "4.0.0"

  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"

  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==

  optionalDependencies:

    graceful-fs "^4.1.6"



jsonfile@^6.0.1:

  version "6.1.0"

  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -5639,11 +5613,6 @@ spdx-license-ids@^3.0.0: 
  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"

  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==



sprintf-js@~1.0.2:

  version "1.0.3"

  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"

  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==



stacktrace-parser@0.1.10:

  version "0.1.10"

  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a"
@@ -5750,15 +5719,6 @@ stylelint-config-standard@^34.0.0: 
  dependencies:

    stylelint-config-recommended "^13.0.0"



stylelint-formatter-gitlab@^1.0.2:

  version "1.0.2"

  resolved "https://registry.yarnpkg.com/stylelint-formatter-gitlab/-/stylelint-formatter-gitlab-1.0.2.tgz#56d3f68c1b3169ecddcdf039910b678bfd97ccd5"

  integrity sha512-Iu5NjHSp/WdhUeICuUKNi6QvpEut5KPwnrx4XU5q1GZEcAvpyqbjBq7yMAEX6850BUza45ARpsfX4yfOcnFWLQ==

  dependencies:

    fs-extra "^8.1.0"

    is-glob "^4.0.1"

    js-yaml "^3.13.1"



stylelint-order@^6.0.3:

  version "6.0.4"

  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-6.0.4.tgz#3e80d876c61a98d2640de181433686f24284748b"
@@ -6101,11 +6061,6 @@ undici-types@~6.19.8: 
  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"

  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==



universalify@^0.1.0:

  version "0.1.2"

  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"

  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==



universalify@^0.2.0:

  version "0.2.0"

  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"