Fix review comments

andrii-kulminskyi · andrii-kulminskyi · commit 97ff985ce41b · 2025-10-29T22:47:11.000+02:00
diff --git a/desktop-web-app/shared/rpc/prefs-client.ts b/desktop-web-app/shared/rpc/prefs-client.ts
diff --git a/desktop-web-app/web-app-react/package-lock.json b/desktop-web-app/web-app-react/package-lock.json
diff --git a/desktop-web-app/web-app-react/src/components/account/user-account.tsx b/desktop-web-app/web-app-react/src/components/account/user-account.tsx
@@ -26,7 +26,7 @@ import {EditableAvatar} from "@/components/account/editable-avatar.tsx";
 import {EditableInput} from "@/components/account/editable-input.tsx";
 import {GuidingLine} from "@/components/ui/common/guiding-line.tsx";
 import {useEffect, useState} from "react";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import {prefsClient} from "@shared/rpc/prefs-client.ts";
 import {AccountSchema, ProfilePictureSchema} from "@/gen/prefs_pb.ts";
 import {create} from "@bufbuild/protobuf";
 import {imageToDataUri} from "@/converter/image.ts";
diff --git a/desktop-web-app/web-app-react/src/components/appearance/appearance.tsx b/desktop-web-app/web-app-react/src/components/appearance/appearance.tsx
@@ -26,7 +26,7 @@ import {Laptop, Moon, Sun} from "lucide-react";
 import {ThemeBox} from "@/components/appearance/theme-box.tsx";
 import {Combobox} from "@/components/ui/common/combobox.tsx";
 import {AppearanceSchema} from "@/gen/prefs_pb.ts";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client.ts";
 import {create} from "@bufbuild/protobuf";
 import {useTheme} from "@/components/appearance/theme-provider.tsx";
 import {useFontSize} from "@/components/appearance/font-size-provider.tsx";
diff --git a/desktop-web-app/web-app-react/src/components/appearance/font-size-provider.tsx b/desktop-web-app/web-app-react/src/components/appearance/font-size-provider.tsx
@@ -21,7 +21,7 @@
  */
 
 import React, {createContext, useContext, useEffect, useState} from "react";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client.ts";
 import {
     defaultFontSize,
     FontSizeOption,
diff --git a/desktop-web-app/web-app-react/src/components/appearance/theme-provider.tsx b/desktop-web-app/web-app-react/src/components/appearance/theme-provider.tsx
@@ -21,7 +21,7 @@
  */
 
 import React, {createContext, useContext, useEffect, useState} from "react";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client.ts";
 import {fromTheme, systemTheme, ThemeOption} from "@/converter/theme.ts";
 import {prefsStorage} from "@/storage/prefs-storage.ts";
 
diff --git a/desktop-web-app/web-app-react/src/components/general/general.tsx b/desktop-web-app/web-app-react/src/components/general/general.tsx
@@ -25,7 +25,7 @@ import {Combobox} from "@/components/ui/common/combobox.tsx";
 import {PreferenceSwitch} from "@/components/ui/common/preference-switch.tsx";
 import {useEffect, useState} from "react";
 import {GeneralSchema} from "@/gen/prefs_pb.ts";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 import {create} from "@bufbuild/protobuf";
 import {
     englishLanguage,
diff --git a/desktop-web-app/web-app-react/src/components/notifications/notifications.tsx b/desktop-web-app/web-app-react/src/components/notifications/notifications.tsx
@@ -24,7 +24,7 @@ import {Separator} from "@/components/ui/separator.tsx";
 
 import {PreferenceSwitch} from "@/components/ui/common/preference-switch.tsx";
 import {useEffect, useState} from "react";
-import {prefsClient} from "@/rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 import {create} from "@bufbuild/protobuf";
 import {NotificationsSchema} from "@/gen/prefs_pb.ts";
 import {prefsStorage} from "@/storage/prefs-storage.ts";
diff --git a/desktop-web-app/web-app-react/src/rpc/prefs-client.ts b/desktop-web-app/web-app-react/src/rpc/prefs-client.ts
diff --git a/desktop-web-app/web-app-react/tsconfig.app.json b/desktop-web-app/web-app-react/tsconfig.app.json
@@ -13,15 +13,13 @@
         "./src/*"
       ]
     },
