diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index ea61e1d0e..5cdaec141 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -29,8 +29,6 @@ env: VITE_WEB_URL: ${{ vars.VITE_WEB_URL }} VITE_API_URL: ${{ vars.VITE_API_URL }} VITE_SENTRY_DSN: ${{ vars.VITE_SENTRY_DSN }} - VITE_OPENPANEL_CLIENT_ID: ${{ vars.VITE_OPENPANEL_CLIENT_ID }} - VITE_OPENPANEL_API_URL: ${{ vars.VITE_OPENPANEL_API_URL }} VITE_FIREBASE_CONFIG: ${{ vars.VITE_FIREBASE_CONFIG }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} NODE_OPTIONS: --max-old-space-size=8192 diff --git a/.github/workflows/deploy-cloudflare.yml b/.github/workflows/deploy-cloudflare.yml index 923d608fc..bab06a506 100644 --- a/.github/workflows/deploy-cloudflare.yml +++ b/.github/workflows/deploy-cloudflare.yml @@ -24,8 +24,6 @@ jobs: runs-on: ubuntu-latest env: VITE_SENTRY_DSN: ${{ vars.VITE_SENTRY_DSN }} - VITE_OPENPANEL_CLIENT_ID: ${{ vars.VITE_OPENPANEL_CLIENT_ID }} - VITE_OPENPANEL_API_URL: ${{ vars.VITE_OPENPANEL_API_URL }} VITE_FIREBASE_CONFIG: ${{ vars.VITE_FIREBASE_CONFIG }} strategy: matrix: diff --git a/apps/desktop/.env.example b/apps/desktop/.env.example index b6820e7b6..2b6bcf30c 100644 --- a/apps/desktop/.env.example +++ b/apps/desktop/.env.example @@ -4,8 +4,6 @@ VITE_IMGPROXY_URL=http://localhost:2873 VITE_SENTRY_DSN= VITE_BUILD_TYPE=production VITE_INBOXES_EMAIL=@follow.re -VITE_OPENPANEL_CLIENT_ID= -VITE_OPENPANEL_API_URL= VITE_EDITOR=cursor diff --git a/apps/desktop/layer/main/package.json b/apps/desktop/layer/main/package.json index 8a7140c8e..715a715d0 100644 --- a/apps/desktop/layer/main/package.json +++ b/apps/desktop/layer/main/package.json @@ -29,7 +29,6 @@ "@follow-app/readability": "workspace:*", "@follow/shared": "workspace:*", "@follow/utils": "workspace:*", - "@openpanel/web": "1.0.7", "builder-util-runtime": "9.5.1", "electron-context-menu": "4.1.1", "electron-ipc-decorator": "0.2.0", diff --git a/apps/desktop/layer/main/src/lib/op.ts b/apps/desktop/layer/main/src/lib/op.ts deleted file mode 100644 index b00a8c19c..000000000 --- a/apps/desktop/layer/main/src/lib/op.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { env } from "@follow/shared/env.desktop" -import { OpenPanel } from "@openpanel/web" -import { app } from "electron" - -import { DEVICE_ID } from "~/constants/system" - -export const op = new OpenPanel({ - clientId: env.VITE_OPENPANEL_CLIENT_ID ?? "", - trackScreenViews: false, - trackOutgoingLinks: false, - trackAttributes: false, - trackHashChanges: false, - apiUrl: env.VITE_OPENPANEL_API_URL, -}) - -op.setGlobalProperties({ - device_id: DEVICE_ID, - app_version: app.getVersion(), - build: "electron", -}) diff --git a/apps/desktop/layer/main/src/manager/bootstrap.ts b/apps/desktop/layer/main/src/manager/bootstrap.ts index 2d0205ed9..baf616f8d 100644 --- a/apps/desktop/layer/main/src/manager/bootstrap.ts +++ b/apps/desktop/layer/main/src/manager/bootstrap.ts @@ -23,7 +23,6 @@ import { AppManager } from "./app" const apiURL = process.env["VITE_API_URL"] || import.meta.env.VITE_API_URL const buildSafeHeaders = createBuildSafeHeaders(env.VITE_WEB_URL, [ - env.VITE_OPENPANEL_API_URL || "", IMAGE_PROXY_URL, env.VITE_API_URL, "https://readwise.io", diff --git a/apps/desktop/layer/renderer/package.json b/apps/desktop/layer/renderer/package.json index 9e85f7bc6..d3aca995f 100644 --- a/apps/desktop/layer/renderer/package.json +++ b/apps/desktop/layer/renderer/package.json @@ -28,7 +28,6 @@ "@lexical/markdown": "0.40.0", "@lexical/react": "0.40.0", "@number-flow/react": "0.5.11", - "@openpanel/web": "1.0.7", "@radix-ui/react-avatar": "1.1.11", "@radix-ui/react-context-menu": "2.2.16", "@radix-ui/react-dialog": "1.1.15", diff --git a/apps/desktop/layer/renderer/src/initialize/op.ts b/apps/desktop/layer/renderer/src/initialize/op.ts deleted file mode 100644 index 9c29c408c..000000000 --- a/apps/desktop/layer/renderer/src/initialize/op.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { env } from "@follow/shared/env.desktop" -import { OpenPanel } from "@openpanel/web" - -export const op = new OpenPanel({ - clientId: env.VITE_OPENPANEL_CLIENT_ID ?? "", - trackScreenViews: true, - trackOutgoingLinks: true, - trackAttributes: true, - apiUrl: env.VITE_OPENPANEL_API_URL, -}) diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts index 9f9613ab6..f0258077c 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/desktop/vite.config.ts @@ -290,8 +290,6 @@ export default ({ mode }) => { "@tanstack/query-sync-storage-persister", ], ["tldts"], - - ["@openpanel/web"], ["zod", "react-hook-form", "@hookform/resolvers"], ]), diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 883098b16..2da4684e1 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -40,7 +40,6 @@ "@follow/utils": "workspace:*", "@gorhom/portal": "1.0.14", "@hookform/resolvers": "5.2.2", - "@openpanel/sdk": "1.0.4", "@react-native-community/image-editor": "4.3.0", "@react-native-firebase/analytics": "22.2.1", "@react-native-firebase/app": "22.2.1", diff --git a/apps/mobile/src/initialize/analytics.ts b/apps/mobile/src/initialize/analytics.ts index 4e777fcda..b182cceba 100644 --- a/apps/mobile/src/initialize/analytics.ts +++ b/apps/mobile/src/initialize/analytics.ts @@ -35,14 +35,4 @@ export const initAnalytics = async () => { if (user) { tracker.identify(user as AuthUser) } - - // op.setGlobalProperties({ - // build: "rn", - // version: nativeApplicationVersion, - // buildId: nativeBuildVersion, - // }) - - // op.setHeaders({ - // "User-Agent": await getUserAgent(), - // }) } diff --git a/apps/mobile/src/lib/op.ts b/apps/mobile/src/lib/op.ts deleted file mode 100644 index ca48411e5..000000000 --- a/apps/mobile/src/lib/op.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { OpenPanel } from "@follow/tracker/src/op" - -import { proxyEnv } from "./proxy-env" - -export const op = new OpenPanel({ - clientId: proxyEnv.OPENPANEL_CLIENT_ID ?? "", - apiUrl: proxyEnv.OPENPANEL_API_URL, - headers: { - Origin: "https://app.folo.is", - }, - sdk: "react-native", - sdkVersion: "1.0.0", -}) diff --git a/apps/ssr/client/initialize/analytics.ts b/apps/ssr/client/initialize/analytics.ts deleted file mode 100644 index 976884bee..000000000 --- a/apps/ssr/client/initialize/analytics.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { env } from "@follow/shared/env.ssr" -import { setOpenPanelTracker } from "@follow/tracker" - -import { op } from "./op" - -export const initAnalytics = () => { - if (env.VITE_OPENPANEL_CLIENT_ID === undefined) return - - setOpenPanelTracker(op) - op.setGlobalProperties({ - build: "external-web", - hash: GIT_COMMIT_SHA, - }) -} diff --git a/apps/ssr/client/initialize/index.ts b/apps/ssr/client/initialize/index.ts index 397ca9655..75701835a 100644 --- a/apps/ssr/client/initialize/index.ts +++ b/apps/ssr/client/initialize/index.ts @@ -1,11 +1,9 @@ import { initI18n } from "@client/i18n" import { initializeDayjs } from "@follow/components/dayjs" -import { initAnalytics } from "./analytics" import { initSentry } from "./sentry" export const initialize = async () => { - initAnalytics() initializeDayjs() await Promise.all([initI18n(), initSentry()]) } diff --git a/apps/ssr/client/initialize/op.ts b/apps/ssr/client/initialize/op.ts deleted file mode 100644 index 489367073..000000000 --- a/apps/ssr/client/initialize/op.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { env } from "@follow/shared/env.ssr" -import { OpenPanel } from "@openpanel/web" - -export const op = new OpenPanel({ - clientId: env.VITE_OPENPANEL_CLIENT_ID ?? "", - trackScreenViews: true, - trackOutgoingLinks: true, - trackAttributes: true, - apiUrl: env.VITE_OPENPANEL_API_URL, -}) diff --git a/apps/ssr/index.html b/apps/ssr/index.html index f3211ea16..818e7da55 100644 --- a/apps/ssr/index.html +++ b/apps/ssr/index.html @@ -18,7 +18,7 @@ Folo - +