diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..9eb6341ae5 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,15 @@ +.DS_Store +node_modules +/.svelte-kit +/package +.mf/ +build/ +.idea/ +.vscode/ +.vercel_build_output +.pnpm-debug.log +generated/ +.pnpm-store/ +locales/ +pnpm-lock.yaml +.nuxt/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e8ea32d06d..c0af70b734 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,19 @@ { + "prettier.endOfLine": "lf", + "cSpell.words": ["unplugin"], + "gitlens.showWelcomeOnInstall": false, + "gitlens.showWhatsNewAfterUpgrades": false, + "gitlens.plusFeatures.enabled": false, + "gitlens.currentLine.enabled": false, + "gitlens.currentLine.pullRequests.enabled": false, + "gitlens.currentLine.scrollable": true, + "gitlens.codeLens.enabled": false, + "gitlens.hovers.enabled": false, + "svelte.enable-ts-plugin": true, + "svelte.ask-to-enable-ts-plugin": false, + "yaml.schemas": { + "https://json.schemastore.org/github-workflow.json": "file:///Users/sha/Code/Modrinth/knossos/.github/workflows/deploy.yml" + }, "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnPaste": true, diff --git a/package.json b/package.json index c20c01921b..4177827f5c 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "prepare": "svelte-kit sync", "check": "svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", - "lint": "prettier --ignore-path .gitignore --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .", - "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ." + "lint": "prettier --ignore-path .prettierignore --check --plugin-search-dir=. . && eslint --ignore-path .prettierignore .", + "format": "prettier --ignore-path .prettierignore --write --plugin-search-dir=. ." }, "devDependencies": { "@sveltejs/adapter-static": "^1.0.0-next.29", @@ -25,6 +25,7 @@ "mdsvexamples": "^0.3.0", "nodemon": "^2.0.15", "prettier": "^2.6.2", + "prettier-plugin-svelte": "^2.7.0", "sveld": "^0.13.4", "svelte": "^3.48.0", "svelte-check": "^2.2.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5159d53d55..8a745c4868 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,6 +36,7 @@ specifiers: postcss-pxtorem: ^6.0.0 postcss-strip-inline-comments: ^0.1.5 prettier: ^2.6.2 + prettier-plugin-svelte: ^2.7.0 sanitize.css: ^13.0.0 sveld: ^0.13.4 svelte: ^3.48.0 @@ -84,7 +85,7 @@ dependencies: devDependencies: '@sveltejs/adapter-static': 1.0.0-next.29 - '@sveltejs/kit': 1.0.0-next.345_svelte@3.48.0 + '@sveltejs/kit': 1.0.0-next.348_svelte@3.48.0 '@typescript-eslint/eslint-plugin': 5.14.0_4p27j37cxves4nxlnqogdhp4ta '@typescript-eslint/parser': 5.14.0_e6rt7vlgxfprtuallp2t3cvyi4 eslint: 7.32.0 @@ -94,6 +95,7 @@ devDependencies: mdsvexamples: 0.3.0 nodemon: 2.0.15 prettier: 2.6.2 + prettier-plugin-svelte: 2.7.0_kkjbqzpydplecjtkxrgomroeru sveld: 0.13.4_jw3wiphoy34i6ad2hx6ga3jifa svelte: 3.48.0 svelte-check: 2.4.5_2pvebpkgu3ohgo43qaf5qmcxwm @@ -758,14 +760,14 @@ packages: tiny-glob: 0.2.9 dev: true - /@sveltejs/kit/1.0.0-next.345_svelte@3.48.0: - resolution: {integrity: sha512-2nLZoXZ02uXMSxqRAMRCr/J4aCphqgKLxEhRRyh3c3aWLAjWiDWLDcvSB770eHt3y0MkYrTvp7JrDF7RhfyuBA==} + /@sveltejs/kit/1.0.0-next.348_svelte@3.48.0: + resolution: {integrity: sha512-K9dfgzIbotWmbcdCsQ6ROGs9R+bsGWwmSdN6l6km1QV5esQehqg1UYHGD9q0VJsg4rJg/zmKVBYo0oBquSHPZw==} engines: {node: '>=16.7'} hasBin: true peerDependencies: svelte: ^3.44.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.0-next.44_svelte@3.48.0+vite@2.9.9 + '@sveltejs/vite-plugin-svelte': 1.0.0-next.47_svelte@3.48.0+vite@2.9.9 chokidar: 3.5.3 sade: 1.8.1 svelte: 3.48.0 @@ -778,8 +780,8 @@ packages: - supports-color dev: true - /@sveltejs/vite-plugin-svelte/1.0.0-next.44_svelte@3.48.0+vite@2.9.9: - resolution: {integrity: sha512-n+sssEWbzykPS447FmnNyU5GxEhrBPDVd0lxNZnxRGz9P6651LjjwAnISKr3CKgT9v8IybP8VD0n2i5XzbqExg==} + /@sveltejs/vite-plugin-svelte/1.0.0-next.47_svelte@3.48.0+vite@2.9.9: + resolution: {integrity: sha512-J6n8UN51aq/TEZGQ89/EtdXTtca3cRcTJGzi6fi+xK8LkgsHQLCZhRj+PJ+swktRSWTX9IOmQS55SqVg6bz5fA==} engines: {node: ^14.13.1 || >= 16} peerDependencies: diff-match-patch: ^1.0.5 @@ -795,7 +797,7 @@ packages: kleur: 4.1.4 magic-string: 0.26.2 svelte: 3.48.0 - svelte-hmr: 0.14.11_svelte@3.48.0 + svelte-hmr: 0.14.12_svelte@3.48.0 vite: 2.9.9 transitivePeerDependencies: - supports-color @@ -3986,6 +3988,16 @@ packages: engines: {node: '>=4'} dev: true + /prettier-plugin-svelte/2.7.0_kkjbqzpydplecjtkxrgomroeru: + resolution: {integrity: sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==} + peerDependencies: + prettier: ^1.16.4 || ^2.0.0 + svelte: ^3.2.0 + dependencies: + prettier: 2.6.2 + svelte: 3.48.0 + dev: true + /prettier/2.6.2: resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==} engines: {node: '>=10.13.0'} @@ -4519,8 +4531,8 @@ packages: - sugarss dev: true - /svelte-hmr/0.14.11_svelte@3.48.0: - resolution: {integrity: sha512-R9CVfX6DXxW1Kn45Jtmx+yUe+sPhrbYSUp7TkzbW0jI5fVPn6lsNG9NEs5dFg5qRhFNAoVdRw5qQDLALNKhwbQ==} + /svelte-hmr/0.14.12_svelte@3.48.0: + resolution: {integrity: sha512-4QSW/VvXuqVcFZ+RhxiR8/newmwOCTlbYIezvkeN6302YFRE8cXy0naamHcjz8Y9Ce3ITTZtrHrIL0AGfyo61w==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' diff --git a/src/docs/components/Example.svelte b/src/docs/components/Example.svelte index 37deb19d5a..03a67311db 100644 --- a/src/docs/components/Example.svelte +++ b/src/docs/components/Example.svelte @@ -1,73 +1,72 @@
-
- -
-
-
- -
-
-
+
+ +
+
+
+ +
+
+
diff --git a/src/docs/components/Header.svelte b/src/docs/components/Header.svelte index 4406afed82..7b82a1ec9a 100644 --- a/src/docs/components/Header.svelte +++ b/src/docs/components/Header.svelte @@ -1,112 +1,111 @@
-
diff --git a/src/docs/components/Sidebar.svelte b/src/docs/components/Sidebar.svelte index 91d41ef6ff..83408331b9 100644 --- a/src/docs/components/Sidebar.svelte +++ b/src/docs/components/Sidebar.svelte @@ -1,162 +1,157 @@ diff --git a/src/docs/layout/page.svelte b/src/docs/layout/page.svelte index f95146b1a3..0e9f8d8230 100644 --- a/src/docs/layout/page.svelte +++ b/src/docs/layout/page.svelte @@ -1,147 +1,143 @@ - {title ? `${title} • Omorphia` : 'Omorphia'} - + {title ? `${title} • Omorphia` : 'Omorphia'} + {#if title}

{title}

{/if} - - Edit this page on GitHub + + Edit this page on GitHub {#if api} -
- {#if api.props.length > 0} -

Properties

- - - - - - - - - - - {#each api.props as prop} - - - - - - - {/each} - -
NameTypeDefaultDescription
{prop.name}{prop.type ?? ''}{prop.value ?? ''}{prop.constant ? '[Read only] ' : ''}{prop.description?.replace( - 'null', - '' - ) || ''}
- {/if} - {#if api.events.length > 0} -

Events

- - - - - - - - - - {#each api.events as event} - - - - - - {/each} - -
NameForwardedDescription
{event.name}{!!event.parent}{event.description?.replace('null', '') || ''}
- {/if} - {#if api.slots.length > 0} -

Slots

- - - - - - - - - {#each api.slots as slot} - - - - - {/each} - -
NameFallback
{slot.name}{slot.fallback ?? 'None'}
- {/if} -
+
+ {#if api.props.length > 0} +

Properties

+ + + + + + + + + + + {#each api.props as prop} + + + + + + + {/each} + +
NameTypeDefaultDescription
{prop.name}{prop.type ?? ''}{prop.value ?? ''}{prop.constant ? '[Read only] ' : ''}{prop.description?.replace('null', '') || + ''}
+ {/if} + {#if api.events.length > 0} +

Events

+ + + + + + + + + + {#each api.events as event} + + + + + + {/each} + +
NameForwardedDescription
{event.name}{!!event.parent}{event.description?.replace('null', '') || ''}
+ {/if} + {#if api.slots.length > 0} +

Slots

+ + + + + + + + + {#each api.slots as slot} + + + + + {/each} + +
NameFallback
{slot.name}{slot.fallback ?? 'None'}
+ {/if} +
{/if} diff --git a/src/package/components/Avatar.svelte b/src/package/components/Avatar.svelte index 142f50050e..2a8e4f83af 100644 --- a/src/package/components/Avatar.svelte +++ b/src/package/components/Avatar.svelte @@ -1,102 +1,100 @@ {#if src} - + {:else} - - - - + + + + {/if} diff --git a/src/package/components/Badge.svelte b/src/package/components/Badge.svelte index f85ee182b5..42c4a6e22c 100644 --- a/src/package/components/Badge.svelte +++ b/src/package/components/Badge.svelte @@ -1,51 +1,51 @@
- {label} + {label}
diff --git a/src/package/components/Button.svelte b/src/package/components/Button.svelte index f9a4bf03ff..cffe3927c3 100644 --- a/src/package/components/Button.svelte +++ b/src/package/components/Button.svelte @@ -1,156 +1,155 @@ {#if as === 'a'} - - - + + + {:else if as === 'input'} - + {:else} - - - + + + {/if} diff --git a/src/package/components/Checkbox.svelte b/src/package/components/Checkbox.svelte index 175f4973cd..0bbfc0133e 100644 --- a/src/package/components/Checkbox.svelte +++ b/src/package/components/Checkbox.svelte @@ -1,66 +1,66 @@
- - + +
\ No newline at end of file + :global(.icon) { + display: unset; + } + } + } + diff --git a/src/package/components/CheckboxList.svelte b/src/package/components/CheckboxList.svelte index 2cc613e510..2bcf0cc281 100644 --- a/src/package/components/CheckboxList.svelte +++ b/src/package/components/CheckboxList.svelte @@ -1,46 +1,46 @@
- {#each options as option} - handleChange(e, option.value)}> - {#if option.icon && typeof option.icon === 'string'} - {@html option.icon} - {:else if option.icon} - - {/if} - {option.label} - - {/each} + {#each options as option} + handleChange(e, option.value)}> + {#if option.icon && typeof option.icon === 'string'} + {@html option.icon} + {:else if option.icon} + + {/if} + {option.label} + + {/each}
diff --git a/src/package/components/CheckboxVirtualList.svelte b/src/package/components/CheckboxVirtualList.svelte index 251d95630b..ecc723782e 100644 --- a/src/package/components/CheckboxVirtualList.svelte +++ b/src/package/components/CheckboxVirtualList.svelte @@ -1,45 +1,43 @@ -
- {@const option = options[index]} - handleChange(e, option.value)} - > - {#if option.icon && typeof option.icon === 'string'} - {@html option.icon} - {:else if option.icon} - - {/if} - {option.label} - -
+
+ {@const option = options[index]} + handleChange(e, option.value)}> + {#if option.icon && typeof option.icon === 'string'} + {@html option.icon} + {:else if option.icon} + + {/if} + {option.label} + +
diff --git a/src/package/components/Chips.svelte b/src/package/components/Chips.svelte index cb646399e5..0e2b58c8c8 100644 --- a/src/package/components/Chips.svelte +++ b/src/package/components/Chips.svelte @@ -1,48 +1,45 @@
- {#each options as option} - {@const isSelected = selected?.value === option.value} - - {/each} + {#each options as option} + {@const isSelected = selected?.value === option.value} + + {/each}
diff --git a/src/package/components/FormField.svelte b/src/package/components/FormField.svelte index 769a4835a8..c752c6df13 100644 --- a/src/package/components/FormField.svelte +++ b/src/package/components/FormField.svelte @@ -1,24 +1,23 @@
- - + +
- diff --git a/src/package/components/NavRow.svelte b/src/package/components/NavRow.svelte index c982a58cba..fc227b6321 100644 --- a/src/package/components/NavRow.svelte +++ b/src/package/components/NavRow.svelte @@ -1,80 +1,79 @@ diff --git a/src/package/components/Pagination.svelte b/src/package/components/Pagination.svelte index 94bb8503c4..d58897e8ec 100644 --- a/src/package/components/Pagination.svelte +++ b/src/package/components/Pagination.svelte @@ -1,77 +1,75 @@ {#if count > 1} - + {/if} diff --git a/src/package/components/Select.svelte b/src/package/components/Select.svelte index 8707ff3893..f18c9dbb58 100644 --- a/src/package/components/Select.svelte +++ b/src/package/components/Select.svelte @@ -1,204 +1,220 @@
{ - open = false; + class="select select--color-{color}" + class:is-open={open} + class:select--opens-up={shouldOpenUp} + use:clickOutside={() => { + open = false }} - bind:this={element} - tabindex="0" - on:keydown={keydown} -> -
{ - open = !open; - }} - > - {#if icon} - - {/if} - {label || selected?.label || value || 'Choose...'} - {#if !icon} -
- - - -
- {/if} -
- {#if open} -
    - {#each options as option (option.value)} -
  • { - selected = option; - open = false; + bind:this={element} + tabindex="0" + on:keydown={keydown}> +
    { + open = !open + }}> + {#if icon} + + {/if} + {label || selected?.label || value || 'Choose...'} + {#if !icon} +
    + + + +
    + {/if} +
    + {#if open} +
      + {#each options as option (option.value)} +
    • { + selected = option + open = false }} - class:is-selected={selected?.value === option.value} - > - {option.label || option.value} -
      • - {/each} -
    - {/if} + class:is-selected={selected?.value === option.value}> + {option.label || option.value} +
    • + {/each} +
+ {/if}
diff --git a/src/package/components/Slider.svelte b/src/package/components/Slider.svelte index 1e39fe34fd..f67a26106b 100644 --- a/src/package/components/Slider.svelte +++ b/src/package/components/Slider.svelte @@ -1,48 +1,48 @@
- - {value} + + {value}
diff --git a/src/package/components/TextInput.svelte b/src/package/components/TextInput.svelte index 54b84d6a33..ee1c37f46b 100644 --- a/src/package/components/TextInput.svelte +++ b/src/package/components/TextInput.svelte @@ -1,56 +1,56 @@
- {#if multiline} -