🎨 Reformat all codes with @trivago/prettier-plugin-sort-imports

https://github.com/trivago/prettier-plugin-sort-imports
PresentKim · Jul 20, 2023 · cf8e903 · cf8e903
1 parent e28de2c
commit cf8e903
Show file tree

Hide file tree

Showing 29 changed files with 277 additions and 33 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,9 +2,17 @@
   "useTabs": false,
   "singleQuote": true,
   "trailingComma": "none",
-  "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
+  "plugins": [
+    "prettier-plugin-svelte",
+    "prettier-plugin-tailwindcss",
+    "@trivago/prettier-plugin-sort-imports"
+  ],
   "pluginSearchDirs": ["."],
   "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
 
-  "tailwindFunctions": ["clsx"]
+  "tailwindFunctions": ["clsx"],
+
+  "importOrder": ["^([$]app/)|([./$]types)", "^[$]lib/(.*)", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true
 }
diff --git a/mdsvex.config.js b/mdsvex.config.js
@@ -1,11 +1,10 @@
-import { mdsvex } from 'mdsvex';
-
 import fs from 'fs';
-import remarkEmoji from 'remark-emoji';
+import { mdsvex } from 'mdsvex';
+import rehypeExternalLinks from 'rehype-external-links';
+import rehypeKatex from 'rehype-katex-svelte';
 import remarkAdmonitions from 'remark-admonitions';
+import remarkEmoji from 'remark-emoji';
 import remarkMath from 'remark-math';