-    /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "isolatedModules": true,
     "moduleDetection": "force",
     "noEmit": true,
     "jsx": "react-jsx",
 
-    /* Linting */
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
diff --git a/desktop-web-app/web-app-react/tsconfig.json b/desktop-web-app/web-app-react/tsconfig.json
@@ -7,7 +7,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "@shared/*": ["../shared/*"]
     }
   }
 }
diff --git a/desktop-web-app/web-app-react/tsconfig.node.json b/desktop-web-app/web-app-react/tsconfig.node.json
@@ -6,14 +6,12 @@
     "module": "ESNext",
     "skipLibCheck": true,
 
-    /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "isolatedModules": true,
     "moduleDetection": "force",
     "noEmit": true,
 
-    /* Linting */
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
diff --git a/desktop-web-app/web-app-react/vite.config.ts b/desktop-web-app/web-app-react/vite.config.ts
@@ -29,9 +29,16 @@ export default defineConfig({
     resolve: {
         alias: {
             "@": path.resolve(__dirname, "./src"),
+            "@shared": path.resolve(__dirname, "../shared"),
         },
     },
+    optimizeDeps: {
+      include: ["@connectrpc/connect-web", "@connectrpc/connect"]
+    },
     build: {
         outDir: 'dist/web',
+        rollupOptions: {
+         external: ["@connectrpc/connect-web", "@connectrpc/connect"],
+        }
     },
 })
diff --git a/desktop-web-app/web-app-vue/package-lock.json b/desktop-web-app/web-app-vue/package-lock.json
diff --git a/desktop-web-app/web-app-vue/package.json b/desktop-web-app/web-app-vue/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@connectrpc/connect": "2.0.0-rc.2",
-    "@connectrpc/connect-web": "2.0.0-rc.2",
+    "@connectrpc/connect": "^2.1.0",
+    "@connectrpc/connect-web": "^2.1.0",
     "@vueuse/core": "10.7.0",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
diff --git a/desktop-web-app/web-app-vue/src/components/account/UserAccount.vue b/desktop-web-app/web-app-vue/src/components/account/UserAccount.vue
@@ -18,7 +18,7 @@ import {
   TwoFAMethod,
 } from "@/converter/two-fa-method.ts";
 import {prefsStorage} from "@/storage/prefs-storage.ts";
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 
 const profilePictureDataUri = ref<string>("");
 const fullName = ref<string>("");
diff --git a/desktop-web-app/web-app-vue/src/components/appearance/Appearance.vue b/desktop-web-app/web-app-vue/src/components/appearance/Appearance.vue
@@ -76,7 +76,7 @@ import {
   toFontSize,
   FontSizeOption,
 } from "@/converter/font-size.ts"
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 import {useTheme} from "@/components/hooks/useTheme.ts";
 import {useFontSize} from "@/components/hooks/useFontSize.ts";
 
diff --git a/desktop-web-app/web-app-vue/src/components/appearance/FontSizeProvider.vue b/desktop-web-app/web-app-vue/src/components/appearance/FontSizeProvider.vue
@@ -2,7 +2,7 @@
 import {ref, provide, onMounted, watch} from "vue";
 import {prefsStorage} from "@/storage/prefs-storage.ts";
 import {defaultFontSize, FontSizeOption, fromFontSize} from "@/converter/font-size.ts";
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 import {FontSizeContext, FontSizeContextKey} from "@/utils/fontsize-context.ts";
 
 const fontSize = ref<FontSizeOption>(prefsStorage.fontSize() ?? defaultFontSize);
