Merge branch 'main' into v1.3

stylelint · Aug 16, 2023 · a610615 · a610615
2 parents 18ff07b + c82b1dd
commit a610615
Show file tree

Hide file tree

Showing 39 changed files with 1,022 additions and 498 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         language: ['javascript']
-        node-version: [14.x]
+        node-version: [18]
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [14.x]
+        node-version: [18]
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -14,13 +14,21 @@ env:
 
 jobs:
   test:
-    name: Test on Node.js ${{ matrix.node-version }} and ${{ matrix.os }}
+    name: Test for Stylelint ${{ matrix.stylelint }} on Node.js ${{ matrix.node-version }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        node-version: [14]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [18]
+        os: [ubuntu-latest, macos-latest]
+        stylelint: [14, 15]
+        include:
+          - stylelint: 15
+            node-version: 14 # For some reason jest-runner-vscode doesn't work well with Node v18 and Windows.
+            os: windows-latest
+          - stylelint: 14
+            node-version: 14 # For some reason jest-runner-vscode doesn't work well with Node v18 and Windows.
+            os: windows-latest
     steps:
       - uses: actions/checkout@v2
 
@@ -51,6 +59,14 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Install stylelint v15
+        run: npm i -D stylelint@^15
+        if: matrix.stylelint == 15
+
+      - name: Install stylelint v14
+        run: npm i -D stylelint@^14 stylelint-scss@^4.3.0
+        if: matrix.stylelint == 14
+
       - name: Cache VS Code binaries
         uses: actions/cache@v2
         id: vscode-cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Files are now re-linted when a Stylelint configuration file is changed in the workspace ([#356](https://github.com/stylelint/vscode-stylelint/pull/356)).
 
+## [1.2.4](https://github.com/stylelint/vscode-stylelint/compare/v1.2.3...v1.2.4) (2023-02-14)
+
+### Added
+
+- Add "stylelint.reportDescriptionlessDisables" option ([#442](https://github.com/stylelint/vscode-stylelint/pull/442)).
+
 ## [1.2.3](https://github.com/stylelint/vscode-stylelint/compare/v1.2.2...v1.2.3) (2022-08-16)
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -168,6 +168,13 @@ e.g.
   "stylelint.customSyntax": "${workspaceFolder}/custom-syntax.js"
 ```
 
+### `stylelint.reportDescriptionlessDisables`
+
+> Type: `boolean`  
+> Default: `false`
+
+Sets the Stylelint [`reportDescriptionlessDisables`] option. If `true`, Stylelint reports `stylelint-disable` comments without a description.
+
 ### `stylelint.ignoreDisables`
 
 > Type: `boolean`  
@@ -278,6 +285,26 @@ And on Windows by running:
 cmd /C "set NODE_ENV=development&&code"
 ```
 
+## Contributors
+
+Stylelint is maintained by volunteers. Without the code contributions from [all these fantastic people](https://github.com/stylelint/vscode-stylelint/graphs/contributors), Stylelint would not exist. [Become a contributor](https://github.com/stylelint/vscode-stylelint/contribute).
+
+### Sponsors
+
+<object data="https://opencollective.com/stylelint/sponsors.svg?width=420&button=false" type="image/svg+xml">
+  <img src="https://opencollective.com/stylelint/sponsors.svg?width=840&button=false" />
+</object>
+
+Thank you to all our sponsors! [Become a sponsor](https://opencollective.com/stylelint).
+
+### Backers
+
+<object data="https://opencollective.com/stylelint/backers.svg?width=420&avatarHeight=48&button=false" type="image/svg+xml">
+  <img src="https://opencollective.com/stylelint/backers.svg?width=840&avatarHeight=48&button=false" />
+</object>
+
+Thank you to all our backers! [Become a backer](https://opencollective.com/stylelint).
+
 ## Licence
 
 [MIT](LICENSE)
@@ -299,12 +326,13 @@ cmd /C "set NODE_ENV=development&&code"
 
 [stylelint]: https://stylelint.io/
 [stylelint getting started guide]: https://stylelint.io/user-guide/get-started
-[stylelint configuration file]: https://stylelint.io/user-guide/configuration
+[stylelint configuration file]: https://stylelint.io/user-guide/configure
 [stylelint 14 migration guide]: https://github.com/stylelint/stylelint/blob/main/docs/migration-guide/to-14.md
 [`customsyntax`]: https://stylelint.io/user-guide/usage/options/#customsyntax
 [`config`]: https://stylelint.io/user-guide/usage/node-api#config
 [`configfile`]: https://stylelint.io/user-guide/usage/options#configfile
 [`configbasedir`]: https://stylelint.io/user-guide/usage/options#configbasedir
+[`reportdescriptionlessdisables`]: https://stylelint.io/user-guide/usage/options#reportdescriptionlessdisables
 [`ignoredisables`]: https://stylelint.io/user-guide/usage/options#ignoredisables
 [`reportneedlessdisables`]: https://stylelint.io/user-guide/usage/options#reportneedlessdisables
 [`reportinvalidscopedisables`]: https://stylelint.io/user-guide/usage/options#reportInvalidScopeDisables