From f3ac6875ed20f37049f7b651a5018b438362c7bf Mon Sep 17 00:00:00 2001
From: Wim Brand <wim@fornaxian.tech>
Date: Wed, 11 Sep 2024 14:18:03 +0200
Subject: [PATCH] Move back to relative paths because somehow the alternative
 is even worse

---
 svelte/rollup.config.js                       | 25 ++++++-------------
 svelte/src/file_viewer/FileStats.svelte       |  2 +-
 svelte/src/file_viewer/TransferLimit.svelte   |  2 +-
 svelte/src/file_viewer/viewers/Abuse.svelte   |  6 ++---
 svelte/src/file_viewer/viewers/Audio.svelte   |  2 +-
 .../file_viewer/viewers/BandwidthUsage.svelte |  4 +--
 svelte/src/file_viewer/viewers/File.svelte    |  4 +--
 .../file_viewer/viewers/FilePreview.svelte    |  4 +--
 svelte/src/file_viewer/viewers/Image.svelte   |  2 +-
 .../src/file_viewer/viewers/RateLimit.svelte  |  6 ++---
 svelte/src/file_viewer/viewers/Torrent.svelte | 12 ++++-----
 svelte/src/file_viewer/viewers/Video.svelte   |  2 +-
 svelte/src/file_viewer/viewers/Zip.svelte     |  6 ++---
 svelte/src/filesystem/FSNavigator.ts          |  2 +-
 svelte/src/filesystem/Filesystem.svelte       |  2 +-
 .../filesystem/filemanager/FileManager.svelte |  2 +-
 svelte/src/filesystem/viewers/Audio.svelte    |  6 ++---
 svelte/src/filesystem/viewers/File.svelte     |  4 +--
 .../src/filesystem/viewers/FilePreview.svelte |  4 +--
 svelte/src/filesystem/viewers/Image.svelte    |  2 +-
 svelte/src/filesystem/viewers/Torrent.svelte  |  4 +--
 svelte/src/filesystem/viewers/Zip.svelte      |  4 +--
 svelte/src/home_page/UploadLoginWall.svelte   |  2 +-
 svelte/src/layout/SlowDown.svelte             |  6 ++---
 .../src/user_home/dashboard/CardFSHome.svelte | 12 ++++-----
 .../src/user_home/dashboard/CardUpload.svelte |  2 +-
 26 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/svelte/rollup.config.js b/svelte/rollup.config.js
index f831b35..73bc23c 100644
--- a/svelte/rollup.config.js
+++ b/svelte/rollup.config.js
@@ -5,7 +5,6 @@ import livereload from 'rollup-plugin-livereload';
 import terser from '@rollup/plugin-terser';
 import babel from '@rollup/plugin-babel'
 import typescript from '@rollup/plugin-typescript'
-import includePaths from 'rollup-plugin-includepaths';
 import { sveltePreprocess } from 'svelte-preprocess';
 
 const production = !process.env.ROLLUP_WATCH;
