feat(desktop): remove react-google-recaptcha-v3

DIYgod · DIYgod · commit 9094581f0ad1 · 2025-05-26T11:39:27.000+08:00
diff --git a/apps/desktop/layer/renderer/src/hooks/biz/useDailyTask.ts b/apps/desktop/layer/renderer/src/hooks/biz/useDailyTask.ts
diff --git a/apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx b/apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx
@@ -33,7 +33,6 @@ import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
 import { DeclarativeModal } from "~/components/ui/modal/stacked/declarative-modal"
 import { FloatingLayerScope } from "~/constants"
 import { ROOT_CONTAINER_ID } from "~/constants/dom"
-import { useDailyTask } from "~/hooks/biz/useDailyTask"
 import { useBatchUpdateSubscription } from "~/hooks/biz/useSubscriptionActions"
 import { useI18n } from "~/hooks/common"
 import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator"
@@ -66,8 +65,6 @@ export function MainDestopLayout() {
 
   const containerRef = useRef<HTMLDivElement | null>(null)
 
-  useDailyTask()
-
   const sensors = useSensors(
     useSensor(PointerSensor, {
       activationConstraint: {
diff --git a/apps/desktop/layer/renderer/src/modules/app-layout/feed-column/index.mobile.tsx b/apps/desktop/layer/renderer/src/modules/app-layout/feed-column/index.mobile.tsx
@@ -3,14 +3,12 @@ import { PresentSheet } from "@follow/components/ui/sheet/Sheet.js"
 import { Outlet } from "react-router"
 
 import { useLoginModalShow, useWhoami } from "~/atoms/user"
-import { useDailyTask } from "~/hooks/biz/useDailyTask"
 import { LoginModalContent } from "~/modules/auth/LoginModalContent"
 import { UpdateNotice } from "~/modules/update-notice/UpdateNotice.mobile"
 
 import { NewUserGuide } from "./index.shared"
 
 export const MobileRootLayout = () => {
-  useDailyTask()
   const isAuthFail = useLoginModalShow()
   const user = useWhoami()
   return (
diff --git a/apps/desktop/layer/renderer/src/providers/root-providers.tsx b/apps/desktop/layer/renderer/src/providers/root-providers.tsx
@@ -4,13 +4,11 @@ import { EventProvider } from "@follow/components/providers/event-provider.js"
 import { StableRouterProvider } from "@follow/components/providers/stable-router-provider.js"
 import { Toaster } from "@follow/components/ui/toast/index.jsx"
 import { IN_ELECTRON } from "@follow/shared/constants"
-import { env } from "@follow/shared/env.desktop"
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client"
 import { Provider } from "jotai"
 import type { FC, PropsWithChildren } from "react"
 import { Suspense } from "react"
-import { GoogleReCaptchaProvider } from "react-google-recaptcha-v3"
 
 import { ModalStackProvider } from "~/components/ui/modal"
 import { jotaiStore } from "~/lib/jotai"
@@ -33,50 +31,44 @@ import { SettingSync } from "./setting-sync"
 import { UserProvider } from "./user-provider"
 
 export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
-  <GoogleReCaptchaProvider
-    reCaptchaKey={env.VITE_RECAPTCHA_V3_SITE_KEY}
-    useEnterprise={true}
-    useRecaptchaNet={true}
-  >
-    <Provider store={jotaiStore}>
-      <MotionProvider>
-        <PersistQueryClientProvider persistOptions={persistConfig} client={queryClient}>
-          <GlobalFocusableProvider>
-            <HotkeyProvider>
-              <I18nProvider>
-                <ModalStackProvider>
-                  <Toaster />
-                  <EventProvider />
+  <Provider store={jotaiStore}>
+    <MotionProvider>
+      <PersistQueryClientProvider persistOptions={persistConfig} client={queryClient}>
+        <GlobalFocusableProvider>
+          <HotkeyProvider>
+            <I18nProvider>
+              <ModalStackProvider>
+                <Toaster />
+                <EventProvider />
 
-                  <UserProvider />
-                  <ServerConfigsProvider />
+                <UserProvider />
+                <ServerConfigsProvider />
 
-                  <StableRouterProvider />
-                  <SettingSync />
-                  <FollowCommandManager />
+                <StableRouterProvider />
+                <SettingSync />
+                <FollowCommandManager />
 
-                  {import.meta.env.DEV && <Devtools />}
+                {import.meta.env.DEV && <Devtools />}
 
-                  {children}
+                {children}
 
-                  <Suspense>
-                    <LazyExtensionExposeProvider />
-                    <LazyContextMenuProvider />
-                    <LazyLottieRenderContainer />
-                    <LazyExternalJumpInProvider />
-                    <LazyReloadPrompt />
-                    {!IN_ELECTRON && <LazyPWAPrompt />}
-                  </Suspense>
-                </ModalStackProvider>
-              </I18nProvider>
-            </HotkeyProvider>
-          </GlobalFocusableProvider>
+                <Suspense>
+                  <LazyExtensionExposeProvider />
+                  <LazyContextMenuProvider />
+                  <LazyLottieRenderContainer />
+                  <LazyExternalJumpInProvider />
+                  <LazyReloadPrompt />
+                  {!IN_ELECTRON && <LazyPWAPrompt />}
+                </Suspense>
+              </ModalStackProvider>
+            </I18nProvider>
+          </HotkeyProvider>
+        </GlobalFocusableProvider>
 
-          <InvalidateQueryProvider />
-        </PersistQueryClientProvider>
-      </MotionProvider>
-    </Provider>
-  </GoogleReCaptchaProvider>
+        <InvalidateQueryProvider />
+      </PersistQueryClientProvider>
+    </MotionProvider>
+  </Provider>
 )
 
 const Devtools = () =>
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -35,8 +35,7 @@
   },
   "dependencies": {
     "@hcaptcha/react-hcaptcha": "1.12.0",
-    "cookie-es": "2.0.0",
-    "react-google-recaptcha-v3": "1.10.1"
+    "cookie-es": "2.0.0"
   },
   "devDependencies": {
     "@clack/prompts": "0.10.1",
diff --git a/packages/internal/shared/src/env.desktop.ts b/packages/internal/shared/src/env.desktop.ts
@@ -19,7 +19,6 @@ export const env = createEnv({
     VITE_OPENPANEL_CLIENT_ID: z.string().optional(),
     VITE_OPENPANEL_API_URL: z.string().url().optional(),
 
-    VITE_RECAPTCHA_V3_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.RECAPTCHA_V3_SITE_KEY),
     VITE_HCAPTCHA_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.HCAPTCHA_SITE_KEY),
   },
 
diff --git a/packages/internal/shared/src/env.ssr.ts b/packages/internal/shared/src/env.ssr.ts
@@ -26,7 +26,6 @@ export const env = createEnv({
     VITE_WEB_PROD_URL: z.string().optional(),
     VITE_WEB_DEV_URL: z.string().optional(),
 
-    VITE_RECAPTCHA_V3_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.RECAPTCHA_V3_SITE_KEY),
     VITE_HCAPTCHA_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.HCAPTCHA_SITE_KEY),
   },
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
