From d0d4f0564715c1786e71b0f009e86aa3a9dc4b7c Mon Sep 17 00:00:00 2001
From: Innei <tukon479@gmail.com>
Date: Thu, 7 Nov 2024 16:00:13 +0800
Subject: [PATCH] fix: `defineSettingPageData` remove func wrapper

Signed-off-by: Innei <tukon479@gmail.com>
---
 apps/renderer/src/modules/settings/settings-glob.ts | 6 +++---
 apps/renderer/src/modules/settings/utils.ts         | 2 +-
 apps/renderer/vitest.config.ts                      | 2 +-
 apps/server/vite.config.mts                         | 2 +-
 configs/vite.render.config.ts                       | 2 +-
 configs/plugins.ts => plugins/vite/ast.ts           | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename configs/plugins.ts => plugins/vite/ast.ts (100%)

diff --git a/apps/renderer/src/modules/settings/settings-glob.ts b/apps/renderer/src/modules/settings/settings-glob.ts
index 31326bfe5..b34f7cd02 100644
--- a/apps/renderer/src/modules/settings/settings-glob.ts
+++ b/apps/renderer/src/modules/settings/settings-glob.ts
@@ -9,7 +9,7 @@ function getSettings() {
     path: string
     Component: () => JSX.Element
     priority: number
-    loader: () => SettingPageConfig
+    loader: SettingPageConfig
   }[]
   for (const path in map) {
     const prefix = "(settings)"
@@ -27,12 +27,12 @@ function getSettings() {
 
     const Module = map[path] as {
       Component: () => JSX.Element
-      loader: () => SettingPageConfig
+      loader: SettingPageConfig
     }
 
     if (!Module.loader) continue
     settings.push({
-      ...Module.loader(),
+      ...Module.loader,
       Component: Module.Component,
       loader: Module.loader,
       path: p,
diff --git a/apps/renderer/src/modules/settings/utils.ts b/apps/renderer/src/modules/settings/utils.ts
index b679888f1..52803b8ea 100644
--- a/apps/renderer/src/modules/settings/utils.ts
+++ b/apps/renderer/src/modules/settings/utils.ts
@@ -17,6 +17,6 @@ export interface SettingPageConfig {
   hideIf?: (ctx: SettingPageContext) => boolean
   disableIf?: (ctx: SettingPageContext) => [boolean, DisableWhy]
 }
-export const defineSettingPageData = (config: SettingPageConfig) => () => ({
+export const defineSettingPageData = (config: SettingPageConfig) => ({
   ...config,
 })
diff --git a/apps/renderer/vitest.config.ts b/apps/renderer/vitest.config.ts
index 4f30ef8b7..07e54b4ac 100644
--- a/apps/renderer/vitest.config.ts
+++ b/apps/renderer/vitest.config.ts
@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url"
 import tsconfigPath from "vite-tsconfig-paths"
 import { defineProject } from "vitest/config"
 
-import { astPlugin } from "../../configs/plugins"
+import { astPlugin } from "../../plugins/vite/ast"
 
 const pkg = JSON.parse(readFileSync("package.json", "utf8"))
 const __dirname = fileURLToPath(new URL(".", import.meta.url))
diff --git a/apps/server/vite.config.mts b/apps/server/vite.config.mts
index e40fc8834..1489b428e 100644
--- a/apps/server/vite.config.mts
+++ b/apps/server/vite.config.mts
@@ -3,8 +3,8 @@ import { resolve } from "node:path"
 import react from "@vitejs/plugin-react"
 import { defineConfig } from "vite"
 
-import { astPlugin } from "../../configs/plugins"
 import { viteRenderBaseConfig } from "../../configs/vite.render.config"
+import { astPlugin } from "../../plugins/vite/ast"
 
 export default () => {
   return defineConfig({
diff --git a/configs/vite.render.config.ts b/configs/vite.render.config.ts
index 7c9e18c54..a5aeb0a65 100644
--- a/configs/vite.render.config.ts
+++ b/configs/vite.render.config.ts
@@ -7,12 +7,12 @@ import react from "@vitejs/plugin-react"
 import { prerelease } from "semver"
 import type { UserConfig } from "vite"
 
+import { astPlugin } from "../plugins/vite/ast"
 import { circularImportRefreshPlugin } from "../plugins/vite/hmr"
 import { customI18nHmrPlugin } from "../plugins/vite/i18n-hmr"
 import { localesPlugin } from "../plugins/vite/locales"
 import i18nCompleteness from "../plugins/vite/utils/i18n-completeness"
 import { getGitHash } from "../scripts/lib"
-import { astPlugin } from "./plugins"
 
 const pkgDir = resolve(dirname(fileURLToPath(import.meta.url)), "..")
 const pkg = JSON.parse(readFileSync(resolve(pkgDir, "./package.json"), "utf8"))
diff --git a/configs/plugins.ts b/plugins/vite/ast.ts
similarity index 100%
rename from configs/plugins.ts
rename to plugins/vite/ast.ts