Merge remote-tracking branch 'origin/v2' into plugin/secure-storage

examples/api/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.28]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.3.2`
+
 ## \[2.0.27]
 
 ### Dependencies

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.27",
+  "version": "2.0.28",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -15,7 +15,7 @@
     "@tauri-apps/plugin-biometric": "^2.3.0",
     "@tauri-apps/plugin-cli": "^2.4.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
-    "@tauri-apps/plugin-dialog": "^2.3.1",
+    "@tauri-apps/plugin-dialog": "^2.3.2",
     "@tauri-apps/plugin-fs": "^2.4.1",
     "@tauri-apps/plugin-geolocation": "^2.2.0",
     "@tauri-apps/plugin-global-shortcut": "^2.3.0",

examples/api/src-tauri/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.32]
+
+### Dependencies
+
+- Upgraded to `dialog@2.3.2`
+
 ## \[2.0.31]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.31"
+version = "2.0.32"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -25,7 +25,7 @@ tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.1", features =
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.1" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.2" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
   "cookies",

examples/api/src/views/Store.svelte

@@ -1,71 +1,85 @@
 <script>
-  import { LazyStore } from "@tauri-apps/plugin-store";
-  import { onMount } from "svelte";
+  import { appDataDir, resolve } from '@tauri-apps/api/path'
+  import { LazyStore } from '@tauri-apps/plugin-store'
+  import { onMount } from 'svelte'
 
-  export let onMessage;
+  let { onMessage } = $props()
 
-  let key;
-  let value;
+  let key = $state()
+  let value = $state()
 
-  let store = new LazyStore("cache.json");
-  let cache = {};
+  const storeName = 'cache.json'
+
+  let store = new LazyStore(storeName)
+  let path = $state('')
+  let cache = $state({})
 
   async function refreshEntries() {
     try {
-      const values = await store.entries();
-      cache = {};
+      const values = await store.entries()
+      cache = {}
       for (const [key, value] of values) {
-        cache[key] = value;
+        cache[key] = value
       }
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   onMount(async () => {
-    await refreshEntries();
-  });
+    path = await resolve(await appDataDir(), storeName)
+    await refreshEntries()
+  })
 
   async function write(key, value) {
     try {
       if (value) {
-        await store.set(key, value);
+        await store.set(key, value)
       } else {
-        await store.delete(key);
+        await store.delete(key)
       }
-      const v = await store.get(key);
+      const v = await store.get(key)
       if (v === undefined) {
-        delete cache[key];
-        cache = cache;
+        delete cache[key]
+        cache = cache
       } else {
-        cache[key] = v;
+        cache[key] = v
       }
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   async function reset() {
     try {
-      await store.reset();
+      await store.reset()
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
-    await refreshEntries();
+    await refreshEntries()
+  }
+
+  async function reload() {
+    try {
+      await store.reload({ overrideDefaults: true })
+    } catch (error) {
+      onMessage(error)
+    }
+    await refreshEntries()
   }
 
   async function close() {
     try {
-      await store.close();
-      onMessage("Store is now closed, any new operations will error out");
+      await store.close()
+      onMessage('Store is now closed, any new operations will error out')
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   function reopen() {
-    store = new LazyStore("cache.json");
-    onMessage("We made a new `LazyStore` instance, operations will now work");
+    store = new LazyStore(storeName)
+    onMessage('We made a new `LazyStore` instance, operations will now work')
   }
 </script>
 
@@ -82,14 +96,17 @@
     </div>
 
     <div>
-      <button class="btn" on:click={() => write(key, value)}>Write</button>
-      <button class="btn" on:click={() => reset()}>Reset</button>
-      <button class="btn" on:click={() => close()}>Close</button>
-      <button class="btn" on:click={() => reopen()}>Re-open</button>
+      <button class="btn" onclick={() => write(key, value)}>Write</button>
+      <button class="btn" onclick={() => reset()}>Reset</button>
+      <button class="btn" onclick={() => reload()}>Reload</button>
+      <button class="btn" onclick={() => close()}>Close</button>
+      <button class="btn" onclick={() => reopen()}>Re-open</button>
     </div>
+    <div>Store at <code>{path}</code> on disk</div>
   </div>
 
   <div>
+    <h2>Store Values</h2>
     {#each Object.entries(cache) as [k, v]}
       <div>{k} = {v}</div>
     {/each}