fix: cleanup rn global env and enhance setting auto enabled logci

Innei · Innei · commit 6b4b1f37f324 · 2025-05-20T20:04:42.000+08:00
Signed-off-by: Innei &lt;tukon479@gmail.com&gt;
diff --git a/apps/desktop/layer/renderer/index.html b/apps/desktop/layer/renderer/index.html
@@ -62,8 +62,7 @@
       setTheme()
       // Can not get window.electron so check userAgent
       const isElectron = navigator.userAgent.includes("Electron")
-      const isRN = window.__RN__
-      document.documentElement.dataset.buildType = isRN ? "rn" : isElectron ? "electron" : "web"
+      document.documentElement.dataset.buildType = isElectron ? "electron" : "web"
     </script>
     <script>
       const isMobile = window.innerWidth < 1024
diff --git a/apps/desktop/layer/renderer/src/atoms/settings/general.ts b/apps/desktop/layer/renderer/src/atoms/settings/general.ts
@@ -10,7 +10,7 @@ import { getDefaultLanguage } from "~/lib/language"
 
 export const DEFAULT_ACTION_LANGUAGE = "default"
 
-const createDefaultSettings = (): GeneralSettings => ({
+export const createDefaultGeneralSettings = (): GeneralSettings => ({
   ...defaultGeneralSettings,
   language: getDefaultLanguage(),
 })
@@ -26,7 +26,7 @@ const {
   useSettingValue: useGeneralSettingValueInternal,
 
   settingAtom: __generalSettingAtom,
-} = createSettingAtom("general", createDefaultSettings)
+} = createSettingAtom("general", createDefaultGeneralSettings)
 
 const [
   useGeneralSettingKey,
diff --git a/apps/desktop/layer/renderer/src/atoms/settings/ui.ts b/apps/desktop/layer/renderer/src/atoms/settings/ui.ts
@@ -11,7 +11,7 @@ import { DEFAULT_ACTION_ORDER } from "~/modules/customize-toolbar/constant"
 
 import { hookEnhancedSettings } from "./general"
 
-export const createDefaultSettings = (): UISettings => ({
+export const createDefaultUISettings = (): UISettings => ({
   ...defaultUISettings,
 
   // Action Order
@@ -33,7 +33,7 @@ const {
   getSettings: getUISettingsInternal,
   useSettingValue: useUISettingValueInternal,
   settingAtom: __uiSettingAtom,
-} = createSettingAtom("ui", createDefaultSettings)
+} = createSettingAtom("ui", createDefaultUISettings)
 
 const [useUISettingKey, useUISettingSelector, useUISettingKeys, getUISettings, useUISettingValue] =
   hookEnhancedSettings(
diff --git a/apps/desktop/layer/renderer/src/components/common/NotFound.tsx b/apps/desktop/layer/renderer/src/components/common/NotFound.tsx
@@ -44,7 +44,7 @@ export const NotFound = () => {
   }, [])
   const navigate = useNavigate()
 
-  if (window.__RN__ && location.pathname.endsWith("/index.html")) {
+  if (location.pathname.endsWith("/index.html")) {
     return <Navigate to="/" />
   }
 
diff --git a/apps/desktop/layer/renderer/src/global.d.ts b/apps/desktop/layer/renderer/src/global.d.ts
@@ -18,10 +18,7 @@ declare global {
   export const ELECTRON: boolean
   export interface Window {
     SENTRY_RELEASE: typeof SENTRY_RELEASE
-    /**
-     * @link apps/mobile/src/components/common/FollowWebView.tsx
-     */
-    __RN__?: boolean
+
     ReactNativeWebView?: {
       postMessage: (message: string) => void
     }
diff --git a/apps/desktop/layer/renderer/src/initialize/migrates/v/v1.ts b/apps/desktop/layer/renderer/src/initialize/migrates/v/v1.ts
@@ -1,7 +1,11 @@
-import { defaultSettings } from "@follow/shared/settings/defaults"
+import { isEqual } from "es-toolkit/compat"
 
-import { getGeneralSettings, setGeneralSetting } from "~/atoms/settings/general"
-import { getUISettings } from "~/atoms/settings/ui"
+import {
+  createDefaultGeneralSettings,
+  getGeneralSettings,
+  setGeneralSetting,
+} from "~/atoms/settings/general"
+import { createDefaultUISettings, getUISettings } from "~/atoms/settings/ui"
 
 import { defineMigration } from "../helper"
 
@@ -15,7 +19,7 @@ function hasSettingsChanged(
     if (currentValue === undefined) {
       continue
     }
-    if (defaultValue !== currentValue) {
+    if (!isEqual(defaultValue, currentValue)) {
       return true
     }
   }
@@ -29,8 +33,8 @@ export const v1 = defineMigration({
     const uiSettings = getUISettings()
 
     const enabledEnhancedSettings =
-      hasSettingsChanged(uiSettings, defaultSettings.ui) ||
-      hasSettingsChanged(settings, defaultSettings.general)
+      hasSettingsChanged(uiSettings, createDefaultUISettings()) ||
+      hasSettingsChanged(settings, createDefaultGeneralSettings())
 
     setGeneralSetting("enhancedSettings", enabledEnhancedSettings)
   },
diff --git a/apps/desktop/layer/renderer/src/providers/root-providers.tsx b/apps/desktop/layer/renderer/src/providers/root-providers.tsx
@@ -63,7 +63,7 @@ export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
                   <LazyLottieRenderContainer />
                   <LazyExternalJumpInProvider />
                   <LazyReloadPrompt />
-                  {!window.__RN__ && <LazyPWAPrompt />}
+                  {!IN_ELECTRON && <LazyPWAPrompt />}
                 </Suspense>
               </ModalStackProvider>
             </I18nProvider>
diff --git a/apps/desktop/layer/renderer/src/queries/auth.ts b/apps/desktop/layer/renderer/src/queries/auth.ts
@@ -77,22 +77,15 @@ export const handleSessionChanges = () => {
 }
 
 export const signOut = async () => {
-  if (window.__RN__) {
-    window.ReactNativeWebView?.postMessage("sign-out")
-    return
-  }
-
   // Clear query cache
   localStorage.removeItem(QUERY_PERSIST_KEY)
 
-  // setLoginModalShow(true)
   setWhoami(null)
+  // clear local store data
+  await clearLocalPersistStoreData()
 
   // Clear local storage
   clearStorage()
-
-  // clear local store data
-  await clearLocalPersistStoreData()
   // Sign out
   await tipcClient?.signOut()
   await signOutFn()
diff --git a/apps/desktop/layer/renderer/src/router.tsx b/apps/desktop/layer/renderer/src/router.tsx
@@ -11,9 +11,7 @@ const globTree = import.meta.glob("./pages/**/*.tsx")
 const tree = buildGlobRoutes(globTree)
 
 let routerCreator =
-  IN_ELECTRON || window.__RN__ || globalThis["__DEBUG_PROXY__"]
-    ? createHashRouter
-    : createBrowserRouter
+  IN_ELECTRON || globalThis["__DEBUG_PROXY__"] ? createHashRouter : createBrowserRouter
 if (window.SENTRY_RELEASE) {
   routerCreator = wrapCreateBrowserRouterV7(routerCreator)
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export const NotFound = () => {`
`44`	`44`	`}, [])`
`45`	`45`	`const navigate = useNavigate()`
`46`	`46`
`47`		`- if (window.__RN__ && location.pathname.endsWith("/index.html")) {`
	`47`	`+ if (location.pathname.endsWith("/index.html")) {`
`48`	`48`	`return <Navigate to="/" />`
`49`	`49`	`}`
`50`	`50`