From 86a185b69dd1c232cc30bee6481fb3285c1ff18d Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Fri, 9 May 2025 22:55:47 +0200 Subject: [PATCH] [linter] Switch Stylelint config to flat format and simplify Stylelint scripts --- .github/CONTRIBUTING.md | 2 +- .stylelintrc.json | 7 ------- package.json | 4 ++-- stylelint.config.mjs | 7 +++++++ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .stylelintrc.json create mode 100644 stylelint.config.mjs diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c90238a6..37d01ccc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,7 +18,7 @@ To run ESLint, use `node --run lint:js`. ### CSS: Run StyleLint -We use [StyleLint](https://stylelint.io) to lint our CSS. The configuration is in our `.stylelintrc.json` file. +We use [StyleLint](https://stylelint.io) to lint our CSS. The configuration is in our `stylelint.config.mjs` file. To run StyleLint, use `node --run lint:css`. diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index 18ff23e7..00000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": ["stylelint-config-standard"], - "plugins": ["stylelint-prettier"], - "rules": { - "prettier/prettier": true - } -} diff --git a/package.json b/package.json index d224f400..5fcb77d2 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev", "install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier", "install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", - "lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json --fix", + "lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --fix", "lint:js": "eslint --fix", "lint:markdown": "markdownlint-cli2 . --fix", "lint:prettier": "prettier . --write", @@ -47,7 +47,7 @@ "test": "NODE_ENV=test jest -i --forceExit", "test:calendar": "node ./modules/default/calendar/debug.js", "test:coverage": "NODE_ENV=test jest --coverage -i --verbose false --forceExit", - "test:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json", + "test:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css'", "test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit", "test:electron": "NODE_ENV=test jest --selectProjects electron -i --forceExit", "test:js": "eslint", diff --git a/stylelint.config.mjs b/stylelint.config.mjs new file mode 100644 index 00000000..5b1d8920 --- /dev/null +++ b/stylelint.config.mjs @@ -0,0 +1,7 @@ +const config = { + extends: ["stylelint-config-standard", "stylelint-prettier/recommended"], + root: true, + rules: {} +}; + +export default config;