Remove symlinks in nodejs setup

ikatson · Dec 11, 2023 · 29c2db1 · 29c2db1
1 parent 37f295c
commit 29c2db1
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 10 deletions.
diff --git a/crates/librqbit/webui/package.json b/crates/librqbit/webui/package.json
@@ -1,4 +1,5 @@
 {
+  "name": "rqbit-webui",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/desktop/package-lock.json b/desktop/package-lock.json
diff --git a/desktop/package.json b/desktop/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^1.5.1",
+    "rqbit-webui": "file:../crates/librqbit/webui",
     "lodash.debounce": "^4.0.8",
     "react": "^18.2.0",
     "react-bootstrap": "^2.9.1",

diff --git a/desktop/src/api.tsx b/desktop/src/api.tsx
@@ -6,7 +6,7 @@ import {
   TorrentDetails,
   TorrentStats,
   ErrorDetails,
-} from "./rqbit-webui-src/api-types";
+} from "rqbit-webui/src/api-types";
 
 import { InvokeArgs, invoke } from "@tauri-apps/api/tauri";
 

diff --git a/desktop/src/configure.tsx b/desktop/src/configure.tsx
@@ -1,9 +1,9 @@
 import React, { useState } from "react";
 import { RqbitDesktopConfig } from "./configuration";
 import { Button, Form, Modal, Row, Tab, Tabs } from "react-bootstrap";
+import { ErrorComponent } from "rqbit-webui/src/components/ErrorComponent";
 import { invokeAPI } from "./api";
-import { ErrorDetails } from "./rqbit-webui-src/api-types";
-import { ErrorComponent } from "./rqbit-webui-src/components/ErrorComponent";
+import { ErrorDetails } from "rqbit-webui/src/api-types";
 
 const FormCheck: React.FC<{
   label: string;

diff --git a/desktop/src/rqbit-desktop.tsx b/desktop/src/rqbit-desktop.tsx
@@ -1,11 +1,10 @@
 import { useState } from "react";
-import { RqbitWebUI } from "./rqbit-webui-src/rqbit-web";
+import { RqbitWebUI } from "rqbit-webui/src/rqbit-web";
 import { CurrentDesktopState, RqbitDesktopConfig } from "./configuration";
 import { ConfigModal } from "./configure";
-import { IconButton } from "./rqbit-webui-src/components/IconButton";
-import { BsBodyText, BsSliders2 } from "react-icons/bs";
-import { LogStreamModal } from "./rqbit-webui-src/components/LogStreamModal";
-import { APIContext } from "./rqbit-webui-src/context";
+import { IconButton } from "rqbit-webui/src/components/IconButton";
+import { BsSliders2 } from "react-icons/bs";
+import { APIContext } from "rqbit-webui/src/context";
 import { makeAPI } from "./api";
 
 export const RqbitDesktop: React.FC<{

diff --git a/desktop/src/rqbit-webui-src b/desktop/src/rqbit-webui-src