@@ -40,14 +39,13 @@ export default [
 		}),
 
 		babel({
-			extensions: [".js", ".ts", ".html", ".svelte"],
+			extensions: [".js", ".ts", ".svelte"],
 			babelHelpers: "bundled",
 		}),
 
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration -
-		// consult the documentation for details:
+		// If you have external dependencies installed from npm, you'll most
+		// likely need these plugins. In some cases you'll need additional
+		// configuration - consult the documentation for details:
 		// https://github.com/rollup/plugins/tree/master/packages/commonjs
 		resolve({
 			browser: true,
@@ -60,23 +58,16 @@ export default [
 			compilerOptions: { lib: ["es2015", "dom"] },
 			verbatimModuleSyntax: true,
 		}),
-		includePaths({
-			paths: ["."],
-		}),
 
-		// In dev mode, call `npm run start` once
-		// the bundle has been generated
-		// !production && serve(),
-
-		// Watch the `public` directory and refresh the
-		// browser on changes when not in production
+		// Watch the `public` directory and refresh the browser on changes when
+		// not in production
 		!production && livereload({
 			watch: `${builddir}/${name}.*`,
 			port: 5000 + index,
 		}),
 
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
+		// If we're building for production (npm run build instead of npm run
+		// dev), minify
 		production && terser(),
 	],
 	watch: {
diff --git a/svelte/src/file_viewer/FileStats.svelte b/svelte/src/file_viewer/FileStats.svelte
index 784925c..27b36c5 100644
--- a/svelte/src/file_viewer/FileStats.svelte
+++ b/svelte/src/file_viewer/FileStats.svelte
@@ -1,6 +1,6 @@
 <script>
 import { formatDataVolume, formatThousands } from "../util/Formatting.svelte"
-import { set_file, stats } from "src/util/StatsSocket"
+import { set_file, stats } from "../util/StatsSocket"
 
 export let file = {
 	id: "",
diff --git a/svelte/src/file_viewer/TransferLimit.svelte b/svelte/src/file_viewer/TransferLimit.svelte
index 16f2a52..0c06de1 100644
--- a/svelte/src/file_viewer/TransferLimit.svelte
+++ b/svelte/src/file_viewer/TransferLimit.svelte
@@ -1,6 +1,6 @@
 <script>
 import { formatDataVolume } from "../util/Formatting.svelte";
-import { stats } from "src/util/StatsSocket.js"
+import { stats } from "../util/StatsSocket.js"
 
 let percent = 0
 let title = ""
diff --git a/svelte/src/file_viewer/viewers/Abuse.svelte b/svelte/src/file_viewer/viewers/Abuse.svelte
index 5ab66a5..47ae5f6 100644
--- a/svelte/src/file_viewer/viewers/Abuse.svelte
+++ b/svelte/src/file_viewer/viewers/Abuse.svelte
@@ -1,8 +1,8 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
-import FileTitle from "src/layout/FileTitle.svelte";
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
+import FileTitle from "../../layout/FileTitle.svelte";
 
 let dispatch = createEventDispatcher()
 
diff --git a/svelte/src/file_viewer/viewers/Audio.svelte b/svelte/src/file_viewer/viewers/Audio.svelte
index bbd5931..15e06c7 100644
--- a/svelte/src/file_viewer/viewers/Audio.svelte
+++ b/svelte/src/file_viewer/viewers/Audio.svelte
@@ -1,7 +1,7 @@
 <script>
 import { createEventDispatcher, tick } from "svelte";
 import BandwidthUsage from "./BandwidthUsage.svelte";
-import FileTitle from "src/layout/FileTitle.svelte";
+import FileTitle from "../../layout/FileTitle.svelte";
 let dispatch = createEventDispatcher()
 
 export let is_list = false
diff --git a/svelte/src/file_viewer/viewers/BandwidthUsage.svelte b/svelte/src/file_viewer/viewers/BandwidthUsage.svelte
index 7531bd1..805ec87 100644
--- a/svelte/src/file_viewer/viewers/BandwidthUsage.svelte
+++ b/svelte/src/file_viewer/viewers/BandwidthUsage.svelte
@@ -1,8 +1,8 @@
 <script>
 import { formatDataVolume } from "../../util/Formatting.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import TextBlock from "../../layout/TextBlock.svelte"
 import ProgressBar from "../../util/ProgressBar.svelte";
-import { stats } from "src/util/StatsSocket.js"
+import { stats } from "../../util/StatsSocket.js"
 
 export let file = {
 	size: 0,
diff --git a/svelte/src/file_viewer/viewers/File.svelte b/svelte/src/file_viewer/viewers/File.svelte
index 6212bab..106a63a 100644
--- a/svelte/src/file_viewer/viewers/File.svelte
+++ b/svelte/src/file_viewer/viewers/File.svelte
@@ -1,8 +1,8 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import BandwidthUsage from "./BandwidthUsage.svelte";
-import IconBlock from "src/layout/IconBlock.svelte";
-import FileTitle from "src/layout/FileTitle.svelte";
+import IconBlock from "../../layout/IconBlock.svelte";
+import FileTitle from "../../layout/FileTitle.svelte";
 import { formatDataVolume } from "../../util/Formatting.svelte";
 let dispatch = createEventDispatcher()
 
diff --git a/svelte/src/file_viewer/viewers/FilePreview.svelte b/svelte/src/file_viewer/viewers/FilePreview.svelte
index cb4409c..36f75f3 100644
--- a/svelte/src/file_viewer/viewers/FilePreview.svelte
+++ b/svelte/src/file_viewer/viewers/FilePreview.svelte
@@ -11,9 +11,9 @@ import Abuse from "./Abuse.svelte";
 import { file_type } from "../FileUtilities.svelte";
 import RateLimit from "./RateLimit.svelte";
 import Torrent from "./Torrent.svelte";
-import { stats } from "src/util/StatsSocket.js"
+import { stats } from "../../util/StatsSocket.js"
 import Zip from "./Zip.svelte";
-import SlowDown from "src/layout/SlowDown.svelte";
+import SlowDown from "../../layout/SlowDown.svelte";
 
 let viewer
 let viewer_type = "loading"
diff --git a/svelte/src/file_viewer/viewers/Image.svelte b/svelte/src/file_viewer/viewers/Image.svelte
index dee03b4..5dd20a3 100644
--- a/svelte/src/file_viewer/viewers/Image.svelte
+++ b/svelte/src/file_viewer/viewers/Image.svelte
@@ -1,6 +1,6 @@
 <script>
 import { createEventDispatcher } from "svelte"
-import { swipe_nav } from "src/util/SwipeNavigate.ts";
+import { swipe_nav } from "../../util/SwipeNavigate.ts";
 let dispatch = createEventDispatcher()
 
 export const set_file = f => {
diff --git a/svelte/src/file_viewer/viewers/RateLimit.svelte b/svelte/src/file_viewer/viewers/RateLimit.svelte
index a6048c4..6dd6f4b 100644
--- a/svelte/src/file_viewer/viewers/RateLimit.svelte
+++ b/svelte/src/file_viewer/viewers/RateLimit.svelte
@@ -1,9 +1,9 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import { formatDataVolume } from "../../util/Formatting.svelte";
-import { stats } from "src/util/StatsSocket.js"
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import { stats } from "../../util/StatsSocket.js"
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
 let dispatch = createEventDispatcher()
 
 export const set_file = f => file = f
diff --git a/svelte/src/file_viewer/viewers/Torrent.svelte b/svelte/src/file_viewer/viewers/Torrent.svelte
index 22984d9..2bd717b 100644
--- a/svelte/src/file_viewer/viewers/Torrent.svelte
+++ b/svelte/src/file_viewer/viewers/Torrent.svelte
@@ -1,12 +1,12 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import Magnet from "src/icons/Magnet.svelte";
-import { formatDate } from "src/util/Formatting.svelte"
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte";
+import Magnet from "../../icons/Magnet.svelte";
+import { formatDate } from "../../util/Formatting.svelte"
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte";
 import TorrentItem from "./TorrentItem.svelte"
-import FileTitle from "src/layout/FileTitle.svelte";
-import CopyButton from "src/layout/CopyButton.svelte";
+import FileTitle from "../../layout/FileTitle.svelte";
+import CopyButton from "../../layout/CopyButton.svelte";
 
 let dispatch = createEventDispatcher()
 
diff --git a/svelte/src/file_viewer/viewers/Video.svelte b/svelte/src/file_viewer/viewers/Video.svelte
index ceaea85..38827df 100644
--- a/svelte/src/file_viewer/viewers/Video.svelte
+++ b/svelte/src/file_viewer/viewers/Video.svelte
@@ -1,7 +1,7 @@
 <script>
 import { onMount,  createEventDispatcher, tick } from "svelte";
 import BandwidthUsage from "./BandwidthUsage.svelte";
-import IconBlock from "src/layout/IconBlock.svelte";
+import IconBlock from "../../layout/IconBlock.svelte";
 let dispatch = createEventDispatcher()
 
 export let is_list = false
diff --git a/svelte/src/file_viewer/viewers/Zip.svelte b/svelte/src/file_viewer/viewers/Zip.svelte
index 88fcde4..afec955 100644
--- a/svelte/src/file_viewer/viewers/Zip.svelte
+++ b/svelte/src/file_viewer/viewers/Zip.svelte
@@ -1,11 +1,11 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import { formatDataVolume, formatDate } from "../../util/Formatting.svelte"
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
 import ZipItem from "./ZipItem.svelte";
 import BandwidthUsage from "./BandwidthUsage.svelte";
-import FileTitle from "src/layout/FileTitle.svelte";
+import FileTitle from "../../layout/FileTitle.svelte";
 
 let dispatch = createEventDispatcher()
 
diff --git a/svelte/src/filesystem/FSNavigator.ts b/svelte/src/filesystem/FSNavigator.ts
index ccdf73c..dcef638 100644
--- a/svelte/src/filesystem/FSNavigator.ts
+++ b/svelte/src/filesystem/FSNavigator.ts
@@ -70,7 +70,7 @@ export class FSNavigator {
 			this.set_loading(true)
 			const resp = await fs_get_node(path)
 			this.open_node(resp, push_history)
-		} catch (err) {
+		} catch (err: any) {
 			if (err.value && err.value === "path_not_found") {
 				if (path !== this.path[0].path && path !== "/" && path !== "") {
 					console.debug("Path", path, "was not found, trying to navigate to parent")
diff --git a/svelte/src/filesystem/Filesystem.svelte b/svelte/src/filesystem/Filesystem.svelte
index a03cb39..9bfefa3 100644
--- a/svelte/src/filesystem/Filesystem.svelte
+++ b/svelte/src/filesystem/Filesystem.svelte
@@ -13,7 +13,7 @@ import Menu from './Menu.svelte';
 import { FSNavigator } from "./FSNavigator"
 import { writable } from 'svelte/store';
 import TransferLimit from '../file_viewer/TransferLimit.svelte';
-import { stats } from "src/util/StatsSocket.js"
+import { stats } from "../util/StatsSocket.js"
 import { css_from_path } from './edit_window/Branding';
 
 let file_viewer
diff --git a/svelte/src/filesystem/filemanager/FileManager.svelte b/svelte/src/filesystem/filemanager/FileManager.svelte
index 238880f..0046649 100644
--- a/svelte/src/filesystem/filemanager/FileManager.svelte
+++ b/svelte/src/filesystem/filemanager/FileManager.svelte
@@ -7,7 +7,7 @@ import GalleryView from './GalleryView.svelte'
 import Button from '../../layout/Button.svelte';
 import FileImporter from './FileImporter.svelte';
 import { formatDate } from '../../util/Formatting.svelte';
-import { drop_target } from "src/util/DropTarget.ts"
+import { drop_target } from "../../util/DropTarget.ts"
 
 export let nav
 export let upload_widget
diff --git a/svelte/src/filesystem/viewers/Audio.svelte b/svelte/src/filesystem/viewers/Audio.svelte
index d293c5c..0cfba81 100644
--- a/svelte/src/filesystem/viewers/Audio.svelte
+++ b/svelte/src/filesystem/viewers/Audio.svelte
@@ -1,8 +1,8 @@
 <script>
 import { onMount } from 'svelte'
-import { fs_path_url, fs_encode_path, fs_node_icon } from "src/filesystem/FilesystemAPI.ts"
-import FileTitle from "src/layout/FileTitle.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import { fs_path_url, fs_encode_path, fs_node_icon } from "../../filesystem/FilesystemAPI.ts"
+import FileTitle from "../../layout/FileTitle.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
 
 export let nav
 let player
diff --git a/svelte/src/filesystem/viewers/File.svelte b/svelte/src/filesystem/viewers/File.svelte
index 5096644..36c74cf 100644
--- a/svelte/src/filesystem/viewers/File.svelte
+++ b/svelte/src/filesystem/viewers/File.svelte
@@ -1,8 +1,8 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import IconBlock from "src/layout/IconBlock.svelte";
+import IconBlock from "../../layout/IconBlock.svelte";
 import { fs_thumbnail_url } from "../FilesystemAPI";
-import TextBlock from "src/layout/TextBlock.svelte"
+import TextBlock from "../../layout/TextBlock.svelte"
 let dispatch = createEventDispatcher()
 
 export let nav
diff --git a/svelte/src/filesystem/viewers/FilePreview.svelte b/svelte/src/filesystem/viewers/FilePreview.svelte
index aecc228..81a10bb 100644
--- a/svelte/src/filesystem/viewers/FilePreview.svelte
+++ b/svelte/src/filesystem/viewers/FilePreview.svelte
@@ -12,8 +12,8 @@ import Video from "./Video.svelte";
 import Torrent from "./Torrent.svelte";
 import Zip from "./Zip.svelte";
 import CustomBanner from "./CustomBanner.svelte";
-import { stats } from "src/util/StatsSocket.js"
-import SlowDown from "src/layout/SlowDown.svelte";
+import { stats } from "../../util/StatsSocket.js"
+import SlowDown from "../../layout/SlowDown.svelte";
 
 export let nav
 export let upload_widget
diff --git a/svelte/src/filesystem/viewers/Image.svelte b/svelte/src/filesystem/viewers/Image.svelte
index 9f0f8b2..4d0d89a 100644
--- a/svelte/src/filesystem/viewers/Image.svelte
+++ b/svelte/src/filesystem/viewers/Image.svelte
@@ -1,6 +1,6 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import { swipe_nav } from "src/util/SwipeNavigate.ts";
+import { swipe_nav } from "../../util/SwipeNavigate.ts";
 import { fs_path_url } from "./../FilesystemAPI";
 
 let dispatch = createEventDispatcher();
diff --git a/svelte/src/filesystem/viewers/Torrent.svelte b/svelte/src/filesystem/viewers/Torrent.svelte
index 6d74303..5326ba0 100644
--- a/svelte/src/filesystem/viewers/Torrent.svelte
+++ b/svelte/src/filesystem/viewers/Torrent.svelte
@@ -3,8 +3,8 @@ import { createEventDispatcher } from "svelte";
 import Magnet from "../../icons/Magnet.svelte";
 import { formatDate } from "../../util/Formatting.svelte"
 import TorrentItem from "./TorrentItem.svelte"
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
 import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
 import CopyButton from "../../layout/CopyButton.svelte";
 
diff --git a/svelte/src/filesystem/viewers/Zip.svelte b/svelte/src/filesystem/viewers/Zip.svelte
index 33ea80d..d8114d7 100644
--- a/svelte/src/filesystem/viewers/Zip.svelte
+++ b/svelte/src/filesystem/viewers/Zip.svelte
@@ -2,8 +2,8 @@
 import { createEventDispatcher } from "svelte";
 import { formatDataVolume, formatDate } from "../../util/Formatting.svelte"
 import ZipItem from "../../file_viewer/viewers/ZipItem.svelte";
-import IconBlock from "src/layout/IconBlock.svelte";
-import TextBlock from "src/layout/TextBlock.svelte"
+import IconBlock from "../../layout/IconBlock.svelte";
+import TextBlock from "../../layout/TextBlock.svelte"
 import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
 
 let dispatch = createEventDispatcher()
diff --git a/svelte/src/home_page/UploadLoginWall.svelte b/svelte/src/home_page/UploadLoginWall.svelte
index c429da1..5c8b303 100644
--- a/svelte/src/home_page/UploadLoginWall.svelte
+++ b/svelte/src/home_page/UploadLoginWall.svelte
@@ -2,7 +2,7 @@
 import Login from "../login/Login.svelte";
 import Register from "../login/Register.svelte";
 import UploadWidget from "./UploadWidget.svelte";
-import { drop_target } from "src/util/DropTarget.ts"
+import { drop_target } from "../util/DropTarget.ts"
 
 const finish_login = async e => {
 	location.reload()
diff --git a/svelte/src/layout/SlowDown.svelte b/svelte/src/layout/SlowDown.svelte
index 1518230..820b9b9 100644
--- a/svelte/src/layout/SlowDown.svelte
+++ b/svelte/src/layout/SlowDown.svelte
@@ -1,9 +1,9 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import { formatDataVolume, formatDuration } from "../util/Formatting.svelte";
-import { stats } from "src/util/StatsSocket.js"
-import TextBlock from "src/layout/TextBlock.svelte"
-import IconBlock from "src/layout/IconBlock.svelte";
+import { stats } from "../util/StatsSocket.js"
+import TextBlock from "./TextBlock.svelte"
+import IconBlock from "./IconBlock.svelte";
 let dispatch = createEventDispatcher()
 
 export let file_size = 0
diff --git a/svelte/src/user_home/dashboard/CardFSHome.svelte b/svelte/src/user_home/dashboard/CardFSHome.svelte
index 1cacde6..6292cab 100644
--- a/svelte/src/user_home/dashboard/CardFSHome.svelte
+++ b/svelte/src/user_home/dashboard/CardFSHome.svelte
@@ -1,11 +1,11 @@
 <script>
 import { onMount } from "svelte";
-import { FSNavigator } from "src/filesystem/FSNavigator.ts"
-import { fs_encode_path, fs_node_icon } from "src/filesystem/FilesystemAPI.ts";
-import Button from "src/layout/Button.svelte";
-import CreateDirectory from "src/filesystem/filemanager/CreateDirectory.svelte";
-import FSUploadWidget from "src/filesystem/upload_widget/FSUploadWidget.svelte";
-import { drop_target } from "src/util/DropTarget.ts"
+import { FSNavigator } from "../../filesystem/FSNavigator.ts"
+import { fs_encode_path, fs_node_icon } from "../../filesystem/FilesystemAPI.ts";
+import Button from "../../layout/Button.svelte";
+import CreateDirectory from "../../filesystem/filemanager/CreateDirectory.svelte";
+import FSUploadWidget from "../../filesystem/upload_widget/FSUploadWidget.svelte";
+import { drop_target } from "../../util/DropTarget.ts"
 
 const nav = new FSNavigator(false)
 let upload_widget
diff --git a/svelte/src/user_home/dashboard/CardUpload.svelte b/svelte/src/user_home/dashboard/CardUpload.svelte
index 6e7bc79..00bac53 100644
--- a/svelte/src/user_home/dashboard/CardUpload.svelte
+++ b/svelte/src/user_home/dashboard/CardUpload.svelte
@@ -1,6 +1,6 @@
 <script>
 import UploadLib from "./UploadLib.svelte";
-import { drop_target } from "src/util/DropTarget.ts"
+import { drop_target } from "../../util/DropTarget.ts"
 
 let upload_widget
 </script>