Skip to content

Commit 71cdfb8

Browse files
authored
Merge pull request #943 from polkadot-fellows/nik-fix-tailwind-to-v4
2 parents bef2d8e + f0f67df commit 71cdfb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1346
-1246
lines changed

.eslintrc.cjs

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

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
auto-merge:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- uses: ahmadnassri/action-dependabot-auto-merge@v2
1515
with:
1616
target: minor

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- uses: pnpm/action-setup@v4
1313
- uses: actions/setup-node@v6
1414
with:

.github/workflows/gh-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
gh-deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- uses: pnpm/action-setup@v4
1313
- uses: actions/setup-node@v6
1414
with:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- uses: pnpm/action-setup@v4
1313
- uses: actions/setup-node@v6
1414
with:

.papi/descriptors/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
*
22
!.gitignore
3-
!package.json
3+
!package.json

eslint.config.mjs

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import js from '@eslint/js'
2+
import tsPlugin from '@typescript-eslint/eslint-plugin'
3+
import tsParser from '@typescript-eslint/parser'
4+
import eslintConfigPrettier from 'eslint-config-prettier'
5+
import reactHooks from 'eslint-plugin-react-hooks'
6+
import reactRefresh from 'eslint-plugin-react-refresh'
7+
8+
export default [
9+
{
10+
ignores: ['dist', 'build', '.papi/**'],
11+
},
12+
js.configs.recommended,
13+
{
14+
files: ['**/*.{ts,tsx}'],
15+
languageOptions: {
16+
parser: tsParser,
17+
parserOptions: {
18+
ecmaVersion: 'latest',
19+
sourceType: 'module',
20+
ecmaFeatures: {
21+
jsx: true,
22+
},
23+
},
24+
},
25+
plugins: {
26+
'@typescript-eslint': tsPlugin,
27+
},
28+
rules: {
29+
...tsPlugin.configs.recommended.rules,
30+
'@typescript-eslint/no-explicit-any': 'off',
31+
'@typescript-eslint/no-empty-object-type': 'off',
32+
'no-undef': 'off',
33+
},
34+
},
35+
eslintConfigPrettier,
36+
{
37+
files: ['**/*.{ts,tsx,js,jsx}'],
38+
languageOptions: {
39+
ecmaVersion: 'latest',
40+
sourceType: 'module',
41+
parserOptions: {
42+
ecmaFeatures: {
43+
jsx: true,
44+
},
45+
},
46+
},
47+
plugins: {
48+
'react-hooks': reactHooks,
49+
'react-refresh': reactRefresh,
50+
},
51+
rules: {
52+
'react-hooks/rules-of-hooks': 'error',
53+
'react-hooks/exhaustive-deps': [
54+
'warn',
55+
{
56+
additionalHooks: '(useTheme)',
57+
},
58+
],
59+
'react-refresh/only-export-components': [
60+
'warn',
61+
{ allowConstantExport: true },
62+
],
63+
},
64+
},
65+
]

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "fellowship-dashboard",
33
"private": true,
44
"version": "0.0.2",
5-
"packageManager": "[email protected]+sha512.664074abc367d2c9324fdc18037097ce0a8f126034160f709928e9e9f95d98714347044e5c3164d65bd5da6c59c6be362b107546292a8eecb7999196e5ce58fa",
5+
"packageManager": "[email protected]",
66
"type": "module",
77
"scripts": {
88
"preinstall": "npx only-allow pnpm",
@@ -12,9 +12,11 @@
1212
"deploy": "gh-pages -d build",
1313
"build:pages": "tsc && vite build --base '/dashboard/'",
1414
"deploy:pages": "pnpm run build:pages && gh-pages -d build",
15-
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
16-
"preview": "vite preview",
17-
"format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css}\""
15+
"lint": "pnpm run lint:prettier && pnpm run lint:eslint",
16+
"lint:eslint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
17+
"lint:prettier": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
18+
"lint:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
19+
"preview": "vite preview"
1820
},
1921
"dependencies": {
2022
"@polkadot-api/descriptors": "file:.papi/descriptors",
@@ -54,24 +56,25 @@
5456
"vaul": "^1.1.2"
5557
},
5658
"devDependencies": {
59+
"@eslint/js": "^9.39.2",
60+
"@tailwindcss/vite": "^4.1.18",
5761
"@types/node": "^25.0.3",
5862
"@types/react": "^19.2.7",
5963
"@types/react-dom": "^19.2.3",
6064
"@types/react-router-dom": "^5.3.3",
61-
"@typescript-eslint/eslint-plugin": "^7.18.0",
62-
"@typescript-eslint/parser": "^7.18.0",
65+
"@typescript-eslint/eslint-plugin": "^8.50.1",
66+
"@typescript-eslint/parser": "^8.50.1",
6367
"@vitejs/plugin-react": "^5.1.2",
64-
"autoprefixer": "^10.4.23",
65-
"eslint": "^8.57.1",
68+
"eslint": "^9.39.2",
6669
"eslint-config-prettier": "^10.1.8",
67-
"eslint-plugin-react-hooks": "^5.2.0",
70+
"eslint-plugin-react-hooks": "^7.0.1",
6871
"eslint-plugin-react-refresh": "^0.4.26",
6972
"gh-pages": "^6.3.0",
7073
"install": "0.13.0",
7174
"postcss": "^8.5.6",
7275
"prettier": "3.7.4",
7376
"prettier-plugin-tailwindcss": "^0.7.2",
74-
"tailwindcss": "^3.4.19",
77+
"tailwindcss": "^4.1.18",
7578
"typescript": "^5.9.3",
7679
"vite": "^7.3.0",
7780
"vite-plugin-svgr": "^4.5.0"

0 commit comments

Comments
 (0)