diff --git a/.eslintrc.json b/.eslintrc.json index 1db5309..bac9605 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,9 +10,6 @@ "ecmaVersion": "latest", "sourceType": "module" }, - "plugins": ["@typescript-eslint", "solid", "prettier"], - "rules": { - "prettier/prettier": "error" - }, + "plugins": ["@typescript-eslint", "solid"], "ignorePatterns": ["node_modules/", "dist/"] } diff --git a/.gitignore b/.gitignore index d20c03d..6f9e690 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,9 @@ - -dist .solid .output -.vercel -.netlify -netlify - -# Environment -.env -.env*.local - -# dependencies -/node_modules - -# IDEs and editors -/.idea -.project -.classpath -*.launch -.settings/ - -# Temp -gitignore +.vinxi +node_modules +.idea -# System Files .DS_Store Thumbs.db -.vinxi diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index dee70d2..0000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -dist -pnpm-lock.yaml diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index 5d7fb7a..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "printWidth": 120, - "tabWidth": 2, - "useTabs": false, - "semi": false, - "singleQuote": true, - "quoteProps": "as-needed", - "jsxSingleQuote": false, - "trailingComma": "es5", - "bracketSpacing": true, - "bracketSameLine": false, - "arrowParens": "always", - "requirePragma": false, - "insertPragma": false, - "proseWrap": "always", - "htmlWhitespaceSensitivity": "strict", - "endOfLine": "lf", - "embeddedLanguageFormatting": "off" -} diff --git a/biome.json b/biome.json new file mode 100644 index 0000000..e4ed59b --- /dev/null +++ b/biome.json @@ -0,0 +1,32 @@ +{ + "vcs": { + "enabled": true, + "clientKind": "git", + "useIgnoreFile": true + }, + "formatter": { + "enabled": true, + "indentStyle": "space", + "indentWidth": 2, + "lineWidth": 120, + "lineEnding": "lf" + }, + "linter": { + "enabled": false + }, + "organizeImports": { + "enabled": true + }, + "javascript": { + "formatter": { + "trailingComma": "es5", + "arrowParentheses": "always", + "quoteStyle": "single", + "jsxQuoteStyle": "double", + "bracketSpacing": true, + "bracketSameLine": false, + "semicolons": "asNeeded", + "quoteProperties": "asNeeded" + } + } +} diff --git a/package.json b/package.json index 3f0702a..465ded2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dev": "vinxi dev", "build": "vinxi build", "start": "node ./.output/server/index.mjs", - "format": "prettier . --write", + "format": "pnpm dlx @biomejs/biome format --write .", "lint": "eslint --ext .tsx,.ts,.json,.js,.jsx ." }, "type": "module", @@ -16,10 +16,8 @@ "@typescript-eslint/parser": "^6.15.0", "esbuild": "^0.14.54", "eslint": "^8.56.0", - "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-solid": "^0.13.0", "postcss": "^8.4.32", - "prettier": "3.0.3", "sass": "^1.69.5", "typescript": "^4.9.5", "vite": "^4.5.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ccbe1d..d7d473e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,18 +61,12 @@ devDependencies: eslint: specifier: ^8.56.0 version: 8.56.0 - eslint-plugin-prettier: - specifier: ^5.0.1 - version: 5.0.1(eslint@8.56.0)(prettier@3.0.3) eslint-plugin-solid: specifier: ^0.13.0 version: 0.13.0(eslint@8.56.0)(typescript@4.9.5) postcss: specifier: ^8.4.32 version: 8.4.32 - prettier: - specifier: 3.0.3 - version: 3.0.3 sass: specifier: ^1.69.5 version: 1.69.5 @@ -1129,18 +1123,6 @@ packages: '@parcel/watcher-win32-x64': 2.3.0 dev: false - /@pkgr/utils@2.4.2: - resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==} - engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - dependencies: - cross-spawn: 7.0.3 - fast-glob: 3.3.2 - is-glob: 4.0.3 - open: 9.1.0 - picocolors: 1.0.0 - tslib: 2.6.2 - dev: true - /@polka/url@1.0.0-next.24: resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} dev: false @@ -2067,6 +2049,7 @@ packages: /big-integer@1.6.52: resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==} engines: {node: '>=0.6'} + dev: false /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} @@ -2101,6 +2084,7 @@ packages: engines: {node: '>= 5.10.0'} dependencies: big-integer: 1.6.52 + dev: false /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -2149,6 +2133,7 @@ packages: engines: {node: '>=12'} dependencies: run-applescript: 5.0.0 + dev: false /c12@1.5.1: resolution: {integrity: sha512-BWZRJgDEveT8uI+cliCwvYSSSSvb4xKoiiu5S0jaDbKBopQLQF7E+bq9xKk1pTcG+mUa3yXuFO7bD9d8Lr9Xxg==} @@ -2416,6 +2401,7 @@ packages: dependencies: bplist-parser: 0.2.0 untildify: 4.0.0 + dev: false /default-browser@4.0.0: resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==} @@ -2425,6 +2411,7 @@ packages: default-browser-id: 3.0.0 execa: 7.2.0 titleize: 3.0.0 + dev: false /define-data-property@1.1.1: resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==} @@ -2442,6 +2429,7 @@ packages: /define-lazy-prop@3.0.0: resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} engines: {node: '>=12'} + dev: false /define-properties@1.2.1: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} @@ -2934,26 +2922,6 @@ packages: engines: {node: '>=12'} dev: false - /eslint-plugin-prettier@5.0.1(eslint@8.56.0)(prettier@3.0.3): - resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - '@types/eslint': '>=8.0.0' - eslint: '>=8.0.0' - eslint-config-prettier: '*' - prettier: '>=3.0.0' - peerDependenciesMeta: - '@types/eslint': - optional: true - eslint-config-prettier: - optional: true - dependencies: - eslint: 8.56.0 - prettier: 3.0.3 - prettier-linter-helpers: 1.0.0 - synckit: 0.8.6 - dev: true - /eslint-plugin-solid@0.13.0(eslint@8.56.0)(typescript@4.9.5): resolution: {integrity: sha512-Sutd+DxEGu9+Z9ITtHKXRAClxVe1a6C1XQZSuN8iBsMy0IAVEc6Tca1UYgc7tD2ZrRRjZKB9mohBOaZl5NJLgg==} engines: {node: '>=12.0.0'} @@ -3103,6 +3071,7 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 + dev: false /execa@7.2.0: resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} @@ -3117,15 +3086,12 @@ packages: onetime: 6.0.0 signal-exit: 3.0.7 strip-final-newline: 3.0.0 + dev: false /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true - /fast-diff@1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - dev: true - /fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} dev: false @@ -3304,6 +3270,7 @@ packages: /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} + dev: false /get-symbol-description@1.0.0: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} @@ -3561,10 +3528,12 @@ packages: /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} + dev: false /human-signals@4.3.1: resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} engines: {node: '>=14.18.0'} + dev: false /ignore@5.3.0: resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} @@ -3697,11 +3666,13 @@ packages: resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} engines: {node: '>=8'} hasBin: true + dev: false /is-docker@3.0.0: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true + dev: false /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} @@ -3738,6 +3709,7 @@ packages: hasBin: true dependencies: is-docker: 3.0.0 + dev: false /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} @@ -3804,10 +3776,12 @@ packages: /is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} + dev: false /is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: false /is-string@1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} @@ -3845,6 +3819,7 @@ packages: engines: {node: '>=8'} dependencies: is-docker: 2.2.1 + dev: false /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -4067,6 +4042,7 @@ packages: /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} + dev: false /merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} @@ -4094,10 +4070,12 @@ packages: /mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} + dev: false /mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} + dev: false /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -4322,12 +4300,14 @@ packages: engines: {node: '>=8'} dependencies: path-key: 3.1.1 + dev: false /npm-run-path@5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: path-key: 4.0.0 + dev: false /npmlog@5.0.1: resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} @@ -4406,12 +4386,14 @@ packages: engines: {node: '>=6'} dependencies: mimic-fn: 2.1.0 + dev: false /onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} dependencies: mimic-fn: 4.0.0 + dev: false /open@8.4.2: resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} @@ -4430,6 +4412,7 @@ packages: define-lazy-prop: 3.0.0 is-inside-container: 1.0.0 is-wsl: 2.2.0 + dev: false /openapi-typescript@6.7.3: resolution: {integrity: sha512-es3mGcDXV6TKPo6n3aohzHm0qxhLyR39MhF6mkD1FwFGjhxnqMqfSIgM0eCpInZvqatve4CxmXcMZw3jnnsaXw==} @@ -4497,6 +4480,7 @@ packages: /path-key@4.0.0: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} + dev: false /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -4552,19 +4536,6 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-linter-helpers@1.0.0: - resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} - engines: {node: '>=6.0.0'} - dependencies: - fast-diff: 1.3.0 - dev: true - - /prettier@3.0.3: - resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} - engines: {node: '>=14'} - hasBin: true - dev: true - /pretty-bytes@6.1.1: resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==} engines: {node: ^14.13.1 || >=16.0.0} @@ -4762,6 +4733,7 @@ packages: engines: {node: '>=12'} dependencies: execa: 5.1.1 + dev: false /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -4936,6 +4908,7 @@ packages: /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + dev: false /simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} @@ -5109,10 +5082,12 @@ packages: /strip-final-newline@2.0.0: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} + dev: false /strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} + dev: false /strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} @@ -5155,14 +5130,6 @@ packages: engines: {node: '>= 0.4'} dev: false - /synckit@0.8.6: - resolution: {integrity: sha512-laHF2savN6sMeHCjLRkheIU4wo3Zg9Ln5YOjOo7sZ5dVQW8yF5pPE5SIw1dsPhq3TRp1jisKRCdPhfs/1WMqDA==} - engines: {node: ^14.18.0 || >=16.0.0} - dependencies: - '@pkgr/utils': 2.4.2 - tslib: 2.6.2 - dev: true - /tar-stream@3.1.6: resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==} dependencies: @@ -5208,6 +5175,7 @@ packages: /titleize@3.0.0: resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==} engines: {node: '>=12'} + dev: false /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} @@ -5254,6 +5222,7 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + dev: false /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -5471,6 +5440,7 @@ packages: /untildify@4.0.0: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} + dev: false /untun@0.1.3: resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} diff --git a/src/app.tsx b/src/app.tsx index 5049098..8988de4 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,17 +1,17 @@ // @refresh reload -import { ErrorBoundary, lazy, Suspense } from 'solid-js' +import { Meta, MetaProvider } from '@solidjs/meta' +import { RouteDefinition, Router } from '@solidjs/router' import 'normalize.css' +import { ErrorBoundary, Suspense, lazy } from 'solid-js' import previewImage from '~/assets/preview_image.png' -import '~/scss/global.scss' import Layout from '~/components/Layout' import Title from '~/components/Title' -import { RouteDefinition, Router } from '@solidjs/router' -import { Meta, MetaProvider } from '@solidjs/meta' +import '~/scss/global.scss' import { loadHomePage } from './data/home.data' +import { loadPagesPage } from './data/pages.data' import { loadPost } from './data/post.data' import { loadSearchPage } from './data/search.data' -import { loadPagesPage } from './data/pages.data' const ROUTES: RouteDefinition[] = [ { @@ -37,7 +37,11 @@ const ROUTES: RouteDefinition[] = [ }, { path: '/:type/:value', - component: lazy(() => import('~/pages/Search').then((c) => ({ default: c.SearchPageRedirect }))), + component: lazy(() => + import('~/pages/Search').then((c) => ({ + default: c.SearchPageRedirect, + })) + ), load: loadSearchPage, }, ], diff --git a/src/components/Banners.tsx b/src/components/Banners.tsx index a46e13f..89ea28c 100644 --- a/src/components/Banners.tsx +++ b/src/components/Banners.tsx @@ -1,9 +1,9 @@ +import { A } from '@solidjs/router' import { VoidComponent } from 'solid-js' +import bazis from '~/assets/banners/bazisintezmeny_logo.png' import hatartalanul from '~/assets/banners/hatartalanul.jpg' import ntp from '~/assets/banners/ntp.png' -import bazis from '~/assets/banners/bazisintezmeny_logo.png' import styles from './Banners.module.scss' -import { A } from '@solidjs/router' const Banners: VoidComponent = () => { return ( diff --git a/src/components/CardGrid.tsx b/src/components/CardGrid.tsx index da48520..9794863 100644 --- a/src/components/CardGrid.tsx +++ b/src/components/CardGrid.tsx @@ -1,7 +1,7 @@ import { For, VoidComponent } from 'solid-js' import { Post } from '~/models/post' -import PostCard from './PostCard' import styles from './CardGrid.module.scss' +import PostCard from './PostCard' export type CardGridProps = { posts: Post[] | undefined diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 6598a22..f8a0c77 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,12 +1,12 @@ +import { A } from '@solidjs/router' +import { FaBrandsFacebookF, FaBrandsGithub } from 'solid-icons/fa' import { VoidComponent } from 'solid-js' +import eugy from '~/assets/icons/eugy.png' +import kk from '~/assets/icons/kk-logo.webp' +import kreta from '~/assets/icons/kreta.png' import { VERSION } from '~/constants' import styles from './Footer.module.scss' -import { FaBrandsFacebookF, FaBrandsGithub } from 'solid-icons/fa' import Logo from './Logo' -import kk from '~/assets/icons/kk-logo.webp' -import kreta from '~/assets/icons/kreta.png' -import eugy from '~/assets/icons/eugy.png' -import { A } from '@solidjs/router' const Footer: VoidComponent = () => { return ( diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 12d98bf..a7965e9 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -1,9 +1,9 @@ import { A, useLocation, useNavigate } from '@solidjs/router' import { FaSolidBars, FaSolidChevronDown, FaSolidMagnifyingGlass, FaSolidXmark } from 'solid-icons/fa' -import { createContext, createMemo, createSignal, ParentComponent, Setter, useContext, VoidComponent } from 'solid-js' +import { ParentComponent, Setter, VoidComponent, createContext, createMemo, createSignal, useContext } from 'solid-js' +import kretalogo from '~/assets/icons/kreta.png' import styles from './Header.module.scss' import Logo from './Logo' -import kretalogo from '~/assets/icons/kreta.png' const DropdownContext = createContext>() diff --git a/src/components/ImageViewer.tsx b/src/components/ImageViewer.tsx index bc1c2e9..29ca206 100644 --- a/src/components/ImageViewer.tsx +++ b/src/components/ImageViewer.tsx @@ -1,5 +1,5 @@ import { FaSolidChevronLeft } from 'solid-icons/fa' -import { createEffect, on, createSignal, For, onMount, VoidComponent, untrack } from 'solid-js' +import { For, VoidComponent, createEffect, createSignal, on, onMount, untrack } from 'solid-js' import styles from './ImageViewer.module.scss' export type ImageViewerProps = { diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx index 3ddf10d..8e4d280 100644 --- a/src/components/Logo.tsx +++ b/src/components/Logo.tsx @@ -1,7 +1,7 @@ import { A } from '@solidjs/router' import { VoidComponent } from 'solid-js' -import styles from './Logo.module.scss' import logo from '~/assets/icons/logo.svg' +import styles from './Logo.module.scss' const Logo: VoidComponent = () => { return ( diff --git a/src/components/Title.tsx b/src/components/Title.tsx index c5302ac..e274793 100644 --- a/src/components/Title.tsx +++ b/src/components/Title.tsx @@ -1,5 +1,5 @@ -import { VoidComponent } from 'solid-js' import { Meta, Title as TitleMeta } from '@solidjs/meta' +import { VoidComponent } from 'solid-js' const BASE_TITLE = 'Verseghy Ferenc Gimnázium' diff --git a/src/data/home.data.ts b/src/data/home.data.ts index 3e3aa7d..6546706 100644 --- a/src/data/home.data.ts +++ b/src/data/home.data.ts @@ -1,5 +1,5 @@ import { gql, request } from '@solid-primitives/graphql' -import { cache, RouteLoadFunc } from '@solidjs/router' +import { RouteLoadFunc, cache } from '@solidjs/router' import { GRAPHQL_BACKEND_URL } from '~/constants' import { Connection, PageInfo } from '~/models/connection' import { Post } from '~/models/post' diff --git a/src/data/pages.data.ts b/src/data/pages.data.ts index 5da9fb7..01a100c 100644 --- a/src/data/pages.data.ts +++ b/src/data/pages.data.ts @@ -1,5 +1,5 @@ import { gql, request } from '@solid-primitives/graphql' -import { cache, redirect, RouteLoadFunc } from '@solidjs/router' +import { RouteLoadFunc, cache, redirect } from '@solidjs/router' import { GRAPHQL_BACKEND_URL } from '~/constants' import { Page } from '~/models/page' diff --git a/src/data/post.data.ts b/src/data/post.data.ts index 7ea4fe1..83e49af 100644 --- a/src/data/post.data.ts +++ b/src/data/post.data.ts @@ -1,5 +1,5 @@ import { gql, request } from '@solid-primitives/graphql' -import { cache, redirect, RouteLoadFunc } from '@solidjs/router' +import { RouteLoadFunc, cache, redirect } from '@solidjs/router' import { GRAPHQL_BACKEND_URL } from '~/constants' import { Post } from '~/models/post' diff --git a/src/data/search.data.ts b/src/data/search.data.ts index c3b4d5a..0dc454d 100644 --- a/src/data/search.data.ts +++ b/src/data/search.data.ts @@ -1,5 +1,5 @@ import { gql, request } from '@solid-primitives/graphql' -import { cache, Params, RouteLoadFunc } from '@solidjs/router' +import { Params, RouteLoadFunc, cache } from '@solidjs/router' import { GRAPHQL_BACKEND_URL } from '~/constants' import { Connection, PageInfo } from '~/models/connection' import { Post } from '~/models/post' diff --git a/src/entry-client.tsx b/src/entry-client.tsx index 15a4df4..d347d44 100644 --- a/src/entry-client.tsx +++ b/src/entry-client.tsx @@ -1,3 +1,3 @@ -import { mount, StartClient } from '@solidjs/start/client' +import { StartClient, mount } from '@solidjs/start/client' mount(() => , document.getElementById('app')) diff --git a/src/entry-server.tsx b/src/entry-server.tsx index 9158572..548da44 100644 --- a/src/entry-server.tsx +++ b/src/entry-server.tsx @@ -1,4 +1,4 @@ -import { createHandler, StartServer } from '@solidjs/start/server' +import { StartServer, createHandler } from '@solidjs/start/server' import favicon from '~/assets/favicon.ico' export default createHandler(() => ( diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 085626f..f2ac396 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,10 +1,10 @@ +import { Meta } from '@solidjs/meta' +import { RouteSectionProps, createAsync } from '@solidjs/router' import { Component } from 'solid-js' import Banners from '~/components/Banners' import CardGrid from '~/components/CardGrid' -import styles from './Home.module.scss' -import { Meta } from '@solidjs/meta' -import { createAsync, RouteSectionProps } from '@solidjs/router' import { queryHomePage } from '~/data/home.data' +import styles from './Home.module.scss' const HomePage: Component = () => { const data = createAsync(() => queryHomePage()) diff --git a/src/pages/Pages.tsx b/src/pages/Pages.tsx index 9416b7d..c96a110 100644 --- a/src/pages/Pages.tsx +++ b/src/pages/Pages.tsx @@ -1,5 +1,5 @@ import { Meta } from '@solidjs/meta' -import { createAsync, RouteSectionProps } from '@solidjs/router' +import { RouteSectionProps, createAsync } from '@solidjs/router' import { Component, Show } from 'solid-js' import PageRenderer from '~/components/PageRenderer' import Title from '~/components/Title' diff --git a/src/pages/Post.tsx b/src/pages/Post.tsx index 30e4121..6244444 100644 --- a/src/pages/Post.tsx +++ b/src/pages/Post.tsx @@ -1,14 +1,14 @@ +import { Meta } from '@solidjs/meta' +import { RouteSectionProps, createAsync } from '@solidjs/router' +import { formatISO } from 'date-fns' import { Component, For, Show } from 'solid-js' -import styles from './Post.module.scss' -import Title from '~/components/Title' -import Label from '~/components/Label' -import PageRenderer from '~/components/PageRenderer' import FormattedDate from '~/components/FormattedDate' import ImageViewer from '~/components/ImageViewer' -import { createAsync, RouteSectionProps } from '@solidjs/router' -import { Meta } from '@solidjs/meta' +import Label from '~/components/Label' +import PageRenderer from '~/components/PageRenderer' +import Title from '~/components/Title' import { queryPostById } from '~/data/post.data' -import { formatISO } from 'date-fns' +import styles from './Post.module.scss' // eslint-disable-next-line solid/no-destructure const PostPage: Component = ({ params }) => { diff --git a/src/pages/Search.tsx b/src/pages/Search.tsx index e7f2409..1a38fda 100644 --- a/src/pages/Search.tsx +++ b/src/pages/Search.tsx @@ -1,4 +1,4 @@ -import { createAsync, Navigate, RouteSectionProps } from '@solidjs/router' +import { Navigate, RouteSectionProps, createAsync } from '@solidjs/router' import { Component, Show } from 'solid-js' import CardGrid from '~/components/CardGrid' import Title from '~/components/Title'