Skip to content

Commit

Permalink
Merge branch 'main' into ci/simplify-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ybiquitous committed Oct 31, 2023
2 parents 90c979e + a4e368b commit ec64625
Show file tree
Hide file tree
Showing 39 changed files with 1,009 additions and 530 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@ updates:
update-types: [version-update:semver-major]
- dependency-name: '@types/vscode'
update-types: [version-update:semver-minor]
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: monthly
labels:
- 'Dependencies'
- 'For Uncommitted Issue'
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
language: ['javascript']
node-version: [14.x]
node-version: [18]

steps:
- name: Checkout repository
Expand All @@ -46,7 +46,7 @@ jobs:
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm cache
uses: actions/cache@v2
uses: actions/cache@v3
id: npm-cache
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
Expand All @@ -61,9 +61,9 @@ jobs:
run: npm ci

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
26 changes: 21 additions & 5 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -35,7 +43,7 @@ jobs:
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm cache
uses: actions/cache@v2
uses: actions/cache@v3
id: npm-cache
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
Expand All @@ -51,8 +59,16 @@ 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
uses: actions/cache@v3
id: vscode-cache
with:
path: .vscode-test
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [1.2.4](https://github.com/stylelint/vscode-stylelint/compare/v1.2.3...v1.3.0) (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
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -325,6 +332,7 @@ Thank you to all our backers! [Become a backer](https://opencollective.com/style
[`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
Expand Down
Loading

0 comments on commit ec64625

Please sign in to comment.