Merge branch 'dev'

Author: nomnomab

src-tauri/Cargo.toml

@@ -14,13 +14,17 @@ tauri-build = { version = "1", features = [] }
 anyhow = "1.0.86"
 thiserror = "1.0.63"
 showfile = "0.1.1"
-tauri = { version = "1", features = ["dialog-all", "shell-open"] }
+tauri = { version = "1", features = [
+  "window-show",
+  "dialog-all",
+  "shell-open",
+] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 flate2 = "1.0.30"
 tar = "0.4.41"
 dirs-next = "2.0.0"
-filesize = "0.2.0"                                                 # or "postgres", or "mysql"
+filesize = "0.2.0" # or "postgres", or "mysql"
 
 [features]
 # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!

src-tauri/tauri.conf.json

@@ -18,6 +18,9 @@
       },
       "dialog": {
         "all": true
+      },
+      "window": {
+        "show": true
       }
     },
     "windows": [
@@ -28,7 +31,8 @@
         "minWidth": 1024,
         "minHeight": 568,
         "resizable": true,
-        "theme": "Dark"
+        "theme": "Dark",
+        "visible": false
       }
     ],
     "security": {

src/components/main-sidebar.tsx

@@ -1,10 +1,9 @@
-import { ButtonHTMLAttributes, useContext } from "react";
+import { ButtonHTMLAttributes, useContext, useEffect } from "react";
 import { open } from "@tauri-apps/api/shell";
 import { GlobalContext } from "../context/global-context";
 import { getVersion } from "@tauri-apps/api/app";
-import AsyncComponent from "./async-component";
-
-const appVersion = await getVersion();
+import useBetterState from "../hooks/useBetterState";
+import { LazyValue } from "../utils";
 
 export default function MainSidebar() {
   return (
@@ -17,6 +16,21 @@ export default function MainSidebar() {
 
 function Options() {
   const globalContext = useContext(GlobalContext.Context);
+  const appVersion = useBetterState<LazyValue<string>>({
+    status: "loading",
+    value: null,
+  });
+
+  useEffect(() => {
+    getVersion()
+      .then((v) => {
+        appVersion.set({ status: "success", value: v });
+      })
+      .catch((e) => {
+        appVersion.set({ status: "error", value: e.message });
+      });
+  }, []);
+
   return (
     <>
       <div className="px-4 gap-3 flex flex-col flex-grow pb-3">
@@ -56,7 +70,9 @@ function Options() {
           </span>
         </p>
 
-        <p className="text-xs text-stone-400 select-none px-3">v{appVersion}</p>
+        <p className="text-xs text-stone-400 select-none px-3">
+          v{appVersion.value.value ?? "???"}
+        </p>
       </div>
     </>
   );

src/main.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
 import { GlobalContext } from "./context/global-context";
+import { appWindow } from "@tauri-apps/api/window";
 
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
   <React.StrictMode>
@@ -10,3 +11,5 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
     </GlobalContext.User>
   </React.StrictMode>
 );
+
+appWindow.show().then(() => {});

src/views/new-project/template-view.tsx

@@ -390,7 +390,14 @@ function TemplateInfo({
       tgzJson.set({ status: "success", value: json });
       newProjectContext.dispatch({
         type: "set_packages",
-        packages: Object.keys(json.tgzPackage.dependencies ?? {}) ?? [],
+        packages: Object.entries(json.tgzPackage.dependencies ?? {}).map(
+          ([k, v]) => {
+            return {
+              name: k,
+              version: (v as string) ?? undefined,
+            };
+          }
+        ),
       });
 
       newProjectContext.dispatch({