Skip to content

Commit 1943297

Browse files
authored
Merge pull request #140 from solidjs-community/feature/eslint-v9
ESLint v9 backwards-compatible support
2 parents 4bc8e38 + 6dda5b1 commit 1943297

40 files changed

+1768
-1866
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@ dist
22
dist.*
33
./configs
44
node_modules
5-
jest.config.js
6-
jest.setup.js

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
node: ["16", "18", "20"]
15+
node: ["18", "20", "22"]
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Setup pnpm

docs/jsx-no-undef.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ let el = <div use:X />;
4444

4545
let el = <div use:X={{}} />;
4646

47-
let el = <div use:X />;
48-
4947
/* eslint solid/jsx-no-undef: ["error", { "allowGlobals": true }] */
5048
let el = <div use:X />;
5149

@@ -161,12 +159,6 @@ let X,
161159
let Component,
162160
X = <Component use:X />;
163161

164-
/* eslint solid/jsx-no-undef: ["error", { "allowGlobals": true }] */
165-
let el = <div use:X />;
166-
167-
/* eslint solid/jsx-no-undef: ["error", { "allowGlobals": true }] */
168-
let el = <div use:X />;
169-
170162
/* eslint solid/jsx-no-undef: ["error", { "typescriptEnabled": true }] */
171163
let el = <Component />;
172164

docs/reactivity.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,6 @@ const Component = () => {
318318
return <button type={signal}>Button</button>;
319319
};
320320

321-
const Component = () => {
322-
const [signal] = createSignal();
323-
return <div>{signal}</div>;
324-
};
325-
326321
const Component = () => {
327322
const [signal] = createSignal("world");
328323
const memo = createMemo(() => "hello " + signal);

jest.config.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

package.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"prepare": "husky install",
2222
"prepublishOnly": "pnpm build && pnpm lint && prettier --check src && pnpm test:all",
2323
"build": "tsc -p tsconfig.build.json && pnpm run docs",
24-
"lint": "eslint --ignore-pattern test/fixture/invalid .",
25-
"docs": "PARSER=none ts-node --transpile-only scripts/docs.ts",
26-
"test": "jest",
24+
"lint": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern test/fixture/invalid .",
25+
"docs": "PARSER=none tsx scripts/docs.ts",
26+
"test": "vitest",
2727
"test:ts": "PARSER=ts pnpm test",
2828
"test:babel": "PARSER=babel pnpm test",
2929
"test:v6": "PARSER=v6 pnpm test",
@@ -37,7 +37,7 @@
3737
"README.md"
3838
],
3939
"dependencies": {
40-
"@typescript-eslint/utils": "^6.21.0",
40+
"@typescript-eslint/utils": "^7.6.0",
4141
"estraverse": "^5.3.0",
4242
"is-html": "^2.0.0",
4343
"kebab-case": "^1.0.2",
@@ -48,29 +48,31 @@
4848
"@babel/core": "^7.24.4",
4949
"@babel/eslint-parser": "^7.24.1",
5050
"@tsconfig/node20": "^20.1.4",
51-
"@types/eslint": "^8.56.7",
51+
"@types/eslint-v6": "npm:@types/eslint@6",
52+
"@types/eslint-v7": "npm:@types/eslint@7",
53+
"@types/eslint-v8": "npm:@types/eslint@8",
5254
"@types/estraverse": "^5.1.7",
5355
"@types/is-html": "^2.0.2",
54-
"@types/jest": "^29.5.12",
5556
"@types/markdown-magic": "^1.0.4",
5657
"@types/node": "^16.18.94",
5758
"@types/prettier": "^2.7.3",
5859
"@typescript-eslint/eslint-plugin": "^6.21.0",
5960
"@typescript-eslint/parser": "^6.21.0",
60-
"eslint": "^8.57.0",
61+
"eslint": "^9.0.0",
6162
"eslint-plugin-eslint-plugin": "^5.5.0",
6263
"eslint-plugin-import": "^2.29.1",
6364
"eslint-plugin-solid": "link:",
64-
"eslint-v6": "npm:eslint@^6.8.0",
65-
"eslint-v7": "npm:eslint@^7.32.0",
65+
"eslint-v6": "npm:eslint@6",
66+
"eslint-v7": "npm:eslint@7",
67+
"eslint-v8": "npm:eslint@8",
6668
"husky": "^8.0.3",
67-
"jest": "^29.7.0",
6869
"lint-staged": "^13.3.0",
6970
"markdown-magic": "^2.6.1",
7071
"prettier": "^2.8.8",
71-
"ts-jest": "^29.1.2",
72-
"ts-node": "^10.9.2",
73-
"typescript": "^5.4.3"
72+
"tsx": "^4.7.3",
73+
"typescript": "^5.4.3",
74+
"typescript-eslint": "^7.7.1",
75+
"vitest": "^1.5.2"
7476
},
7577
"peerDependencies": {
7678
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"

0 commit comments

Comments
 (0)