diff --git a/desktop-web-app/web-app-vue/src/components/appearance/ThemeProvider.vue b/desktop-web-app/web-app-vue/src/components/appearance/ThemeProvider.vue
@@ -3,7 +3,7 @@ import { ref, provide, onMounted, watch } from "vue";
 import { prefsStorage } from "@/storage/prefs-storage.ts";
 import { systemTheme, ThemeOption, fromTheme } from "@/converter/theme.ts";
 import {ThemeContext, ThemeContextKey} from "@/utils/theme-context.ts";
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 
 const theme = ref<ThemeOption>(prefsStorage.theme() ?? systemTheme);
 
diff --git a/desktop-web-app/web-app-vue/src/components/general/General.vue b/desktop-web-app/web-app-vue/src/components/general/General.vue
@@ -60,7 +60,7 @@ import {
   toLanguage,
 } from "@/converter/language";
 import { prefsStorage } from "@/storage/prefs-storage";
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 
 const languages: LanguageOption[] = [
   englishLanguage,
diff --git a/desktop-web-app/web-app-vue/src/components/notifications/Notifications.vue b/desktop-web-app/web-app-vue/src/components/notifications/Notifications.vue
@@ -4,7 +4,7 @@ import PreferenceSwitch from "@/components/ui/common/PreferenceSwitch.vue";
 import { create } from "@bufbuild/protobuf";
 import { NotificationsSchema } from "@/gen/prefs_pb.ts";
 import { prefsStorage } from "@/storage/prefs-storage.ts";
-import {prefsClient} from "../../../rpc/prefs-client.ts";
+import { prefsClient } from "@shared/rpc/prefs-client";
 import Separator from "@/components/ui/Separator.vue";
 
 const desktopEnabled = ref<boolean>(prefsStorage.desktopNotificationsEnabled());
diff --git a/desktop-web-app/web-app-vue/tsconfig.app.json b/desktop-web-app/web-app-vue/tsconfig.app.json
@@ -12,19 +12,19 @@
       "@/*": ["./src/*"]
     },
 
-    /* Bundler mode */
+
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "isolatedModules": true,
     "moduleDetection": "force",
     "noEmit": true,
 
-    /* Vue does not use JSX by default */
+
     "jsx": "preserve",
     "esModuleInterop": true,
     "resolveJsonModule": true,
 
-    /* Linting / strictness */
+
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
diff --git a/desktop-web-app/web-app-vue/tsconfig.json b/desktop-web-app/web-app-vue/tsconfig.json
@@ -7,7 +7,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "@shared/*": ["../shared/*"]
     }
   }
 }
diff --git a/desktop-web-app/web-app-vue/tsconfig.node.json b/desktop-web-app/web-app-vue/tsconfig.node.json
@@ -6,14 +6,14 @@
     "module": "ESNext",
     "skipLibCheck": true,
 
-    /* Bundler mode */
+
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "isolatedModules": true,
     "moduleDetection": "force",
     "noEmit": true,
 
-    /* Linting */
+
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
diff --git a/desktop-web-app/web-app-vue/vite.config.ts b/desktop-web-app/web-app-vue/vite.config.ts
@@ -10,13 +10,20 @@ export default defineConfig(({ mode }) => ({
   ].filter(Boolean),
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, './src')
+      '@': path.resolve(__dirname, './src'),
+      '@shared': path.resolve(__dirname, '../shared'),
     }
   },
+  optimizeDeps: {
+    include: ["@connectrpc/connect-web", "@connectrpc/connect"]
+  },
   build: {
     outDir: 'dist',
     assetsDir: 'assets',
-    emptyOutDir: true
+    emptyOutDir: true,
+  rollupOptions: {
+      external: ["@connectrpc/connect-web", "@connectrpc/connect"],
+    }
   },
   server: {
     port: 5175,
