From 967b37ca376bcaa4cb93ec8af4ef15cb2359c2a7 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Tue, 1 Jul 2025 16:50:47 +0800 Subject: [PATCH] Revert "fix(desktop): electron mas" This reverts commit 5c9b8acad6048779b38b0e76aac60f9bd66b43fe. --- apps/desktop/layer/main/preload/index.d.ts | 1 - apps/desktop/layer/main/preload/index.ts | 3 --- apps/desktop/layer/renderer/global.d.ts | 1 - apps/desktop/layer/renderer/src/atoms/server-configs.ts | 6 +++++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/desktop/layer/main/preload/index.d.ts b/apps/desktop/layer/main/preload/index.d.ts index 9b776bddd..d46299e1b 100644 --- a/apps/desktop/layer/main/preload/index.d.ts +++ b/apps/desktop/layer/main/preload/index.d.ts @@ -5,6 +5,5 @@ declare global { electron?: ElectronAPI api?: { canWindowBlur: boolean } platform: NodeJS.Platform - mas: boolean } } diff --git a/apps/desktop/layer/main/preload/index.ts b/apps/desktop/layer/main/preload/index.ts index f1e231445..d5590bdc4 100644 --- a/apps/desktop/layer/main/preload/index.ts +++ b/apps/desktop/layer/main/preload/index.ts @@ -39,7 +39,6 @@ if (process.contextIsolated) { contextBridge.exposeInMainWorld("electron", electronAPI) contextBridge.exposeInMainWorld("api", api) contextBridge.exposeInMainWorld("platform", process.platform) - contextBridge.exposeInMainWorld("mas", process.mas) } catch (error) { console.error(error) } @@ -50,8 +49,6 @@ if (process.contextIsolated) { window.api = api // @ts-ignore (define in dts) window.platform = process.platform - // @ts-ignore (define in dts) - window.mas = process.mas Object.defineProperty(window.navigator, "clipboard", { get: () => { diff --git a/apps/desktop/layer/renderer/global.d.ts b/apps/desktop/layer/renderer/global.d.ts index 71711fa17..571d94de2 100644 --- a/apps/desktop/layer/renderer/global.d.ts +++ b/apps/desktop/layer/renderer/global.d.ts @@ -5,7 +5,6 @@ declare global { electron?: ElectronAPI api?: { canWindowBlur: boolean } platform: NodeJS.Platform - mas: boolean } export const APP_NAME = "Folo" } diff --git a/apps/desktop/layer/renderer/src/atoms/server-configs.ts b/apps/desktop/layer/renderer/src/atoms/server-configs.ts index 87fc1106a..418dc7191 100644 --- a/apps/desktop/layer/renderer/src/atoms/server-configs.ts +++ b/apps/desktop/layer/renderer/src/atoms/server-configs.ts @@ -10,5 +10,9 @@ export const [, , useServerConfigs, , getServerConfigs, setServerConfigs] = crea export const useIsInMASReview = () => { const serverConfigs = useServerConfigs() - return window.mas && serverConfigs?.MAS_IN_REVIEW_VERSION === PKG.version + return ( + typeof process !== "undefined" && + process.mas && + serverConfigs?.MAS_IN_REVIEW_VERSION === PKG.version + ) }