fixed errors for local build

Author: TwanLuttik

package.json

@@ -4,6 +4,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "clean-target": "rm -rf ./src-tauri/target",
+    "build:app:silicon": "pnpm clean-target && tauri build --target aarch64-apple-darwin",
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
@@ -46,4 +48,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.3.1"
   }
-}
+}

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "productName": "ollama-chat",
   "version": "0.0.0",
-  "identifier": "com.tauri.dev",
+  "identifier": "com.twanluttik.ollama-interface",
   "build": {
     "beforeDevCommand": "pnpm dev",
     "devUrl": "http://localhost:1420",

src/app/index.tsx

@@ -2,21 +2,20 @@ import { useEffect } from "react";
 import { actions, core, syncModels } from "@/core";
 import { loadDB } from "@/core/local-database";
 import { Sidebar } from "@/app/parts/sidebar";
-import { Command } from "@tauri-apps/plugin-shell";
 import { ChatWindow } from "./parts/chat-window";
 import { SettingsWrapper } from "./parts/settings-wrapper";
 
 // Load the database on the app frame
 loadDB();
 
 export const AppFrame = () => {
-  async function startServer() {
-    let result = await Command.create("ollama-server", [
-      "-c",
-      "OLLAMA_ORIGINS=* OLLAMA_HOST=127.0.0.1:11434 ollama serve",
-    ]).execute();
-    console.log(result);
-  }
+  // async function startServer() {
+  //   let result = await Command.create("ollama-server", [
+  //     "-c",
+  //     "OLLAMA_ORIGINS=* OLLAMA_HOST=127.0.0.1:11434 ollama serve",
+  //   ]).execute();
+  //   console.log(result);
+  // }
 
   const loadAppData = async () => {
     // Load available models

src/app/parts/chat-message.tsx

@@ -9,7 +9,7 @@ export const ChatMessage = (props: ChatMessageProps) => {
 
   const parseText = useCallback(async () => {
     const p = await marked.parse(props.message);
-    contentRef.current.innerHTML = p;
+    if (contentRef?.current) contentRef.current.innerHTML = p;
   }, [props.message]);
 
   useEffect(() => {

src/app/parts/chat-window.tsx

@@ -1,5 +1,4 @@
 import { ChatHeader } from "./chat-header";
-import { Command } from "@tauri-apps/plugin-shell";
 import { Input } from "@/components/ui/input";
 import { useCallback, useState } from "react";
 import {
@@ -38,13 +37,13 @@ export const ChatWindow = () => {
   }, [messages, conv_id]);
 
   // TODO: We need to move this function to a life cycle for auto restart feature
-  async function startServer() {
-    let result = await Command.create("ollama-server", [
-      "-c",
-      "OLLAMA_ORIGINS=* OLLAMA_HOST=127.0.0.1:11434 ollama serve",
-    ]).execute();
-    console.log(result);
-  }
+  // async function startServer() {
+  //   let result = await Command.create("ollama-server", [
+  //     "-c",
+  //     "OLLAMA_ORIGINS=* OLLAMA_HOST=127.0.0.1:11434 ollama serve",
+  //   ]).execute();
+  //   console.log(result);
+  // }
 
   const changeModel = (model_name: string) => {
     // Update last used
@@ -89,7 +88,7 @@ export const ChatWindow = () => {
       message: m,
       created_at: dayjs().toDate(),
       ai_replied: false,
-      ctx: null,
+      ctx: "",
     };
 
     // save the send prompt in db
@@ -105,7 +104,7 @@ export const ChatWindow = () => {
 
     let lastCtx = [];
     if (messages.length > 1) {
-      lastCtx = JSON.parse(messages[1].ctx);
+      lastCtx = JSON.parse((messages[1].ctx as string) || "");
     }
 
     if (messages?.length === 0) {

tsconfig.app.json

@@ -24,9 +24,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src"],
-  "references": [
-    { "path": "./tsconfig.node.json" },
-    { "path": "./tsconfig.app.json" }
-  ]
+  "include": ["src", "tsconfig.json"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }