Skip to content

Commit 000abd6

Browse files
authored
Merge pull request #1 from eniehack/migrate-svelte5
Migrate svelte5
2 parents ddbf73d + 5664320 commit 000abd6

File tree

14 files changed

+1785
-1626
lines changed

14 files changed

+1785
-1626
lines changed

.eslintignore

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

.eslintrc.cjs

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

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: 'trunk'
66

77
env:
8-
ARTIFACT_DIR: "build"
8+
ARTIFACT_DIR: 'build'
99
BASE_PATH: '/scrapbox-planetarium'
1010

1111
jobs:

.prettierrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
"trailingComma": "none",
55
"printWidth": 100,
66
"plugins": ["prettier-plugin-svelte"],
7-
"pluginSearchDirs": ["."],
87
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
98
}

eslint.config.mjs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import globals from 'globals';
2+
import js from '@eslint/js';
3+
import tseslint from 'typescript-eslint';
4+
import svelte from 'eslint-plugin-svelte';
5+
import svelteParser from 'svelte-eslint-parser';
6+
7+
const tsconfig = tseslint.config({
8+
files: ['**/*.js', '**/*.ts', '**/*.svelte'],
9+
extends: [
10+
js.configs.recommended,
11+
...tseslint.configs.strictTypeChecked,
12+
...tseslint.configs.stylisticTypeChecked,
13+
...svelte.configs['flat/recommended']
14+
],
15+
ignores: ['svelte.config.js'],
16+
languageOptions: {
17+
globals: globals.browser,
18+
parser: tseslint.parser,
19+
parserOptions: {
20+
projectService: true,
21+
tsconfigRootDir: import.meta.dirname,
22+
extraFileExtensions: ['.svelte']
23+
}
24+
}
25+
});
26+
27+
const svelteConfig = tseslint.config({
28+
files: ['**/*.svelte'],
29+
extends: [...svelte.configs['flat/recommended']],
30+
languageOptions: {
31+
parser: svelteParser,
32+
parserOptions: { parser: tseslint.parser }
33+
}
34+
});
35+
36+
const jsConfig = {
37+
files: ['**/*.js'],
38+
rules: { '@typescript-eslint/explicit-function-return-type': 'off' }
39+
};
40+
41+
const configConfig = {
42+
files: ['**/*.config.*'],
43+
rules: { '@typescript-eslint/naming-convention': 'off' }
44+
};
45+
46+
export default [
47+
{
48+
ignores: ['.svelte-kit/*', '.vercel/*', 'node_modules']
49+
},
50+
...tsconfig,
51+
...svelteConfig,
52+
jsConfig,
53+
configConfig
54+
];

package.json

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,36 @@
77
"preview": "vite preview",
88
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
99
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
10-
"lint": "prettier --plugin-search-dir . --check . && eslint .",
11-
"format": "prettier --plugin-search-dir . --write ."
10+
"lint": "eslint .",
11+
"lint:fix": "eslint --fix .",
12+
"format": "prettier --check .",
13+
"format:fix": "prettier --write ."
1214
},
1315
"devDependencies": {
1416
"@fontsource/fira-mono": "^4.5.10",
1517
"@neoconfetti/svelte": "^1.0.0",
16-
"@sveltejs/adapter-auto": "^2.0.0",
17-
"@sveltejs/adapter-static": "^2.0.3",
18-
"@sveltejs/kit": "^1.20.4",
19-
"@types/cookie": "^0.5.1",
20-
"@typescript-eslint/eslint-plugin": "^6.0.0",
21-
"@typescript-eslint/parser": "^6.0.0",
22-
"eslint": "^8.28.0",
23-
"eslint-config-prettier": "^8.5.0",
24-
"eslint-plugin-svelte": "^2.30.0",
25-
"prettier": "^2.8.0",
26-
"prettier-plugin-svelte": "^2.10.1",
27-
"svelte": "^4.0.5",
28-
"svelte-check": "^3.4.3",
29-
"tslib": "^2.4.1",
30-
"typescript": "^5.0.0",
31-
"vite": "^4.4.2"
32-
},
33-
"type": "module",
34-
"dependencies": {
18+
"@sveltejs/adapter-auto": "^3.3.0",
19+
"@sveltejs/adapter-static": "^3.0.5",
20+
"@sveltejs/kit": "^2.7.2",
21+
"@sveltejs/vite-plugin-svelte": "^4.0.0",
22+
"@types/cookie": "^0.5.4",
23+
"eslint": "^9.13.0",
24+
"eslint-config-prettier": "^8.10.0",
25+
"eslint-plugin-svelte": "^2.46.0",
26+
"globals": "^15.11.0",
3527
"graphology": "^0.25.4",
3628
"graphology-layout": "^0.6.1",
3729
"graphology-layout-forceatlas2": "^0.10.1",
30+
"prettier": "^3.3.3",
31+
"prettier-plugin-svelte": "^3.2.7",
3832
"sigma": "3.0.0-alpha3",
39-
"zod": "^3.22.2"
40-
}
33+
"svelte": "^5.0.5",
34+
"svelte-check": "^4.0.5",
35+
"tslib": "^2.8.0",
36+
"typescript": "^5.6.3",
37+
"typescript-eslint": "^8",
38+
"vite": "^5.4.10",
39+
"zod": "^3.23.8"
40+
},
41+
"type": "module"
4142
}

0 commit comments

Comments
 (0)