Skip to content

Commit 9094581

Browse files
DIYgodDIYgod
committed
feat(desktop): remove react-google-recaptcha-v3
1 parent f687688 commit 9094581

File tree

8 files changed

+179
-221
lines changed

8 files changed

+179
-221
lines changed

‎apps/desktop/layer/renderer/src/hooks/biz/useDailyTask.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
3333
import { DeclarativeModal } from "~/components/ui/modal/stacked/declarative-modal"
3434
import { FloatingLayerScope } from "~/constants"
3535
import { ROOT_CONTAINER_ID } from "~/constants/dom"
36-
import { useDailyTask } from "~/hooks/biz/useDailyTask"
3736
import { useBatchUpdateSubscription } from "~/hooks/biz/useSubscriptionActions"
3837
import { useI18n } from "~/hooks/common"
3938
import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator"
@@ -66,8 +65,6 @@ export function MainDestopLayout() {
6665

6766
const containerRef = useRef<HTMLDivElement | null>(null)
6867

69-
useDailyTask()
70-
7168
const sensors = useSensors(
7269
useSensor(PointerSensor, {
7370
activationConstraint: {

‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/index.mobile.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import { PresentSheet } from "@follow/components/ui/sheet/Sheet.js"
33
import { Outlet } from "react-router"
44

55
import { useLoginModalShow, useWhoami } from "~/atoms/user"
6-
import { useDailyTask } from "~/hooks/biz/useDailyTask"
76
import { LoginModalContent } from "~/modules/auth/LoginModalContent"
87
import { UpdateNotice } from "~/modules/update-notice/UpdateNotice.mobile"
98

109
import { NewUserGuide } from "./index.shared"
1110

1211
export const MobileRootLayout = () => {
13-
useDailyTask()
1412
const isAuthFail = useLoginModalShow()
1513
const user = useWhoami()
1614
return (

‎apps/desktop/layer/renderer/src/providers/root-providers.tsx

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import { EventProvider } from "@follow/components/providers/event-provider.js"
44
import { StableRouterProvider } from "@follow/components/providers/stable-router-provider.js"
55
import { Toaster } from "@follow/components/ui/toast/index.jsx"
66
import { IN_ELECTRON } from "@follow/shared/constants"
7-
import { env } from "@follow/shared/env.desktop"
87
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
98
import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client"
109
import { Provider } from "jotai"
1110
import type { FC, PropsWithChildren } from "react"
1211
import { Suspense } from "react"
13-
import { GoogleReCaptchaProvider } from "react-google-recaptcha-v3"
1412

1513
import { ModalStackProvider } from "~/components/ui/modal"
1614
import { jotaiStore } from "~/lib/jotai"
@@ -33,50 +31,44 @@ import { SettingSync } from "./setting-sync"
3331
import { UserProvider } from "./user-provider"
3432

3533
export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
36-
<GoogleReCaptchaProvider
37-
reCaptchaKey={env.VITE_RECAPTCHA_V3_SITE_KEY}
38-
useEnterprise={true}
39-
useRecaptchaNet={true}
40-
>
41-
<Provider store={jotaiStore}>
42-
<MotionProvider>
43-
<PersistQueryClientProvider persistOptions={persistConfig} client={queryClient}>
44-
<GlobalFocusableProvider>
45-
<HotkeyProvider>
46-
<I18nProvider>
47-
<ModalStackProvider>
48-
<Toaster />
49-
<EventProvider />
34+
<Provider store={jotaiStore}>
35+
<MotionProvider>
36+
<PersistQueryClientProvider persistOptions={persistConfig} client={queryClient}>
37+
<GlobalFocusableProvider>
38+
<HotkeyProvider>
39+
<I18nProvider>
40+
<ModalStackProvider>
41+
<Toaster />
42+
<EventProvider />
5043

51-
<UserProvider />
52-
<ServerConfigsProvider />
44+
<UserProvider />
45+
<ServerConfigsProvider />
5346

54-
<StableRouterProvider />
55-
<SettingSync />
56-
<FollowCommandManager />
47+
<StableRouterProvider />
48+
<SettingSync />
49+
<FollowCommandManager />
5750

58-
{import.meta.env.DEV && <Devtools />}
51+
{import.meta.env.DEV && <Devtools />}
5952

60-
{children}
53+
{children}
6154

62-
<Suspense>
63-
<LazyExtensionExposeProvider />
64-
<LazyContextMenuProvider />
65-
<LazyLottieRenderContainer />
66-
<LazyExternalJumpInProvider />
67-
<LazyReloadPrompt />
68-
{!IN_ELECTRON && <LazyPWAPrompt />}
69-
</Suspense>
70-
</ModalStackProvider>
71-
</I18nProvider>
72-
</HotkeyProvider>
73-
</GlobalFocusableProvider>
55+
<Suspense>
56+
<LazyExtensionExposeProvider />
57+
<LazyContextMenuProvider />
58+
<LazyLottieRenderContainer />
59+
<LazyExternalJumpInProvider />
60+
<LazyReloadPrompt />
61+
{!IN_ELECTRON && <LazyPWAPrompt />}
62+
</Suspense>
63+
</ModalStackProvider>
64+
</I18nProvider>
65+
</HotkeyProvider>
66+
</GlobalFocusableProvider>
7467

75-
<InvalidateQueryProvider />
76-
</PersistQueryClientProvider>
77-
</MotionProvider>
78-
</Provider>
79-
</GoogleReCaptchaProvider>
68+
<InvalidateQueryProvider />
69+
</PersistQueryClientProvider>
70+
</MotionProvider>
71+
</Provider>
8072
)
8173

8274
const Devtools = () =>

‎apps/desktop/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
},
3636
"dependencies": {
3737
"@hcaptcha/react-hcaptcha": "1.12.0",
38-
"cookie-es": "2.0.0",
39-
"react-google-recaptcha-v3": "1.10.1"
38+
"cookie-es": "2.0.0"
4039
},
4140
"devDependencies": {
4241
"@clack/prompts": "0.10.1",

‎packages/internal/shared/src/env.desktop.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export const env = createEnv({
1919
VITE_OPENPANEL_CLIENT_ID: z.string().optional(),
2020
VITE_OPENPANEL_API_URL: z.string().url().optional(),
2121

22-
VITE_RECAPTCHA_V3_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.RECAPTCHA_V3_SITE_KEY),
2322
VITE_HCAPTCHA_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.HCAPTCHA_SITE_KEY),
2423
},
2524

‎packages/internal/shared/src/env.ssr.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export const env = createEnv({
2626
VITE_WEB_PROD_URL: z.string().optional(),
2727
VITE_WEB_DEV_URL: z.string().optional(),
2828

29-
VITE_RECAPTCHA_V3_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.RECAPTCHA_V3_SITE_KEY),
3029
VITE_HCAPTCHA_SITE_KEY: z.string().default(DEFAULT_VALUES.PROD.HCAPTCHA_SITE_KEY),
3130
},
3231

0 commit comments

Comments
 (0)