-import rehypeKatex from 'rehype-katex-svelte';
-import rehypeExternalLinks from 'rehype-external-links';
 
 const ADMONITION_ICON_PATH = './src/lib/assets/admonitions-icon/';
 const customTypes = Object.fromEntries(

diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "@giscus/svelte": "^2.3.0",
     "@sveltejs/adapter-static": "^2.0.2",
     "@sveltejs/kit": "^1.20.5",
+    "@trivago/prettier-plugin-sort-imports": "^4.1.1",
     "@types/html-minifier": "^4.0.2",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
@@ -1,5 +1,5 @@
-import { minify } from 'html-minifier';
 import type { Handle } from '@sveltejs/kit';
+import { minify } from 'html-minifier';
 
 export const handle: Handle = async ({ event, resolve }) => {
   const response = await resolve(event);

diff --git a/src/lib/components/MetaTags.svelte b/src/lib/components/MetaTags.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { page } from '$app/stores';
+
   import {
-    domain,
-    name,
+    author,
     description as defaultDescription,
-    author
+    domain,
+    name
   } from '$lib/assets/site-info.json';
 
   export let pageName: string = '';

diff --git a/src/lib/components/PostList.svelte b/src/lib/components/PostList.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-  import type { PostInfo } from '$lib/utils/blog';
   import clsx from 'clsx';
 
+  import type { PostInfo } from '$lib/utils/blog';
+
   export let posts: PostInfo[];
 </script>
 

diff --git a/src/lib/utils/blog.ts b/src/lib/utils/blog.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs';
+
 import { pickKeys } from '$lib/utils/utils';
 
 declare type PostMetadata = {

diff --git a/src/lib/utils/theme.ts b/src/lib/utils/theme.ts
@@ -1,4 +1,5 @@
 import { derived, writable } from 'svelte/store';
+
 import { browser } from '$app/environment';
 
 declare type Theme = 'light' | 'dark';

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import { onMount } from 'svelte';
+
   import '$lib/assets/styles/index.scss';
-  import Header from '$lib/components/Header.svelte';
   import Footer from '$lib/components/Footer.svelte';
-
-  import { onMount } from 'svelte';
+  import Header from '$lib/components/Header.svelte';
   import { themeMount } from '$lib/utils/theme.ts';
 
   onMount(() => {

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getPosts, pickPostInfo } from '$lib/utils/blog';
 
 export const load: PageServerLoad = () => ({

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
+  import clsx from 'clsx';
+
   import type { PageData } from './$types';
-  import PostList from '$lib/components/PostList.svelte';
 
   import MetaTags from '$lib/components/MetaTags.svelte';
-  import clsx from 'clsx';
+  import PostList from '$lib/components/PostList.svelte';
+
   export let data: PageData;
 </script>
 

diff --git a/src/routes/boj/+page.server.ts b/src/routes/boj/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getBojInfos } from '$lib/utils/boj';
 import { pickKeys } from '$lib/utils/utils';
 

diff --git a/src/routes/boj/+page.svelte b/src/routes/boj/+page.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import type { BojProblemMetadata } from '$lib/utils/boj';
-  import MetaTags from '$lib/components/MetaTags.svelte';
   import clsx from 'clsx';
 
+  import MetaTags from '$lib/components/MetaTags.svelte';
+  import type { BojProblemMetadata } from '$lib/utils/boj';
+
   export let data: { infos: BojProblemMetadata[] };
 </script>
 

diff --git a/src/routes/boj/[id]/+page.server.ts b/src/routes/boj/[id]/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getBojInfo } from '$lib/utils/boj';
 
 export const load: PageServerLoad = ({ params: { id } }) =>

diff --git a/src/routes/boj/[id]/+page.svelte b/src/routes/boj/[id]/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import type { PageData } from './$types';
+
   import MetaTags from '$lib/components/MetaTags.svelte';
 
   const dataKeys = [

diff --git a/src/routes/posts/+page.server.ts b/src/routes/posts/+page.server.ts
@@ -1,5 +1,7 @@
 import type { PageServerLoad } from './$types';
+
 import { getPosts, pickPostInfo } from '$lib/utils/blog';
+
 export const load: PageServerLoad = () => ({
   posts: getPosts((post) => !post.draft).map(pickPostInfo)
 });
diff --git a/src/routes/posts/+page.svelte b/src/routes/posts/+page.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type { PageData } from './$types';
-  import PostList from '$lib/components/PostList.svelte';
+
   import MetaTags from '$lib/components/MetaTags.svelte';
+  import PostList from '$lib/components/PostList.svelte';
 
   export let data: PageData;
 </script>

diff --git a/src/routes/posts/[...permalink]/+page.server.ts b/src/routes/posts/[...permalink]/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getPost, pickPostContents } from '$lib/utils/blog';
 
 export const load: PageServerLoad = ({ params: { permalink } }) =>

diff --git a/src/routes/posts/[...permalink]/+page.svelte b/src/routes/posts/[...permalink]/+page.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
+  import Giscus from '@giscus/svelte';
+  import clsx from 'clsx';
+
+  import { page } from '$app/stores';
   import type { PageData } from './$types';
-  import { giscusTheme } from '$lib/utils/theme';
+
   import site from '$lib/assets/site-info.json';
-  import { page } from '$app/stores';
-  import Giscus from '@giscus/svelte';
   import MetaTags from '$lib/components/MetaTags.svelte';
-  import clsx from 'clsx';
+  import { giscusTheme } from '$lib/utils/theme';
 
   export let data: PageData;
 </script>

diff --git a/src/routes/posts/drafts/+page.server.ts b/src/routes/posts/drafts/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getPosts, pickPostInfo } from '$lib/utils/blog';
 
 export const load: PageServerLoad = () => ({

diff --git a/src/routes/posts/drafts/+page.svelte b/src/routes/posts/drafts/+page.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type { PageData } from './$types';
-  import PostList from '$lib/components/PostList.svelte';
+
   import MetaTags from '$lib/components/MetaTags.svelte';
+  import PostList from '$lib/components/PostList.svelte';
 
   export let data: PageData;
 </script>

diff --git a/src/routes/rss.xml/+server.ts b/src/routes/rss.xml/+server.ts
@@ -1,9 +1,12 @@
+import dayjs from 'dayjs';
+
 import type { RequestHandler } from './$types';
+
+import { description, domain, name } from '$lib/assets/site-info.json';
 import type { Post } from '$lib/utils/blog';
 import { getPosts } from '$lib/utils/blog';
-import { domain, name, description } from '$lib/assets/site-info.json';
-import dayjs from 'dayjs';
 import { minifyXML } from '$lib/utils/utils';
+
 export const prerender = true;
 
 export const GET: RequestHandler = () => {

diff --git a/src/routes/sitemap.xml/+server.ts b/src/routes/sitemap.xml/+server.ts
@@ -1,8 +1,10 @@
+import dayjs from 'dayjs';
+
 import type { RequestHandler } from './$types';
-import { getPosts } from '$lib/utils/blog';
+
 import { domain } from '$lib/assets/site-info.json';
+import { getPosts } from '$lib/utils/blog';
 import { minifyXML } from '$lib/utils/utils';
-import dayjs from 'dayjs';
 
 export const prerender = true;
 

diff --git a/src/routes/tags/+page.server.ts b/src/routes/tags/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getPosts } from '$lib/utils/blog';
 
 export const load: PageServerLoad = () => {

diff --git a/src/routes/tags/+page.svelte b/src/routes/tags/+page.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
+  import clsx from 'clsx';
+
   import type { PageData } from './$types';
+
   import MetaTag from '$lib/components/MetaTags.svelte';
-  import clsx from 'clsx';
 
   export let data: PageData;
 </script>

diff --git a/src/routes/tags/[tag]/+page.server.ts b/src/routes/tags/[tag]/+page.server.ts
@@ -1,4 +1,5 @@
 import type { PageServerLoad } from './$types';
+
 import { getPosts, pickPostInfo } from '$lib/utils/blog';
 
 export const load: PageServerLoad = ({ params: { tag } }) => ({

diff --git a/src/routes/tags/[tag]/+page.svelte b/src/routes/tags/[tag]/+page.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type { PageData } from './$types';
-  import PostList from '$lib/components/PostList.svelte';
+
   import MetaTag from '$lib/components/MetaTags.svelte';
+  import PostList from '$lib/components/PostList.svelte';
 
   export let data: PageData;
 </script>

diff --git a/svelte.config.js b/svelte.config.js
@@ -1,6 +1,7 @@
 import adapter from '@sveltejs/adapter-static';
-import preprocess from 'svelte-preprocess';
 import autoprefixer from 'autoprefixer';
+import preprocess from 'svelte-preprocess';
+
 import mdsvexConfig from './mdsvex.config.js';
 
 /** @type {import('@sveltejs/kit').Config} */