From ae0f5c744ee6f2345703613aa1abb87e8ffdfcb8 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Mon, 4 Sep 2023 19:20:29 +0800 Subject: [PATCH] [ENG-1072] Connect sentry with sourcemaps (#1293) add sourcemaps --- .gitignore | 2 +- apps/desktop/package.json | 5 +++-- apps/desktop/vite.config.ts | 24 ++++++++++++++++++------ packages/config/vite/index.ts | 1 + pnpm-lock.yaml | Bin 895434 -> 899416 bytes 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c60db51ed..09019668a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ cli/turbo.exe storybook-static/ .DS_Store cache -.env +.env* vendor/ data node_modules diff --git a/apps/desktop/package.json b/apps/desktop/package.json index bb56cb90c..90c0352a2 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -19,6 +19,7 @@ "@sd/client": "workspace:*", "@sd/interface": "workspace:*", "@sd/ui": "workspace:*", + "@sentry/vite-plugin": "^2.7.0", "@tanstack/react-query": "^4.24.4", "@tauri-apps/api": "1.3.0", "comlink": "^4.4.1", @@ -38,8 +39,8 @@ "semver": "^7.5.0", "typescript": "^5.0.4", "vite": "^4.0.4", + "vite-plugin-html": "^3.2.0", "vite-plugin-svgr": "^2.2.1", - "vite-tsconfig-paths": "^4.0.3", - "vite-plugin-html": "^3.2.0" + "vite-tsconfig-paths": "^4.0.3" } } diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts index 09c4a5502..44abdf783 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/desktop/vite.config.ts @@ -1,4 +1,5 @@ -import { Plugin, mergeConfig } from 'vite'; +import { sentryVitePlugin } from '@sentry/vite-plugin'; +import { Plugin, defineConfig, loadEnv, mergeConfig } from 'vite'; import baseConfig from '../../packages/config/vite'; const devtoolsPlugin: Plugin = { @@ -16,9 +17,20 @@ const devtoolsPlugin: Plugin = { } }; -export default mergeConfig(baseConfig, { - server: { - port: 8001 - }, - plugins: [devtoolsPlugin] +export default defineConfig(({ mode }) => { + process.env = { ...process.env, ...loadEnv(mode, process.cwd(), '') }; + + return mergeConfig(baseConfig, { + server: { + port: 8001 + }, + plugins: [ + devtoolsPlugin, + sentryVitePlugin({ + authToken: process.env.SENTRY_AUTH_TOKEN, + org: 'spacedriveapp', + project: 'desktop' + }) + ] + }); }); diff --git a/packages/config/vite/index.ts b/packages/config/vite/index.ts index 2889ed7de..07b592b00 100644 --- a/packages/config/vite/index.ts +++ b/packages/config/vite/index.ts @@ -26,6 +26,7 @@ export default defineConfig({ }, root: 'src', build: { + sourcemap: true, outDir: '../dist', assetsDir: '.' }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efa4c6ba8457c9ccb7db5feca7e4d89edc861aad..f79502f7e052d9354ffb69154d7498e6a2ef8bb6 100644 GIT binary patch delta 2192 zcmZ{kZH(J?9mjQdxg?h~U0Y}=NY`Dbjg3cK-$*RB;KK}0u(WX+G+>}650!fhBQFqEiVwAKpNMA$X$=E(uSqK zE&2bK{rmmCpYQiKzeE1;F7istciQ4L+nh#S$>y)?iX%vS_j;e&JALx(YCMvP#P*gx zhkSL%x4Yw8TCC;yj&J4WGvJmO`uOgqurl8iJnXm6UY9hRH#Js?+9u0Mny{6MAmCoj zcZEv0n1IDaEJ49ZT}vjW6i#zZy*MH$biyk*Np@*V(zCs;HmcL4JWOdwzc#?dVWO0f z#~lnMS&@_(H5YEe6IyDfX#-reme#@6fhV$rfYE_xeet+?-?P4qAbS_@JT-s*U!Ky^ z$9j&|S9tSbQ`&WIWb)wNYk_dPJ0S{D+-fpJ2CcGXH{5gVN`hjgqUAX4Db%aUN)n0Y zu^wha=C(6a>>NqOIn;4nUg8A=>2~ZHZ?^JKs=*{&#Byx{G`_rY0o=Y6^n-)9SI>c` z4?O-S73uQkMm!RaMUcS8(RF$2c;4Em&o4F)=X6;5Sp>bTzk`S?1KUjOt8v-{dUks?{RvrhhUtBp4oTr2Fz*v+x z@v!|ExEu0c0~;@U{NRg;6%Y6dv~qd=)`92h68Q6h$G1@L5S4bPn$3~5G*aU+0xD5( zx?)H(xY|kzeSCku9jh)VQUa?^pNT_=}_rZmM}9j)E4A)bxK%H(M%-s zF*0F5VE+rjb+B{)h?PemdF&A#KA@GH7$u`(!Ywg5;qXBYlh6iCI^C3;o>D?ZWSg?- zbj&WfJ!zO6ktgMGFE5XyB}<;snn=azG1FH0POhXhtBo>B#OyTq*3P1W1+ACh5BcOF z0Ut>JJ|2g(9^>%{;O8Epgd2@yiQn9aMPNYQ_Fp-vn9egQs~^5eL=t=KPtNZ}Ze9Z9 zwZIeLz5AYDfA@jMe>`f+X;)jLmc*I}Av$0NG%gns9q@`#XjF~6B%YIqL4y%Ik`*-u$`sA>3;-{`V4^oyzUFlfBIk{E%@03 z&&mG@oGEO#X@MD*5yW8_uENk&hMp<9ZB%Uo;)z@hb8w!YHKbhLtYuSBS+3whEH=)y z^l+sT?kS0}PE%-B&zgEKkF;}zqzItSN*a9rz_WJ3p6a}HJkrA;IP;-w(;g-Ojmu?? zH%fFe*Aiezn#Jn4MJX`KSbZ3al43=Whq+dU%Fl4FkfAxPm&35h$YQ$vl!kZFOs>(z zOIEp+g-6ayCT~HOTP+S0H=Nw z@Pa%3kQaRORc~llVSICi@xSPT@BAtF={8EaQ9>*;`CQS;nN^#QX0?ITT6kx>Ua3ga zVqBqww5!G9^*A)^5g|=NtY_@HZ0j%o76JgXp+RN>b55Ecu&Q|Y)!EnN;s)Y2%}P_$yQr4kyNW_PZhX{YIMwLteqeW ztd6yzDGEm`2F8ullpz+oQa(B?48Ywp-t+V3FV^1sJy5?FI5{7DKk)NaaHqTGnI~@q zxTX0I_5*(r=FhJM?Yeg%dQ>;TtyfN5+bwMe=cVlve|^h)oaVPa;|)`+VHQ~$?Q|f5 zE~7=YFiIq-BsJkHF{3jZxWmpukzO&I>20gE6ko&TaebmzhN3hoDw%XDZQ%K8mZg#q zQ!_`+sWVG;!0A6O#M8gw^?{e3UEHG9LdLgap&Ec6_kCgxL7~Yec*zK@f}2_>F#n|- z`ubzwEEGDmycGlQbb?pg@)Vccd^gpt#!$N6wt2dT=S8Jyr?O%cYmsB3FQr9Pm&>U} w#ZlWvzhct^HA*s3QRXz$HDgjLHK-@U)Uca@Nj{8aBye%vcYaQMDYO&$FKR95<^TWy delta 271 zcmV+q0r39V@;1uTHn39%l^O;XlWsp3gU$zs&IbX9&Ibaw&IbdpUz12g42P0u1GkcA z1YnZ4Jo^Mg0hdn!1qZb>1segERs;pXm)!;h2$$dm1^2f;2?aAulSo7mm)SxDB$vSA z1{0Utt_2I1@L2^1m(NlK47cA^1xQnqNJJ2q*+K*+hi0h-w`QpZpSqVriVY}->0}4D z>0}6PcDIh)2tV?dgR%k=x6#fC_yV_R(h2v~mrAJ$7q@7r3c>}KKdnAV3Xv VI+xiT3=+4RdJUEjx8I5lc`n@KYF7XN