Skip to content

Commit 65ef7a3

Browse files
committed
Merge branch 'svelte-5'
# Conflicts: # src/lib/history/HistoryRecords.svelte # src/routes/+page.svelte
2 parents 48aa654 + 908d229 commit 65ef7a3

198 files changed

Lines changed: 10232 additions & 7835 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ vite.config.ts.timestamp-*
1212
/static/time-extracting
1313
/time-extracting
1414
/eng.traineddata
15-
.mf
15+
.mf
16+
/tmp

.idea/wheniswan.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
engine-strict=true
2-
use-node-version=21.7.3
2+
use-node-version=24.13.0

.prettierrc

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
{
2-
"useTabs": true,
3-
"singleQuote": true,
2+
"useTabs": false,
3+
"tabWidth": 4,
4+
"singleQuote": false,
45
"trailingComma": "none",
56
"printWidth": 100,
67
"plugins": ["prettier-plugin-svelte"],
78
"pluginSearchDirs": ["."],
8-
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
9-
}
9+
"overrides": [
10+
{
11+
"files": "*.svelte",
12+
"options": {
13+
"parser": "svelte",
14+
"useTabs": true
15+
}
16+
}
17+
]
18+
}

.vscode/settings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"bgDark",
1313
"bgDrawer",
1414
"bgLight",
15-
"blur",
15+
"blur-sm",
1616
"border",
1717
"button",
1818
"buttonAction",
@@ -75,10 +75,10 @@
7575
"regionRowHeadline",
7676
"regionRowMain",
7777
"regionTrail",
78-
"ring",
79-
"rounded",
78+
"ring-3",
79+
"rounded-sm",
8080
"select",
81-
"shadow",
81+
"shadow-sm",
8282
"slotDefault",
8383
"slotFooter",
8484
"slotHeader",

package.json

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,66 +19,71 @@
1919
"@block65/webcrypto-web-push": "^0.3.2",
2020
"@cloudflare/workers-types": "^4.20250410.0",
2121
"@colour-extractor/colour-extractor": "^1.0.1",
22-
"@playwright/test": "^1.28.1",
23-
"@skeletonlabs/skeleton": "^1.2.5",
22+
"@playwright/test": "^1.58.2",
23+
"@skeletonlabs/skeleton": "^4.15.2",
24+
"@skeletonlabs/skeleton-svelte": "^4.15.2",
2425
"@sveltejs/adapter-auto": "^2.0.0",
2526
"@sveltejs/adapter-cloudflare": "^2.3.4",
26-
"@sveltejs/enhanced-img": "^0.3.10",
27-
"@sveltejs/kit": "^2.9.0",
28-
"@sveltejs/vite-plugin-svelte": "^3.1.1",
27+
"@sveltejs/enhanced-img": "^0.10.4",
28+
"@sveltejs/kit": "^2.61.1",
29+
"@sveltejs/vite-plugin-svelte": "^7.0.0",
2930
"@tailwindcss/forms": "^0.5.3",
3031
"@tailwindcss/typography": "^0.5.9",
3132
"@types/bcryptjs": "^2.4.6",
3233
"@types/diff": "^5.2.2",
3334
"@types/luxon": "^3.3.0",
3435
"@types/node": "^20.4.5",
36+
"@types/nprogress": "^0.2.3",
3537
"@types/qrcode": "^1.5.5",
3638
"@types/sanitize-html": "^2.9.5",
37-
"@typescript-eslint/eslint-plugin": "^5.45.0",
38-
"@typescript-eslint/parser": "^5.45.0",
39-
"autoprefixer": "^10.4.14",
39+
"@typescript-eslint/eslint-plugin": "^8.57.1",
40+
"@typescript-eslint/parser": "^8.57.1",
4041
"dotenv": "^16.3.1",
41-
"eslint": "^8.28.0",
42-
"eslint-config-prettier": "^8.5.0",
43-
"eslint-plugin-svelte3": "^4.0.0",
42+
"eslint": "^10.0.3",
43+
"eslint-config-prettier": "^10.1.8",
4444
"miniflare": "^4.20250408.0",
45-
"postcss": "^8.4.23",
46-
"prettier": "^2.8.0",
47-
"prettier-plugin-svelte": "^2.10.1",
45+
"prettier": "^3.8.1",
46+
"prettier-plugin-svelte": "^3.5.1",
4847
"sharp": "^0.32.6",
49-
"svelte": "^4.2.18",
50-
"svelte-bootstrap-icons": "^3.0.0",
51-
"svelte-check": "^3.4.3",
52-
"tailwindcss": "^3.3.2",
48+
"svelte": "^5.55.10",
49+
"svelte-bootstrap-icons": "^3.3.0",
50+
"svelte-check": "^4.0.0",
51+
"tailwindcss": "^4.1.18",
5352
"tesseract.js": "^4.1.2",
5453
"ts-node": "^10.9.1",
5554
"ts-twitch-api": "^0.2.1",
5655
"tslib": "^2.4.1",
57-
"typescript": "^5.2.2",
58-
"vite": "^4.3.9",
59-
"vitest": "^0.33.0"
56+
"tsx": "^4.21.0",
57+
"typescript": "^5.5.0",
58+
"vite": "^8.0.0",
59+
"vitest": "^4.1.0"
6060
},
6161
"type": "module",
6262
"dependencies": {
6363
"@dimfeld/svelte-lazyload": "^0.0.4",
6464
"@floating-ui/dom": "^1.2.7",
65+
"@tailwindcss/vite": "^4.2.1",
6566
"airport-data-js": "^1.0.6",
6667
"apexcharts": "^3.42.0",
6768
"bcryptjs": "^2.4.3",
6869
"blurhash": "^2.0.5",
6970
"currencies-map": "^3.3.5",
7071
"diff": "^7.0.0",
72+
"eslint-plugin-svelte": "^3.15.2",
7173
"fast-blurhash": "^1.1.2",
7274
"hi-base32": "^0.5.1",
7375
"luxon": "^3.3.0",
74-
"minisearch": "^6.3.0",
7576
"nprogress": "^0.2.0",
7677
"otpauth": "^9.3.4",
7778
"qrcode": "^1.5.4",
7879
"sanitize-html": "^2.12.1",
79-
"socket.io-client": "^4.7.2",
80-
"svelte-confetti": "^1.3.2",
80+
"svelte-confetti": "^2.3.2",
8181
"svelte-turnstile": "^0.8.0",
82-
"typesense": "^1.8.2"
82+
"typesense": "^1.8.2",
83+
"uplot": "^1.6.32",
84+
"uplot-svelte": "^1.2.4"
85+
},
86+
"imports": {
87+
"#app.css": "./src/app.css"
8388
}
8489
}

0 commit comments

Comments
 (0)