Skip to content

Commit c3e7464

Browse files
committed
Merge branch 'master' into prettier
* master: feat: support eslint flat config (qunitjs#443) upgrade: Bump @typescript-eslint/parser from 6.7.5 to 6.21.0 (qunitjs#465) upgrade: Bump typescript from 5.2.2 to 5.3.3 (qunitjs#439) upgrade: Bump eslint-plugin-unicorn from 49.0.0 to 51.0.1 (qunitjs#464) upgrade: Bump eslint-plugin-eslint-plugin from 5.1.1 to 5.3.0 (qunitjs#463) upgrade: Bump globals from 13.23.0 to 14.0.0 (qunitjs#462) upgrade: Bump eslint from 8.55.0 to 8.56.0 (qunitjs#450) upgrade: Bump @eslint/js from 8.55.0 to 8.56.0 (qunitjs#449) upgrade: Bump markdownlint-cli from 0.37.0 to 0.39.0 (qunitjs#459) upgrade: Bump github/codeql-action from 2 to 3 (qunitjs#447) upgrade: Bump eslint-doc-generator from 1.5.2 to 1.6.2 (qunitjs#455) upgrade: Bump release-it from 16.2.1 to 16.3.0 (qunitjs#437) ci: Use parallel coveralls config (qunitjs#461)
2 parents 927faff + 87890a3 commit c3e7464

File tree

8 files changed

+318
-161
lines changed

8 files changed

+318
-161
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ jobs:
3030
- run: npm run test:unit
3131

3232
- name: Coveralls
33-
uses: coverallsapp/github-action@master
33+
uses: coverallsapp/github-action@v1
3434
with:
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
3636
path-to-lcov: ./build/coverage/lcov.info
37+
parallel: true
3738

3839
lint:
3940
runs-on: ubuntu-latest
@@ -44,3 +45,12 @@ jobs:
4445
node-version: "20.x"
4546
- run: npm ci
4647
- run: npm run lint
48+
49+
finish-coveralls:
50+
needs: build
51+
runs-on: ubuntu-latest
52+
steps:
53+
- name: Close parallel build
54+
uses: coverallsapp/github-action@v1
55+
with:
56+
parallel-finished: true

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
59+
uses: github/codeql-action/autobuild@v3
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,6 +69,6 @@ jobs:
6969
# ./location_of_script_within_repo/buildscript.sh
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
72+
uses: github/codeql-action/analyze@v3
7373
with:
7474
category: "/language:${{matrix.language}}"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ For more details on how to extend your configuration from a plugin configuration
1515

1616
<!-- begin auto-generated configs list -->
1717

18-
| | Name | Description |
19-
| :- | :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
20-
|| `recommended` | This configuration includes rules which I recommend to avoid QUnit runtime errors or incorrect behavior, some of which can be difficult to debug. Some of these rules also encourage best practices that help QUnit work better for you. You can use this configuration by extending from `"plugin:qunit/recommended"` in your configuration file. |
18+
| | Name | Description |
19+
| :- | :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
20+
|| `recommended` | This configuration includes rules which I recommend to avoid QUnit runtime errors or incorrect behavior, some of which can be difficult to debug. Some of these rules also encourage best practices that help QUnit work better for you. For ESLint `.eslintrc.js` legacy config, extend from `"plugin:qunit/recommended"`. For ESLint `eslint.config.js` flat config, load from `require('eslint-plugin-qunit/configs/recommended')`. |
2121

2222
<!-- end auto-generated configs list -->
2323

index.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,24 @@
88
"use strict";
99

1010
const requireIndex = require("requireindex");
11+
const pkg = require("./package.json");
1112

1213
module.exports = {
14+
meta: {
15+
name: pkg.name,
16+
version: pkg.version,
17+
},
18+
1319
rules: requireIndex(`${__dirname}/lib/rules`),
1420

1521
// eslint-disable-next-line sort-keys
1622
configs: {
1723
recommended: {
18-
description:
19-
'This configuration includes rules which I recommend to avoid QUnit runtime errors or incorrect behavior, some of which can be difficult to debug. Some of these rules also encourage best practices that help QUnit work better for you. You can use this configuration by extending from `"plugin:qunit/recommended"` in your configuration file.',
24+
description: [
25+
"This configuration includes rules which I recommend to avoid QUnit runtime errors or incorrect behavior, some of which can be difficult to debug. Some of these rules also encourage best practices that help QUnit work better for you.",
26+
'For ESLint `.eslintrc.js` legacy config, extend from `"plugin:qunit/recommended"`.',
27+
"For ESLint `eslint.config.js` flat config, load from `require('eslint-plugin-qunit/configs/recommended')`.",
28+
].join(" "),
2029
plugins: ["qunit"],
2130
rules: {
2231
"qunit/assert-args": "error",

lib/configs/recommended.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"use strict";
2+
3+
const plugin = require("../../index.js");
4+
5+
module.exports = {
6+
plugins: { qunit: plugin },
7+
rules: plugin.configs.recommended.rules,
8+
};

0 commit comments

Comments
 (0)