Skip to content

Commit

Permalink
Merge pull request #10 from discord-tickets/dev
Browse files Browse the repository at this point in the history
Migrate to Svelte 5
  • Loading branch information
eartharoid authored Jan 14, 2025
2 parents 350971b + 55a6034 commit a3ce270
Show file tree
Hide file tree
Showing 47 changed files with 1,571 additions and 1,630 deletions.
13 changes: 2 additions & 11 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
.DS_Store
node_modules
/build
/.svelte-kit
/package
.env
.env.*
!.env.example

# Ignore files for PNPM, NPM and YARN
pnpm-lock.yaml
# Package Managers
package-lock.json
pnpm-lock.yaml
yarn.lock
11 changes: 10 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,14 @@
"useTabs": true,
"singleQuote": true,
"trailingComma": "none",
"printWidth": 100
"printWidth": 100,
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
"overrides": [
{
"files": "*.svelte",
"options": {
"parser": "svelte"
}
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cSpell.words": ["cooldown", "skyra", "uuidv"]
}
3 changes: 2 additions & 1 deletion .eslintrc.cjs → __.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ module.exports = {
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
extraFileExtensions: ['.svelte'],
tsconfigRootDir: __dirname
},
env: {
browser: true,
Expand Down
23 changes: 23 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import prettier from 'eslint-config-prettier';
import js from '@eslint/js';
import svelte from 'eslint-plugin-svelte';
import globals from 'globals';

/** @type {import('eslint').Linter.Config[]} */
export default [
js.configs.recommended,
...svelte.configs['flat/recommended'],
prettier,
...svelte.configs['flat/prettier'],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node
}
}
},
{
ignores: ['build/', '.svelte-kit/', 'dist/']
}
];
18 changes: 17 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
{
"extends": "./.svelte-kit/tsconfig.json"
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
}
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
}
41 changes: 21 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,38 @@
"devDependencies": {
"@eartharoid/i18n": "2.0.0-alpha.1",
"@eartharoid/vite-plugin-i18n": "1.0.0-alpha.1",
"@fortawesome/fontawesome-free": "^6.5.2",
"@fortawesome/fontawesome-free": "^6.6.0",
"@skyra/discord-components-core": "^3.6.1",
"@sveltejs/adapter-node": "^5.0.1",
"@sveltejs/kit": "^2.5.7",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@tailwindcss/forms": "^0.5.7",
"@sveltejs/adapter-node": "^5.2.9",
"@sveltejs/kit": "^2.8.1",
"@sveltejs/vite-plugin-svelte": "^4.0.1",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"big-integer": "^1.6.52",
"clsx": "^2.1.1",
"cookie": "^0.5.0",
"emoji-name-map": "^1.2.9",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-svelte": "^2.38.0",
"eslint-plugin-svelte": "^2.46.0",
"marked": "^4.3.0",
"ms": "^2.1.3",
"negotiator": "^0.6.3",
"postcss": "^8.4.38",
"prettier": "^2.8.8",
"prettier-plugin-svelte": "^2.10.1",
"sortablejs": "^1.15.2",
"svelte": "^4.2.15",
"svelte-modals": "^1.3.0",
"svelte-preprocess": "^5.1.4",
"negotiator": "^0.6.4",
"postcss": "^8.4.49",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.8",
"prettier-plugin-tailwindcss": "^0.6.9",
"sortablejs": "^1.15.3",
"svelte": "^5.2.2",
"svelte-modals": "^2.0.0",
"svelte-preprocess": "^6.0.3",
"svelte-toasts": "^1.1.2",
"tailwind-merge": "^2.3.0",
"tailwind-merge": "^2.5.4",
"tailwind-variants": "^0.2.1",
"tailwindcss": "^3.4.3",
"tailwindcss": "^3.4.15",
"typescript": "^5.6.3",
"uuid": "^9.0.1",
"vaul-svelte": "^0.3.0",
"vite": "^5.2.10"
"vite": "^5.4.11"
}
}
Loading

0 comments on commit a3ce270

Please sign in to comment.