Skip to content

Commit 29984f8

Browse files
authored
Merge pull request #55 from gregberge/upgrade-deps
Mixed
2 parents f5abd29 + 0cbafae commit 29984f8

File tree

13 files changed

+6287
-4982
lines changed

13 files changed

+6287
-4982
lines changed

.eslintignore

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

.eslintrc.json

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

.github/composite-actions/install/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ runs:
55
using: composite
66
steps:
77
- uses: pnpm/action-setup@v4
8-
with:
9-
version: 9
108

119
- name: Setup Node.js
1210
uses: actions/setup-node@v3
1311
with:
14-
node-version: 18.x
12+
node-version: 22.x
1513
registry-url: "https://registry.npmjs.org"
1614
cache: "pnpm"
1715

.github/workflows/quality.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Install
2424
uses: ./.github/composite-actions/install
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Install
3737
uses: ./.github/composite-actions/install
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

4949
- name: Install
5050
uses: ./.github/composite-actions/install
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v3
60+
uses: actions/checkout@v4
6161

6262
- name: Install
6363
uses: ./.github/composite-actions/install

eslint.config.mjs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import eslint from "@eslint/js";
2+
import vitest from "@vitest/eslint-plugin";
3+
import tseslint from "typescript-eslint";
4+
5+
const config = tseslint.config(
6+
{
7+
name: "twc/global-ignores",
8+
ignores: ["**/website", "**/dist"],
9+
},
10+
eslint.configs.recommended,
11+
...tseslint.configs.recommended,
12+
{
13+
name: "twc/custom-ts-rules",
14+
rules: {
15+
curly: "error",
16+
"@typescript-eslint/no-explicit-any": "off",
17+
"@typescript-eslint/no-unsafe-function-type": "off",
18+
"@typescript-eslint/no-unused-vars": [
19+
"error",
20+
{
21+
varsIgnorePattern: "^_",
22+
},
23+
],
24+
},
25+
},
26+
{
27+
name: "twc/vitest",
28+
files: ["**/*.test.?(m)js"],
29+
plugins: {
30+
vitest,
31+
},
32+
rules: {
33+
...vitest.configs.recommended.rules,
34+
},
35+
},
36+
);
37+
38+
export default config;

package.json

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"exports": {
77
".": {
88
"types": "./dist/index.d.ts",
9-
"import": "./dist/index.mjs",
10-
"default": "./dist/index.mjs"
9+
"import": "./dist/index.js",
10+
"default": "./dist/index.js"
1111
}
1212
},
1313
"types": "./dist/index.d.ts",
1414
"scripts": {
1515
"test": "vitest",
16-
"build": "rm -rf dist && rollup -c",
16+
"build": "rm -rf dist && tsup",
1717
"format": "prettier --write .",
1818
"check-format": "prettier --check src",
1919
"lint": "eslint .",
@@ -42,35 +42,39 @@
4242
},
4343
"devDependencies": {
4444
"@ampproject/filesize": "^4.3.0",
45-
"@radix-ui/react-accordion": "^1.1.2",
46-
"@swc/core": "^1.3.103",
47-
"@testing-library/react": "^14.1.2",
48-
"@types/react": "^18.2.48",
49-
"@typescript-eslint/eslint-plugin": "^6.19.0",
50-
"@typescript-eslint/parser": "^6.19.0",
51-
"@vitejs/plugin-react": "^4.2.1",
52-
"class-variance-authority": "^0.7.0",
45+
"@eslint/eslintrc": "^3.3.1",
46+
"@eslint/js": "^9.30.0",
47+
"@radix-ui/react-accordion": "^1.2.11",
48+
"@swc/core": "^1.12.7",
49+
"@testing-library/react": "^16.3.0",
50+
"@types/react": "^19.1.8",
51+
"@typescript-eslint/eslint-plugin": "^8.35.0",
52+
"@typescript-eslint/parser": "^8.35.0",
53+
"@vitejs/plugin-react": "^4.6.0",
54+
"@vitest/eslint-plugin": "^1.3.3",
55+
"class-variance-authority": "^0.7.1",
5356
"conventional-github-releaser": "^3.1.5",
54-
"eslint": "^8.56.0",
55-
"happy-dom": "^13.1.4",
56-
"prettier": "^3.2.2",
57-
"react": "^18.2.0",
58-
"react-aria-components": "^1.0.1",
59-
"rollup": "^4.9.5",
60-
"rollup-plugin-swc3": "^0.11.0",
61-
"rollup-plugin-ts": "^3.4.5",
57+
"eslint": "^9.30.0",
58+
"happy-dom": "^18.0.1",
59+
"prettier": "^3.6.2",
60+
"react": "^19.1.0",
61+
"react-aria-components": "^1.10.1",
62+
"react-dom": "^19.1.0",
6263
"standard-version": "^9.5.0",
63-
"tailwind-merge": "^2.2.0",
64-
"typescript": "^5.3.3",
65-
"vitest": "^1.2.0"
64+
"tailwind-merge": "^3.3.1",
65+
"tsup": "^8.5.0",
66+
"typescript": "^5.8.3",
67+
"typescript-eslint": "^8.35.0",
68+
"vitest": "^3.2.4"
6669
},
6770
"dependencies": {
68-
"@radix-ui/react-slot": "^1.0.2",
69-
"clsx": "^2.1.0"
71+
"@radix-ui/react-slot": "^1.2.3",
72+
"clsx": "^2.1.1"
7073
},
7174
"filesize": {
7275
"track": [
7376
"./dist/**/*.mjs"
7477
]
75-
}
78+
},
79+
"packageManager": "[email protected]+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
7680
}

0 commit comments

Comments
 (0)