Fix issues in UI and compilation!

Author: RedstoneWizard08

Cargo.lock

@@ -1,9 +1,9 @@
 # ModHost
 
 ![Contributions](./assets/contributions.svg)
-![Crates.io Version](https://img.shields.io/crates/v/modhost-api?style=for-the-badge)
-![Deployment Status](https://img.shields.io/github/actions/workflow/status/RedstoneWizard08/ModHost/deploy.yml?branch=main&style=for-the-badge&label=Deployment)
-![CLI Build Status](https://img.shields.io/github/actions/workflow/status/RedstoneWizard08/ModHost/cli-build.yml?branch=main&style=for-the-badge&label=CLI%20Build)
+![Crates.io Version](https://img.shields.io/crates/v/modhost-api?style=for-the-badge&labelColor=191d28)
+![Deployment Status](https://img.shields.io/github/actions/workflow/status/RedstoneWizard08/ModHost/deploy.yml?branch=main&style=for-the-badge&label=Deployment&labelColor=191d28)
+![CLI Build Status](https://img.shields.io/github/actions/workflow/status/RedstoneWizard08/ModHost/cli-build.yml?branch=main&style=for-the-badge&label=CLI%20Build&labelColor=191d28)
 ![Lines of Code](https://tokei.rs/b1/github/RedstoneWizard08/ModHost?style=for-the-badge&label=Lines+Of+Code)
 
 A simple, open-source, and self-hostable place to host mods for any game!

README.md

@@ -0,0 +1,11 @@
+# KJSPKG Migrator
+
+A tool for migrating packages from the old [KJSPKG](https://github.com/Modern-Modpacks/kjspkg) to a new ModHost-based instance.
+
+## Usage
+
+1. Make sure to set `MIGRATOR_TOKEN` in `.env`. It's just a GitHub personal access token - it doesn't actually need permissions. It's only used for ratelimit purposes.
+2. Clear the database: `diesel migration redo -a`
+3. Run it: `cargo run --bin kjspkg-migrator`
+
+Unfortunately, due to the nature of how old KJSPKG was set up, a couple of packages that no longer exist on GitHub yet still exist in the manifest won't be migrated. You'll see their error messages in the tool's output.

apps/kjspkg-migrator/README.md

@@ -105,9 +105,9 @@ pub async fn run() -> Result<()> {
                 slug: id.clone(),
                 name: id.clone(),
                 description: manifest.description,
-                issues: Some(format!("https://github.com/{}/issues", repo)),
-                source: Some(format!("https://github.com/{}", repo)),
-                wiki: Some(format!("https://github.com/{}/wiki", repo)),
+                issues: Some(format!("https://github.com/{}/{}/issues", owner, repo)),
+                source: Some(format!("https://github.com/{}/{}", owner, repo)),
+                wiki: Some(format!("https://github.com/{}/{}/wiki", owner, repo)),
                 license: None,
                 readme,
                 tags: Vec::new(),

apps/kjspkg-migrator/src/migrator.rs

@@ -11,9 +11,11 @@ readme.workspace = true
 [dependencies]
 ctrlc.workspace = true
 include_dir.workspace = true
-modhost-core.workspace = true
+jsglue.workspace = true
+modhost-core = { workspace = true, features = ["tempfile", "zip"] }
 modhost-config.workspace = true
 reqwest.workspace = true
+serde_json.workspace = true
 tempfile.workspace = true
 tokio.workspace = true
 tracing.workspace = true

bun.lockb

@@ -14,7 +14,7 @@ use zip::ZipArchive;
 pub const BUN_REPO: &str = "https://github.com/oven-sh/bun";
 
 /// The Bun version to download.
-pub const BUN_VERSION: &str = "bun-v1.1.36";
+pub const BUN_VERSION: &str = "bun-v1.1.43";
 
 /// Get the base release URL for the download.
 pub fn get_base_url() -> String {

crates/modhost-ui/Cargo.toml

@@ -26,6 +26,12 @@ pub const DEFAULT_FAVICON_PNG: &[u8] = include_bytes!("./assets/modhost.png");
 pub const UI_SOURCE: include_dir::Dir<'static> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../ui");
 
+/// The embedded source for the API client.
+/// Yes, the entire source code is embedded in the binary.
+#[cfg(not(debug_assertions))]
+pub const API_SOURCE: include_dir::Dir<'static> =
+    include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../packages/modhost-api");
+
 /// Build the frontend.
 /// In debug builds, this uses the config and a root path to the source
 /// to write the favicon files.
@@ -87,6 +93,7 @@ pub async fn build_ui(config: &AppConfig, dir: &PathBuf) -> Result<()> {
 /// path to the built UI. In debug builds this will return `()`.
 #[cfg(not(debug_assertions))]
 pub async fn build_ui(config: &AppConfig) -> Result<PathBuf> {
+    use serde_json::Value;
     use tempfile::TempDir;
     use tokio::process::Command;
 
@@ -100,9 +107,32 @@ pub async fn build_ui(config: &AppConfig) -> Result<PathBuf> {
         fs::create_dir_all(&dir)?;
     }
 
-    info!("Extracting to: {:?}", dir);
+    let api_dir = dir.join("api");
+
+    if !api_dir.exists() {
+        fs::create_dir_all(&api_dir)?;
+    }
+
+    info!("Extracting to: {:?}...", dir);
 
     UI_SOURCE.extract(&dir)?;
+    API_SOURCE.extract(&api_dir)?;
+
+    info!("Fixing package.json...");
+
+    let pkg_json_path = dir.join("package.json");
+    let mut pkg_json = serde_json::from_str::<Value>(&fs::read_to_string(&pkg_json_path)?)?;
+    let pkg_json_obj = pkg_json.as_object_mut().unwrap();
+
+    // We need to add the workspaces key to fix dependency resolution issues
+    pkg_json_obj.insert(
+        "workspaces".into(),
+        Value::Array(vec![Value::String("./api".into())]),
+    );
+
+    fs::write(pkg_json_path, serde_json::to_string_pretty(&pkg_json)?)?;
+
+    info!("Checking icons...");
 
     if config.ui.favicon_ico == "default" {
         info!("Downloading favicon.ico...");
@@ -159,7 +189,7 @@ pub async fn build_ui(config: &AppConfig) -> Result<PathBuf> {
         .wait()
         .await?;
 
-    info!("Running `bun run build`...");
+    info!("Running `bun run dist`...");
 
     Command::new(&bun_exe)
         .arg("--bun")

crates/modhost-ui/src/bun.rs

@@ -20,7 +20,7 @@
         "@skeletonlabs/skeleton": "^2.10.3",
         "@skeletonlabs/tw-plugin": "^0.4.0",
         "@sveltejs/adapter-static": "^3.0.6",
-        "@sveltejs/kit": "^2.8.5",
+        "@sveltejs/kit": "^2.15.3",
         "@sveltejs/vite-plugin-svelte": "^5.0.1",
         "@tailwindcss/forms": "^0.5.9",
         "@tailwindcss/typography": "^0.5.15",
@@ -37,7 +37,7 @@
         "tailwindcss": "^3.4.15",
         "tslib": "^2.8.1",
         "typescript": "^5.7.2",
-        "vite": "^6.0.1"
+        "vite": "^6.0.7"
     },
     "type": "module",
     "dependencies": {

crates/modhost-ui/src/lib.rs

@@ -81,7 +81,7 @@
 
 <p class="text-primary-500 mb-2 flex flex-row items-center justify-start">
     <Icon icon="tabler:plus" height="24" class="mr-2" />
-    Create Package
+    Package Creation
 </p>
 
 {#snippet buttonComplete(locked: boolean, clickHandler: () => void)}
@@ -127,40 +127,48 @@
 
 <div class="flex h-full w-full flex-row items-start justify-start">
     <div
-        class="bg-surface-600 mr-4 flex h-full w-[40%] max-w-[40%] flex-col items-start justify-start overflow-scroll rounded-xl p-2 px-3"
+        class="bg-primary-500 bg-opacity-20 mr-4 flex h-full w-[40%] max-w-[40%] flex-col items-start justify-start overflow-scroll rounded-xl p-2 px-3 space-y-1"
     >
         <p class="border-b-primary-700 mb-1 w-full border-b py-1 text-lg font-bold">
             Package Overview
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:tag" height="24" />
             <span class="font-bold">Display Name:</span>
             <span>{name == "" ? "Unset" : name}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:link" height="24" />
             <span class="font-bold">Slug:</span>
             <span>{slug == "" ? "Unset" : slug}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:info-circle" height="24" />
             <span class="font-bold">Description:</span>
             <span>{description == "" ? "Unset" : description}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:code" height="24" />
             <span class="font-bold">Repository:</span>
             <span>{repo == "" ? "Unset" : repo}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:exclamation-circle" height="24" />
             <span class="font-bold">Issues:</span>
             <span>{issues == "" ? "Unset" : issues}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:world" height="24" />
             <span class="font-bold">Wiki:</span>
             <span>{wiki == "" ? "Unset" : wiki}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:license" height="24" />
             <span class="font-bold">License:</span>
             <span>{license == "" ? "Unset" : license}</span>
         </p>
-        <p>
+        <p class="flex flex-row items-center justify-start flex-wrap space-x-1">
+            <Icon icon="tabler:eye" height="24" />
             <span class="font-bold">Visibility:</span>
             <span>{visibility}</span>
         </p>