chore(electron): temporary remove @sentry/electron due to version mis…

…match (toeverything#7001)
donteatfriedrice · May 21, 2024 · 41c7215 · 41c7215
1 parent d898dae
commit 41c7215
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 860 deletions.
diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json
@@ -44,7 +44,6 @@
     "@electron-forge/shared-types": "^7.3.0",
     "@emotion/react": "^11.11.4",
     "@pengx17/electron-forge-maker-appimage": "^1.2.0",
-    "@sentry/electron": "^5.0.0-beta.0",
     "@sentry/esbuild-plugin": "^2.16.1",
     "@sentry/react": "^8.0.0",
     "@toeverything/infra": "workspace:*",

diff --git a/packages/frontend/electron/renderer/index.tsx b/packages/frontend/electron/renderer/index.tsx
@@ -4,10 +4,10 @@ import '@affine/core/bootstrap/preload';
 import { appConfigProxy } from '@affine/core/hooks/use-app-config-storage';
 import { performanceLogger } from '@affine/core/shared';
 import { apis, events } from '@affine/electron-api';
-import { init, setTags } from '@sentry/electron/renderer';
 import {
-  init as reactInit,
+  init,
   reactRouterV6BrowserTracingIntegration,
+  setTags,
 } from '@sentry/react';
 import { debounce } from 'lodash-es';
 import { StrictMode, useEffect } from 'react';
@@ -38,22 +38,19 @@ function main() {
     performanceMainLogger.info('setup start');
     if (window.SENTRY_RELEASE || environment.isDebug) {
       // https://docs.sentry.io/platforms/javascript/guides/electron/
-      init(
-        {
-          dsn: process.env.SENTRY_DSN,
-          environment: process.env.BUILD_TYPE ?? 'development',
-          integrations: [
-            reactRouterV6BrowserTracingIntegration({
-              useEffect,
-              useLocation,
-              useNavigationType,
-              createRoutesFromChildren,
-              matchRoutes,
-            }),
-          ],
-        },
-        reactInit
-      );
+      init({
+        dsn: process.env.SENTRY_DSN,
+        environment: process.env.BUILD_TYPE ?? 'development',
+        integrations: [
+          reactRouterV6BrowserTracingIntegration({
+            useEffect,
+            useLocation,
+            useNavigationType,
+            createRoutesFromChildren,
+            matchRoutes,
+          }),
+        ],
+      });
       setTags({
         appVersion: runtimeConfig.appVersion,
         editorVersion: runtimeConfig.editorVersion,

diff --git a/packages/frontend/electron/src/main/index.ts b/packages/frontend/electron/src/main/index.ts
@@ -2,7 +2,6 @@ import './security-restrictions';
 
 import path from 'node:path';
 
-import { init, IPCMode } from '@sentry/electron/main';
 import { app } from 'electron';
 
 import { createApplicationMenu } from './application-menu/create';
@@ -13,7 +12,6 @@ import { registerEvents } from './events';
 import { registerHandlers } from './handlers';
 import { logger } from './logger';
 import { registerProtocol } from './protocol';
-import { isOnline } from './ui/handlers';
 import { registerUpdater } from './updater';
 import { launch } from './windows-manager/launcher';
 import { launchStage } from './windows-manager/stage';
@@ -65,17 +63,6 @@ app.on('activate', () => {
 
 setupDeepLink(app);
 
-// https://docs.sentry.io/platforms/javascript/guides/electron/
-if (process.env.SENTRY_DSN) {
-  init({
-    dsn: process.env.SENTRY_DSN,
-    ipcMode: IPCMode.Protocol,
-    transportOptions: {
-      shouldSend: () => isOnline,
-    },
-  });
-}
-
 /**
  * Create app window when background process will be ready
  */

diff --git a/packages/frontend/electron/src/preload/index.ts b/packages/frontend/electron/src/preload/index.ts
@@ -1,2 +1 @@
-import '@sentry/electron/preload';
 import './bootstrap';
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		import '@sentry/electron/preload';
		import './bootstrap';