Tauri API implemented in Svelte

open-goal · Dec 27, 2024 · 33f50f5 · 33f50f5
1 parent 3dc7a1b
commit 33f50f5
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 35 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -35,7 +35,14 @@
   "mainBinaryName": "OpenGOAL-Launcher",
   "version": "2.5.4",
   "identifier": "OpenGOAL-Launcher",
-  "plugins": {},
+  "plugins": {
+    "updater": {
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM5Q0RCMDMyRkYwQTQxOTIKUldTU1FRci9NckROT1FERSs0UjhTNzRsTHU0cjZGdTZzN1FTWGF4aldYdGFlTG56eWc5Uko4YzkK",
+      "endpoints": [
+        "https://raw.githubusercontent.com/open-goal/launcher/main/.tauri/latest-release-v2.json"
+      ]
+    }
+  },
   "app": {
     "security": {
       "assetProtocol": {

diff --git a/src/components/header/Header.svelte b/src/components/header/Header.svelte
@@ -7,7 +7,7 @@
   import IconWindowMinimize from "~icons/mdi/window-minimize";
   import IconWindowClose from "~icons/mdi/window-close";
   import { UpdateStore } from "$lib/stores/AppStore";
-  import { checkUpdate } from "@tauri-apps/plugin-updater";
+  import { check } from "@tauri-apps/plugin-updater";
   import { isInDebugMode } from "$lib/utils/common";
   import {
     getActiveVersion,
@@ -19,7 +19,7 @@
   import { exceptionLog, infoLog } from "$lib/rpc/logging";
   import { _ } from "svelte-i18n";
   import { toastStore } from "$lib/stores/ToastStore";
-const appWindow = getCurrentWebviewWindow()
+  const appWindow = getCurrentWebviewWindow();
 
   let launcherVerison = null;
 
@@ -31,12 +31,12 @@ const appWindow = getCurrentWebviewWindow()
     $VersionStore.activeVersionName = await getActiveVersion();
 
     // Check for a launcher update
-    // NOTE - the following code (checkUpdate) won't work unless you have `update` configuration
+    // NOTE - the following code (check for Update) won't work unless you have `update` configuration
     // added to the tauri.conf.json
+
     if (!isInDebugMode()) {
-      const updateResult = await checkUpdate();
+      const updateResult = await check();
       if (updateResult.shouldUpdate) {
-        // TODO - store methods to clean this up
         let changeLog = [];
         try {
           changeLog = JSON.parse(updateResult.manifest.body);
@@ -80,7 +80,7 @@ const appWindow = getCurrentWebviewWindow()
         latestToolingVersion !== undefined &&
         $VersionStore.activeVersionName !== latestToolingVersion.version
       ) {
-        // Check that we havn't already downloaded it
+        // Check that we haven't already downloaded it
         let alreadyHaveRelease = false;
         const downloadedOfficialVersions =
           await listDownloadedVersions("official");
@@ -166,3 +166,6 @@ const appWindow = getCurrentWebviewWindow()
     </button>
   </div>
 </header>
+
+<style>
+</style>
diff --git a/src/routes/Update.svelte b/src/routes/Update.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { installUpdate } from "@tauri-apps/plugin-updater";
+  import { check } from "@tauri-apps/plugin-updater";
   import { relaunch } from "@tauri-apps/plugin-process";
   import {
     Button,
@@ -26,7 +26,8 @@
 
   async function updateHandler() {
     updating = true;
-    await installUpdate();
+    let update = await check();
+    await update?.downloadAndInstall();
     await relaunch();
   }
 </script>
@@ -121,3 +122,6 @@
     </h1>
   {/if}
 </div>
+
+<style>
+</style>
diff --git a/src/splash/components/LocaleQuickChanger.svelte b/src/splash/components/LocaleQuickChanger.svelte
@@ -17,34 +17,40 @@
   });
 </script>
 
-<select
-  data-testId="locale-select"
-  name="locales"
-  id="locales"
-  title={$_("splash_selectLocale")}
-  class="emoji-font pointer-events-auto !p-0 !pl-1 !pr-1 !pt-1 text-sm bg-gray-700 mb-1 absolute top-0 border-transparent focus:border-transparent focus:ring-0"
-  on:change={(evt) => {
-    let newLocale = evt.target.value;
-    dispatch("change", {
-      newLocale: newLocale,
-    });
-  }}
->
-  {#each AVAILABLE_LOCALES as locale}
-    {#if locale.id === currentLocale}
-      <option value={locale.id} selected
-        ><span class="emoji-font">{locale.flag}</span></option
-      >
-    {:else}
-      <option value={locale.id}
-        ><span class="emoji-font">{locale.flag}</span></option
-      >
-    {/if}
-  {/each}
-</select>
+<div>
+  <select
+    data-testId="locale-select"
+    name="locales"
+    id="locales"
+    title={$_("splash_selectLocale")}
+    class="emoji-font pointer-events-auto !p-0 !pl-1 !pr-1 !pt-1 text-sm bg-gray-700 mb-1 absolute top-0 border-transparent focus:border-transparent focus:ring-0"
+    bind:value={currentLocale}
+    on:change={() => {
+      dispatch("change", {
+        newLocale: currentLocale,
+      });
+    }}
+  >
+    {#each AVAILABLE_LOCALES as locale}
+      {#if locale.id === currentLocale}
+        <option value={locale.id} selected>
+          <!-- TODO: Fix FLags
+        <span class="emoji-font">{locale.flag}</span>
+        -->
+        </option>
+      {:else}
+        <option value={locale.id}>
+          <!-- TODO: Fix Flags
+        <span class="emoji-font">{locale.flag}</span>
+        -->
+        </option>
+      {/if}
+    {/each}
+  </select>
+</div>
 
 <style>
   .emoji-font {
-    font-family: "Twemoji Country Flags", "Roboto Mono";
+    font-family: "Twemoji Country Flags", "Roboto Mono", serif;
   }
 </style>
diff --git a/vite.config.ts b/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import Icons from "unplugin-icons/vite";
 import { fileURLToPath, URL } from "url";
+import { sveltePreprocess } from "svelte-preprocess";
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -11,6 +12,9 @@ export default defineConfig({
   plugins: [
     svelte({
       hot: !process.env.VITEST,
+      preprocess: sveltePreprocess({
+        postcss: true, // Enable PostCSS for styles
+      }),
     }),
     Icons({
       compiler: "svelte",