Skip to content

Commit 566e9ee

Browse files
authored
Merge pull request #3 from 2skydev/dev
fix(import-sort): import 정렬 적용
2 parents 12796f6 + 85bff22 commit 566e9ee

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"^\\..+$"
1919
],
2020
"importOrderSeparation": true,
21-
"importOrderParserPlugins": ["typescript", "decorators", "jsx"]
21+
"importOrderParserPlugins": ["typescript", "decorators", "jsx"],
22+
"plugins": ["@trivago/prettier-plugin-sort-imports"]
2223
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
1616
"typecheck": "pnpm typecheck:node && pnpm typecheck:web",
1717
"postinstall": "electron-builder install-app-deps",
18-
"format": "prettier --write .",
18+
"format": "prettier --write ./src",
1919
"g": "node generator.mjs"
2020
},
2121
"dependencies": {
@@ -64,4 +64,4 @@
6464
"typescript": "^5.4.5",
6565
"vite": "^5.2.11"
6666
}
67-
}
67+
}

src/main/modules/electron/electron.controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { app } from 'electron'
2+
13
import { Injectable } from '@nestjs/common'
24
import i18next from 'i18next'
35

@@ -7,7 +9,6 @@ import { IPCSender } from '@main/modules/electron/decorators/ipc-sender.decorato
79
import { ELECTRON_MAIN_WINDOW_KEY } from '@main/modules/electron/electron.constants'
810
import { ElectronService } from '@main/modules/electron/electron.service'
911
import type { AppControlAction } from '@main/modules/electron/types/app-control.type'
10-
import { app } from 'electron'
1112

1213
@Injectable()
1314
export class ElectronController {

src/main/modules/update/update.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Module } from '@nestjs/common'
22

33
import { ElectronModule } from '@main/modules/electron/electron.module'
4-
54
import { UpdateController } from '@main/modules/update/update.controller'
65
import { UpdateService } from '@main/modules/update/update.service'
76

src/renderer/src/index.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import FileSystemRouter from '@renderer/components/FileSystemRouter/FileSystemRouter'
2-
import i18next from 'i18next'
3-
41
import ReactDOM from 'react-dom/client'
52
import { initReactI18next } from 'react-i18next'
63

4+
import i18next from 'i18next'
5+
6+
import FileSystemRouter from '@renderer/components/FileSystemRouter/FileSystemRouter'
7+
78
const currentResource = await window.electron.getCurrentI18nextResource()
89

910
await i18next.use(initReactI18next).init({

src/renderer/src/pages/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import '@renderer/assets/main.css'
1+
import { Link } from 'react-router-dom'
22

3-
import Versions from '@renderer/components/Versions'
43
import electronLogo from '@renderer/assets/electron.svg'
5-
import { Link } from 'react-router-dom'
4+
import '@renderer/assets/main.css'
5+
import Versions from '@renderer/components/Versions'
66

77
function HomePage(): JSX.Element {
88
return (

src/renderer/src/pages/windows/update-loading.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { useEffect, useState } from 'react'
22
import { useTranslation } from 'react-i18next'
3-
import '@renderer/assets/update-loading.css'
4-
import logoImage from '@renderer/assets/electron.svg'
3+
54
import useSWR from 'swr'
65

6+
import logoImage from '@renderer/assets/electron.svg'
7+
import '@renderer/assets/update-loading.css'
8+
79
const UpdateLoadingPage = () => {
810
const { t } = useTranslation('translation', {
911
keyPrefix: 'renderer.updateLoading',

0 commit comments

Comments
 (0)