Merge pull request #3 from 2skydev/dev

fix(import-sort): import 정렬 적용
2skydev · May 26, 2024 · 566e9ee · 566e9ee
2 parents 12796f6 + 85bff22
commit 566e9ee
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -18,5 +18,6 @@
     "^\\..+$"
   ],
   "importOrderSeparation": true,
-  "importOrderParserPlugins": ["typescript", "decorators", "jsx"]
+  "importOrderParserPlugins": ["typescript", "decorators", "jsx"],
+  "plugins": ["@trivago/prettier-plugin-sort-imports"]
 }
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "typecheck": "pnpm typecheck:node && pnpm typecheck:web",
     "postinstall": "electron-builder install-app-deps",
-    "format": "prettier --write .",
+    "format": "prettier --write ./src",
     "g": "node generator.mjs"
   },
   "dependencies": {
@@ -64,4 +64,4 @@
     "typescript": "^5.4.5",
     "vite": "^5.2.11"
   }
-}
+}
diff --git a/src/main/modules/electron/electron.controller.ts b/src/main/modules/electron/electron.controller.ts
@@ -1,3 +1,5 @@
+import { app } from 'electron'
+
 import { Injectable } from '@nestjs/common'
 import i18next from 'i18next'
 
@@ -7,7 +9,6 @@ import { IPCSender } from '@main/modules/electron/decorators/ipc-sender.decorato
 import { ELECTRON_MAIN_WINDOW_KEY } from '@main/modules/electron/electron.constants'
 import { ElectronService } from '@main/modules/electron/electron.service'
 import type { AppControlAction } from '@main/modules/electron/types/app-control.type'
-import { app } from 'electron'
 
 @Injectable()
 export class ElectronController {

diff --git a/src/main/modules/update/update.module.ts b/src/main/modules/update/update.module.ts
@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common'
 
 import { ElectronModule } from '@main/modules/electron/electron.module'
-
 import { UpdateController } from '@main/modules/update/update.controller'
 import { UpdateService } from '@main/modules/update/update.service'
 

diff --git a/src/renderer/src/index.tsx b/src/renderer/src/index.tsx
@@ -1,9 +1,10 @@
-import FileSystemRouter from '@renderer/components/FileSystemRouter/FileSystemRouter'
-import i18next from 'i18next'
-
 import ReactDOM from 'react-dom/client'
 import { initReactI18next } from 'react-i18next'
 
+import i18next from 'i18next'
+
+import FileSystemRouter from '@renderer/components/FileSystemRouter/FileSystemRouter'
+
 const currentResource = await window.electron.getCurrentI18nextResource()
 
 await i18next.use(initReactI18next).init({

diff --git a/src/renderer/src/pages/index.tsx b/src/renderer/src/pages/index.tsx
@@ -1,8 +1,8 @@
-import '@renderer/assets/main.css'
+import { Link } from 'react-router-dom'
 
-import Versions from '@renderer/components/Versions'
 import electronLogo from '@renderer/assets/electron.svg'
-import { Link } from 'react-router-dom'
+import '@renderer/assets/main.css'
+import Versions from '@renderer/components/Versions'
 
 function HomePage(): JSX.Element {
   return (

diff --git a/src/renderer/src/pages/windows/update-loading.tsx b/src/renderer/src/pages/windows/update-loading.tsx
@@ -1,9 +1,11 @@
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import '@renderer/assets/update-loading.css'
-import logoImage from '@renderer/assets/electron.svg'
+
 import useSWR from 'swr'
 
+import logoImage from '@renderer/assets/electron.svg'
+import '@renderer/assets/update-loading.css'
+
 const UpdateLoadingPage = () => {
   const { t } = useTranslation('translation', {
     keyPrefix: 'renderer.updateLoading',