Fix merge issues — radicle-desktop

rad:z4D5UCArafTzTQpDZNQRuqswh3ury

Radicle desktop app

Fix merge issues

Merged rudolfs opened 1 year ago

4 files changed +23 -17 ffcbbebc → 21f64c58

modified package-lock.json

@@ -18,6 +18,7 @@

         "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
         "@tauri-apps/cli": "^2.0.0-rc.1",
         "@tsconfig/svelte": "^5.0.4",
         "@types/node": "^20.9.0",
         "baconjs": "^3.0.19",
         "eslint": "^9.9.1",
         "eslint-config-prettier": "^9.1.0",

@@ -1088,6 +1089,15 @@

       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "node_modules/@types/node": {
       "version": "20.16.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.4.tgz",
       "integrity": "sha512-ioyQ1zK9aGEomJ45zz8S8IdzElyxhvP1RVWnPrXDf6wFaUb+kk1tEcVVJkF7RPGM0VWI7cp5U57oCPIn5iN1qg==",
       "dev": true,
       "dependencies": {
         "undici-types": "~6.19.2"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",

@@ -3049,6 +3059,12 @@

         }
       }
     },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
       "dev": true
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",

@@ -3065,13 +3081,13 @@

       "dev": true
     },
     "node_modules/vite": {
       "version": "5.4.2",
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
       "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
       "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.41",
         "postcss": "^8.4.43",
         "rollup": "^4.20.0"
       },
       "bin": {

modified package.json

@@ -26,8 +26,9 @@

     "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
     "@tauri-apps/cli": "^2.0.0-rc.1",
     "@tsconfig/svelte": "^5.0.4",
     "eslint": "^9.9.1",
     "@types/node": "^20.9.0",
     "baconjs": "^3.0.19",
     "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-svelte": "^2.43.0",
     "prettier": "^3.3.3",

modified src/components/Link.svelte

@@ -1,16 +1,11 @@

 <script lang="ts" strictEvents>
 <script lang="ts">
   import type { Route } from "@app/lib/router/definitions";
   import { createEventDispatcher } from "svelte";
   import { push, routeToPath } from "@app/lib/router";
   export let route: Route;
   export let disabled: boolean = false;
   const dispatch = createEventDispatcher<{
     afterNavigate: null;
   }>();
   function navigateToRoute(event: MouseEvent): void {
     event.preventDefault();
     if (disabled) {

@@ -18,7 +13,6 @@

     }
     void push(route);
     dispatch("afterNavigate");
   }
 </script>

deleted src/views/Repos.svelte

@@ -1,5 +0,0 @@

 <script lang="ts">
   import Header from "@app/components/Header.svelte";
 </script>
 <Header />