chore(deps): update eslint monorepo to v9.39.3 (#3302 )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
chore(deps): update dependency prettier to v3.8.1 (#3255 )
2026-05-01 12:08:06 +02:00 · 2026-03-02 09:35:20 +01:00 · 2026-03-01 11:26:09 +08:00 · 2026-03-01 11:12:05 +08:00 · 2026-01-19 14:18:03 +01:00 · 2026-01-19 13:39:05 +01:00
222 changed files with 6273 additions and 13058 deletions
@@ -33,15 +33,6 @@
    }
  },
  "packages": {
-    "authenticator": {
-      "path": "./plugins/authenticator",
-      "manager": "rust-disabled"
-    },
-    "authenticator-js": {
-      "path": "./plugins/authenticator",
-      "manager": "javascript-disabled"
-    },
-
    "autostart": {
      "path": "./plugins/autostart",
      "manager": "rust-disabled"
@@ -1,5 +0,0 @@
---
-"stronghold-js": minor
---
-
-Added `Stronghold.load` and removed its constructor.
@@ -1,4 +0,0 @@
-target
-node_modules
-dist
-dist-js
@@ -1,20 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true
-  },
-  "extends": [
-    "prettier",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:security/recommended"
-  ],
-  "overrides": [],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "plugins": ["@typescript-eslint"],
-  "rules": {}
-}
@@ -0,0 +1,31 @@
+<svg class="crabnebula-logo" width="100%" height="100%" viewBox="0 0 1204 210" version="1.1"
+    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+    xml:space="preserve" xmlns:serif="http://www.serif.com/"
+    style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <style>
+        .crabnebula-logo path, 
+        .crabnebula-logo rect {
+            fill: #001e42;
+        }
+        @media (prefers-color-scheme: dark) {
+            .crabnebula-logo path, .crabnebula-logo rect {
+                fill: #fff;
+            }
+        }
+        html[data-color-mode="dark"] .crabnebula-logo path, 
+        html[data-color-mode="dark"] .crabnebula-logo rect {
+            fill: #fff;
+        }
+    </style>
+    <path d="M351.903,162.334C344.288,162.334 337.123,160.881 330.41,157.975C323.696,155.069 317.834,151.11 312.824,146.099C307.914,141.089 304.006,135.276 301.101,128.662C298.195,121.948 296.742,114.783 296.742,107.167C296.742,99.55 298.195,92.435 301.101,85.821C304.006,79.107 307.914,73.244 312.824,68.234C317.834,63.223 323.696,59.265 330.41,56.358C337.123,53.452 344.288,51.999 351.903,51.999C357.414,51.999 362.675,52.701 367.685,54.103C372.795,55.507 377.455,57.511 381.663,60.116C385.972,62.622 389.83,65.678 393.237,69.286C396.644,72.793 399.499,76.752 401.804,81.161L380.762,92.586C377.756,87.174 373.848,82.915 369.038,79.808C364.328,76.702 358.617,75.148 351.903,75.148C347.494,75.148 343.386,76 339.578,77.704C335.871,79.407 332.614,81.762 329.809,84.769C327.003,87.675 324.798,91.082 323.195,94.991C321.592,98.799 320.79,102.857 320.79,107.167C320.79,111.476 321.592,115.584 323.195,119.493C324.798,123.301 327.003,126.708 329.809,129.715C332.614,132.621 335.871,134.926 339.578,136.629C343.386,138.333 347.494,139.185 351.903,139.185C358.617,139.185 364.328,137.631 369.038,134.525C373.848,131.418 377.756,127.159 380.762,121.748L401.804,133.172C399.499,137.581 396.644,141.59 393.237,145.198C389.83,148.705 385.972,151.762 381.663,154.367C377.455,156.872 372.795,158.827 367.685,160.23C362.675,161.633 357.414,162.334 351.903,162.334Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M413.821,85.37L436.517,85.37L436.517,96.644C437.72,93.337 439.924,90.481 443.131,88.076C446.437,85.671 450.195,84.468 454.403,84.468C455.506,84.468 456.658,84.518 457.86,84.619C459.063,84.719 460.366,84.969 461.768,85.37L461.768,108.369C460.065,107.768 458.412,107.317 456.808,107.016C455.205,106.716 453.502,106.565 451.698,106.565C446.788,106.565 443.03,108.269 440.425,111.676C437.82,115.083 436.517,119.493 436.517,124.904L436.517,160.53L413.821,160.53L413.821,85.37Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M502.161,162.184C497.251,162.184 492.642,161.132 488.333,159.027C484.125,156.923 480.467,154.117 477.361,150.609C474.255,147.001 471.8,142.843 469.996,138.133C468.193,133.322 467.291,128.261 467.291,122.95C467.291,117.639 468.193,112.628 469.996,107.918C471.8,103.108 474.255,98.949 477.361,95.442C480.467,91.834 484.125,88.978 488.333,86.873C492.642,84.769 497.251,83.717 502.161,83.717C504.666,83.717 506.971,84.017 509.075,84.619C511.28,85.12 513.234,85.821 514.937,86.723C516.741,87.625 518.244,88.627 519.446,89.729C520.749,90.832 521.801,91.884 522.603,92.886L522.603,85.37L545.299,85.37L545.299,160.53L522.603,160.53L522.603,153.014C521.801,154.016 520.749,155.069 519.446,156.171C518.244,157.273 516.741,158.275 514.937,159.177C513.234,160.079 511.28,160.781 509.075,161.282C506.971,161.883 504.666,162.184 502.161,162.184ZM507.272,141.59C512.382,141.59 516.49,139.836 519.597,136.329C522.803,132.821 524.406,128.362 524.406,122.95C524.406,117.539 522.803,113.079 519.597,109.572C516.49,106.064 512.382,104.31 507.272,104.31C502.161,104.31 498.003,106.064 494.796,109.572C491.69,113.079 490.137,117.539 490.137,122.95C490.137,128.362 491.69,132.821 494.796,136.329C498.003,139.836 502.161,141.59 507.272,141.59Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M607.116,162.184C604.611,162.184 602.256,161.883 600.051,161.282C597.947,160.781 595.993,160.079 594.19,159.177C592.486,158.275 590.983,157.273 589.681,156.171C588.378,155.069 587.376,154.016 586.674,153.014L586.674,160.53L563.979,160.53L563.979,47.79L586.674,47.79L586.674,92.886C587.376,91.884 588.378,90.832 589.681,89.729C590.983,88.627 592.486,87.625 594.19,86.723C595.993,85.821 597.947,85.12 600.051,84.619C602.256,84.017 604.611,83.717 607.116,83.717C612.026,83.717 616.585,84.769 620.793,86.873C625.102,88.978 628.81,91.834 631.916,95.442C635.022,98.949 637.477,103.108 639.281,107.918C641.084,112.628 641.986,117.639 641.986,122.95C641.986,128.261 641.084,133.322 639.281,138.133C637.477,142.843 635.022,147.001 631.916,150.609C628.81,154.117 625.102,156.923 620.793,159.027C616.585,161.132 612.026,162.184 607.116,162.184ZM602.005,141.59C607.116,141.59 611.224,139.836 614.33,136.329C617.537,132.821 619.14,128.362 619.14,122.95C619.14,117.539 617.537,113.079 614.33,109.572C611.224,106.064 607.116,104.31 602.005,104.31C596.895,104.31 592.737,106.064 589.53,109.572C586.424,113.079 584.871,117.539 584.871,122.95C584.871,128.362 586.424,132.821 589.53,136.329C592.737,139.836 596.895,141.59 602.005,141.59Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M732.106,160.53L680.101,94.54L680.101,160.53L656.203,160.53L656.203,53.803L676.795,53.803L728.649,119.793L728.649,53.803L752.698,53.803L752.698,160.53L732.106,160.53Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M806.852,162.184C801.341,162.184 796.13,161.282 791.22,159.478C786.411,157.674 782.202,155.069 778.595,151.661C774.988,148.254 772.132,144.145 770.028,139.335C767.923,134.425 766.871,128.963 766.871,122.95C766.871,117.338 767.823,112.177 769.727,107.467C771.731,102.657 774.487,98.498 777.994,94.991C781.601,91.483 785.809,88.727 790.619,86.723C795.429,84.719 800.69,83.717 806.401,83.717C811.311,83.717 816.021,84.518 820.53,86.122C825.139,87.625 829.147,89.93 832.554,93.036C835.961,96.043 838.666,99.851 840.67,104.461C842.775,108.97 843.827,114.282 843.827,120.395C843.827,121.397 843.777,122.549 843.677,123.852C843.677,125.055 843.576,126.558 843.376,128.362L788.816,128.362C789.517,132.871 791.671,136.228 795.279,138.433C798.886,140.538 802.844,141.59 807.153,141.59C811.562,141.59 815.319,140.738 818.425,139.034C821.632,137.231 823.937,135.226 825.339,133.022L842.173,145.649C838.666,150.659 833.857,154.668 827.744,157.674C821.732,160.681 814.768,162.184 806.852,162.184ZM821.281,113.48C820.279,109.471 818.275,106.615 815.269,104.912C812.263,103.108 809.107,102.206 805.8,102.206C804.096,102.206 802.393,102.406 800.69,102.807C798.986,103.208 797.383,103.859 795.88,104.761C794.377,105.663 793.024,106.816 791.822,108.219C790.719,109.622 789.918,111.376 789.417,113.48L821.281,113.48Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M901.265,162.184C898.76,162.184 896.405,161.883 894.201,161.282C892.097,160.781 890.143,160.079 888.339,159.177C886.636,158.275 885.133,157.273 883.83,156.171C882.527,155.069 881.525,154.016 880.824,153.014L880.824,160.53L858.128,160.53L858.128,47.79L880.824,47.79L880.824,92.886C881.525,91.884 882.527,90.832 883.83,89.729C885.133,88.627 886.636,87.625 888.339,86.723C890.143,85.821 892.097,85.12 894.201,84.619C896.405,84.017 898.76,83.717 901.265,83.717C906.175,83.717 910.734,84.769 914.943,86.873C919.252,88.978 922.959,91.834 926.065,95.442C929.172,98.949 931.627,103.108 933.43,107.918C935.234,112.628 936.136,117.639 936.136,122.95C936.136,128.261 935.234,133.322 933.43,138.133C931.627,142.843 929.172,147.001 926.065,150.609C922.959,154.117 919.252,156.923 914.943,159.027C910.734,161.132 906.175,162.184 901.265,162.184ZM896.155,141.59C901.265,141.59 905.374,139.836 908.48,136.329C911.686,132.821 913.29,128.362 913.29,122.95C913.29,117.539 911.686,113.079 908.48,109.572C905.374,106.064 901.265,104.31 896.155,104.31C891.045,104.31 886.886,106.064 883.68,109.572C880.573,113.079 879.02,117.539 879.02,122.95C879.02,128.362 880.573,132.821 883.68,136.329C886.886,139.836 891.045,141.59 896.155,141.59Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M977.812,162.184C968.493,162.184 961.429,159.077 956.619,152.864C951.81,146.651 949.405,138.433 949.405,128.211L949.405,85.37L972.101,85.37L972.101,124.303C972.101,129.815 972.952,134.074 974.656,137.08C976.459,140.087 979.466,141.59 983.674,141.59C987.983,141.59 991.39,140.037 993.895,136.93C996.5,133.823 997.803,128.813 997.803,121.898L997.803,85.37L1020.5,85.37L1020.5,160.53L997.803,160.53L997.803,152.864C995.999,155.469 993.444,157.674 990.137,159.478C986.83,161.282 982.722,162.184 977.812,162.184Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <rect x="1039.11" y="47.79" width="22.701" height="112.74" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M1110.86,162.184C1105.95,162.184 1101.34,161.132 1097.03,159.027C1092.83,156.923 1089.17,154.117 1086.06,150.609C1082.96,147.001 1080.5,142.843 1078.7,138.133C1076.89,133.322 1075.99,128.261 1075.99,122.95C1075.99,117.639 1076.89,112.628 1078.7,107.918C1080.5,103.108 1082.96,98.949 1086.06,95.442C1089.17,91.834 1092.83,88.978 1097.03,86.873C1101.34,84.769 1105.95,83.717 1110.86,83.717C1113.37,83.717 1115.67,84.017 1117.78,84.619C1119.98,85.12 1121.94,85.821 1123.64,86.723C1125.44,87.625 1126.95,88.627 1128.15,89.729C1129.45,90.832 1130.5,91.884 1131.3,92.886L1131.3,85.37L1154,85.37L1154,160.53L1131.3,160.53L1131.3,153.014C1130.5,154.016 1129.45,155.069 1128.15,156.171C1126.95,157.273 1125.44,158.275 1123.64,159.177C1121.94,160.079 1119.98,160.781 1117.78,161.282C1115.67,161.883 1113.37,162.184 1110.86,162.184ZM1115.97,141.59C1121.08,141.59 1125.19,139.836 1128.3,136.329C1131.5,132.821 1133.11,128.362 1133.11,122.95C1133.11,117.539 1131.5,113.079 1128.3,109.572C1125.19,106.064 1121.08,104.31 1115.97,104.31C1110.86,104.31 1106.7,106.064 1103.5,109.572C1100.39,113.079 1098.84,117.539 1098.84,122.95C1098.84,128.362 1100.39,132.821 1103.5,136.329C1106.7,139.836 1110.86,141.59 1115.97,141.59Z" style="fill-rule:nonzero;stroke:black;stroke-width:0.55px;"/>
+    <path d="M146.48,54.585C119.724,89.866 119.878,134.941 146.826,155.264C153.908,160.605 162.136,163.705 170.903,164.732C146.032,184.934 117.382,191.203 98.037,178.045C71.507,160 72.524,112.249 100.309,71.391C123.51,37.273 158.039,18.749 184.247,24.072C170.404,30.195 157.116,40.561 146.48,54.585ZM181.638,99.643C169.141,111.453 154.859,119.304 142.801,121.916C149.921,147.367 177.29,149.323 177.29,149.323C177.29,149.323 193.578,145.578 205.877,117.941C216.005,95.183 215.122,71.668 204.914,59.7C204.065,71.267 195.731,86.324 181.638,99.643Z" style="stroke:black;stroke-width:0.55px;"/>
+</svg>
@@ -39,10 +39,10 @@ jobs:
            ${{ runner.os }}-
      - uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 20
      - uses: pnpm/action-setup@v2
        with:
-          version: 7.x.x
+          version: 10.x.x
          run_install: true
      - name: audit
        run: pnpm audit
@@ -33,3 +33,5 @@ jobs:
      - uses: rustsec/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
+          # https://github.com/tauri-apps/plugins-workspace/issues/774
+          ignore: ${{ github.event_name != 'schedule' && 'RUSTSEC-2023-0071' || '' }}
@@ -7,7 +7,7 @@ on:

 jobs:
  version-or-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    timeout-minutes: 65
    outputs:
      change: ${{ steps.covector.outputs.change }}
@@ -26,13 +26,13 @@ jobs:

      - uses: pnpm/action-setup@v2
        with:
-          version: 7.x.x
+          version: 10.x.x
          run_install: true

-      - name: install webkit2gtk and libudev for [authenticator]
+      - name: install webkit2gtk
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev

      - name: cargo login
        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
@@ -60,5 +60,5 @@ jobs:
          title: "Publish New Versions"
          commit-message: "publish new versions"
          labels: "version updates"
-          branch: "release"
+          branch: "ci/release-v1"
          body: ${{ steps.covector.outputs.change }}
@@ -42,10 +42,10 @@ jobs:
            ${{ runner.os }}-
      - uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 20
      - uses: pnpm/action-setup@v2
        with:
-          version: 7.x.x
+          version: 10.x.x
          run_install: true
      - name: eslint
        run: pnpm lint
@@ -62,10 +62,10 @@ jobs:
            ${{ runner.os }}-
      - uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 20
      - uses: pnpm/action-setup@v2
        with:
-          version: 7.x.x
+          version: 10.x.x
          run_install: true
      - name: prettier check
        run: pnpm format-check
@@ -24,17 +24,17 @@ concurrency:

 jobs:
  clippy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    strategy:
      fail-fast: false

    steps:
      - uses: actions/checkout@v3

-      - name: install webkit2gtk and libudev for [authenticator]
+      - name: install webkit2gtk
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev

      - name: Install clippy with stable toolchain
        uses: dtolnay/rust-toolchain@stable
@@ -26,25 +26,27 @@ concurrency:

 jobs:
  msrv:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    strategy:
      fail-fast: false

    steps:
      - uses: actions/checkout@v3

-      - name: install webkit2gtk and libudev for [authenticator]
+      - name: install webkit2gtk
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev

-      - uses: dtolnay/rust-toolchain@1.64.0
+      - uses: dtolnay/rust-toolchain@1.67.0

      - uses: Swatinem/rust-cache@v2

      - name: build
        run: cargo build --workspace --exclude 'tauri-plugin-sql' --all-targets --all-features

+      - uses: dtolnay/rust-toolchain@1.80.1
+
      - name: build sql:sqlite
        run: cargo build --package 'tauri-plugin-sql' --all-targets --features sqlite

@@ -30,11 +30,11 @@ jobs:

      - uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 20

      - uses: pnpm/action-setup@v2
        with:
-          version: 7.x.x
+          version: 10.x.x
          run_install: true

      - name: Build packages
@@ -1,4 +1,3 @@
 target
 node_modules
-dist
 dist-js
@@ -48,7 +48,7 @@ https.get(url, options, (response) => {
      console.log(versions.length ? versions[0].num : "0.0.0");
    } else if (kind === "npm") {
      const versions = Object.keys(data.versions).filter((v) =>
-        v.startsWith(target)
+        v.startsWith(target),
      );
      console.log(versions[versions.length - 1] || "0.0.0");
    }
@@ -1,17 +1,36 @@
 [workspace]
-members = ["plugins/*"]
+# Listed without globs to prevent issues with renovate's baseBranches config.
+members = [
+  "plugins/autostart",
+  "plugins/fs-extra",
+  "plugins/fs-watch",
+  "plugins/localhost",
+  "plugins/log",
+  "plugins/persisted-scope",
+  "plugins/positioner",
+  "plugins/single-instance",
+  "plugins/sql",
+  "plugins/store",
+  "plugins/stronghold",
+  "plugins/upload",
+  "plugins/websocket",
+  "plugins/window-state",
+  "plugins/single-instance/examples/vanilla/src-tauri",
+  "plugins/store/examples/AppSettingsManager/src-tauri",
+  "plugins/websocket/examples/tauri-app/src-tauri",
+]
 resolver = "2"

 [workspace.dependencies]
-serde = { version = "1", features = ["derive"] }
 log = "0.4"
+serde = {version = "1", features = ["derive"]}
+serde_json = "1"
 tauri = "1"
 tauri-build = "1"
-serde_json = "1"
 thiserror = "1"

 [workspace.package]
+authors = ["Tauri Programme within The Commons Conservancy"]
 edition = "2021"
-authors = [ "Tauri Programme within The Commons Conservancy" ]
 license = "Apache-2.0 OR MIT"
-rust-version = "1.64"
+rust-version = "1.67"
@@ -2,7 +2,6 @@

 |                                            |                                                           | Win | Mac | Lin | iOS | And |
 | ------------------------------------------ | --------------------------------------------------------- | --- | --- | --- | --- | --- |
-| [authenticator](plugins/authenticator)     | Interface with hardware security keys.                    | ✅  | ✅  | ✅  | ?   | ?   |
 | [autostart](plugins/autostart)             | Automatically launch your app at system startup.          | ✅  | ✅  | ✅  | ?   | ?   |
 | [fs-extra](plugins/fs-extra)               | File system methods that aren't included in the core API. | ✅  | ✅  | ✅  | ?   | ?   |
 | [fs-watch](plugins/fs-watch)               | Watch the filesystem for changes.                         | ✅  | ✅  | ✅  | ?   | ?   |
@@ -18,4 +17,20 @@
 | [websocket](plugins/websocket)             | Open a WebSocket connection using a Rust client in JS.    | ✅  | ✅  | ✅  | ?   | ?   |
 | [window-state](plugins/window-state)       | Persist window sizes and positions.                       | ✅  | ✅  | ✅  | ?   | ?   |

-_This repo and all plugins require a Rust version of at least **1.64**_
+_This repo and all plugins require a Rust version of at least **1.67**_
+
+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src=".github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
@@ -0,0 +1,26 @@
+import eslint from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+  {
+    ignores: [
+      "**/target",
+      "**/node_modules",
+      "**/dist",
+      "**/dist-js",
+      "**/rollup.config.mjs",
+      "**/vite.config.ts",
+      ".scripts",
+      "eslint.config.js",
+    ],
+  },
+  eslint.configs.recommended,
+  eslintConfigPrettier,
+  ...tseslint.configs.recommendedTypeChecked,
+  {
+    languageOptions: {
+      parserOptions: { project: true, tsconfigRootDir: import.meta.dirname },
+    },
+  },
+);
@@ -10,23 +10,29 @@
    "format-check": "prettier --check ."
  },
  "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@rollup/plugin-terser": "^0.4.1",
-    "@rollup/plugin-typescript": "^11.1.0",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
-    "@typescript-eslint/parser": "^5.58.0",
-    "eslint": "^8.38.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-standard-with-typescript": "^35.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-security": "^1.7.1",
-    "prettier": "^2.8.7",
-    "rollup": "^3.20.4",
-    "typescript": "^5.0.4"
+    "@eslint/js": "9.39.3",
+    "@rollup/plugin-node-resolve": "16.0.3",
+    "@rollup/plugin-terser": "0.4.4",
+    "@rollup/plugin-typescript": "11.1.6",
+    "eslint": "9.39.3",
+    "eslint-config-prettier": "10.1.8",
+    "prettier": "3.8.1",
+    "rollup": "4.59.0",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.53.0"
+  },
+  "resolutions": {
+    "semver": ">=7.5.2",
+    "optionator": ">=0.9.3"
  },
  "engines": {
-    "pnpm": ">=7.33.0"
+    "pnpm": "^10.0.0"
+  },
+  "pnpm": {
+    "auditConfig": {
+      "ignoreCves": [
+        "CVE-2023-46115"
+      ]
+    }
  }
 }
@@ -1 +0,0 @@
-node_modules
@@ -1,27 +0,0 @@
-[package]
-name = "tauri-plugin-authenticator"
-version = "0.0.0"
-description = "Use hardware security-keys in your Tauri App."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
-authenticator = "0.3.1"
-once_cell = "1"
-sha2 = "0.10"
-base64 = "0.21"
-u2f = "0.2"
-chrono = "0.4"
-
-[dev-dependencies]
-rand = "0.8"
-rusty-fork = "0.3"
@@ -1,20 +0,0 @@
-SPDXVersion: SPDX-2.1
-DataLicense: CC0-1.0
-PackageName: tauri
-DataFormat: SPDXRef-1
-PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
-PackageHomePage: https://tauri.app
-PackageLicenseDeclared: Apache-2.0
-PackageLicenseDeclared: MIT
-PackageCopyrightText: 2019-2022, The Tauri Programme in the Commons Conservancy
-PackageSummary: <text>Tauri is a rust project that enables developers to make secure
-and small desktop applications using a web frontend.
-                </text>
-PackageComment: <text>The package includes the following libraries; see
-Relationship information.
-                </text>
-Created: 2019-05-20T09:00:00Z
-PackageDownloadLocation: git://github.com/tauri-apps/tauri
-PackageDownloadLocation: git+https://github.com/tauri-apps/tauri.git
-PackageDownloadLocation: git+ssh://github.com/tauri-apps/tauri.git
-Creator: Person: Daniel Thompson-Yvetot
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 - Present Tauri Apps Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,110 +0,0 @@
-![plugin-authenticator](banner.png)
-
-Use hardware security-keys in your Tauri App.
-
-## Install
-
-_This plugin requires a Rust version of at least **1.64**_
-
-There are three general methods of installation that we can recommend.
-
-1. Use crates.io and npm (easiest, and requires you to trust that our publishing pipeline worked)
-2. Pull sources directly from Github using git tags / revision hashes (most secure)
-3. Git submodule install this repo in your tauri project and then use file protocol to ingest the source (most secure, but inconvenient to use)
-
-Install the Core plugin by adding the following to your `Cargo.toml` file:
-
-`src-tauri/Cargo.toml`
-
-```toml
-[dependencies]
-tauri-plugin-authenticator = "0.1"
-# or through git
-tauri-plugin-authenticator = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-```
-
-You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
-
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
-```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-authenticator
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-authenticator
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-authenticator
-```
-
-## Usage
-
-First you need to register the core plugin with Tauri:
-
-`src-tauri/src/main.rs`
-
-```rust
-fn main() {
-    tauri::Builder::default()
-        .plugin(tauri_plugin_authenticator::init())
-        .run(tauri::generate_context!())
-        .expect("error while running tauri application");
-}
-```
-
-Afterwards all the plugin's APIs are available through the JavaScript guest bindings:
-
-```javascript
-import { Authenticator } from "tauri-plugin-authenticator-api";
-
-const auth = new Authenticator();
-auth.init(); // initialize transports
-
-// generate a 32-bytes long random challenge
-const arr = new Uint32Array(32);
-window.crypto.getRandomValues(arr);
-const b64 = btoa(String.fromCharCode.apply(null, arr));
-// web-safe base64
-const challenge = b64.replace(/\+/g, "-").replace(/\//g, "_");
-
-const domain = "https://tauri.app";
-
-// attempt to register with the security key
-const json = await auth.register(challenge, domain);
-const registerResult = JSON.parse(json);
-
-// verify te registration was successfull
-const r2 = await auth.verifyRegistration(
-  challenge,
-  app,
-  registerResult.registerData,
-  registerResult.clientData
-);
-const j2 = JSON.parse(r2);
-
-// sign some data
-const json = await auth.sign(challenge, app, keyHandle);
-const signData = JSON.parse(json);
-
-// verify the signature again
-const counter = await auth.verifySignature(
-  challenge,
-  app,
-  signData.signData,
-  clientData,
-  keyHandle,
-  pubkey
-);
-
-if (counter && counter > 0) {
-  console.log("SUCCESS!");
-}
-```
-
-## Contributing
-
-PRs accepted. Please make sure to read the Contributing Guide before making a pull request.
-
-## License
-
-Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
-
-MIT or MIT/Apache 2.0 where applicable.
@@ -1,60 +0,0 @@
-import { invoke } from "@tauri-apps/api/tauri";
-
-export class Authenticator {
-  async init(): Promise<void> {
-    return await invoke("plugin:authenticator|init_auth");
-  }
-
-  async register(challenge: string, application: string): Promise<string> {
-    return await invoke("plugin:authenticator|register", {
-      timeout: 10000,
-      challenge,
-      application,
-    });
-  }
-
-  async verifyRegistration(
-    challenge: string,
-    application: string,
-    registerData: string,
-    clientData: string
-  ): Promise<string> {
-    return await invoke("plugin:authenticator|verify_registration", {
-      challenge,
-      application,
-      registerData,
-      clientData,
-    });
-  }
-
-  async sign(
-    challenge: string,
-    application: string,
-    keyHandle: string
-  ): Promise<string> {
-    return await invoke("plugin:authenticator|sign", {
-      timeout: 10000,
-      challenge,
-      application,
-      keyHandle,
-    });
-  }
-
-  async verifySignature(
-    challenge: string,
-    application: string,
-    signData: string,
-    clientData: string,
-    keyHandle: string,
-    pubkey: string
-  ): Promise<number> {
-    return await invoke("plugin:authenticator|verify_signature", {
-      challenge,
-      application,
-      signData,
-      clientData,
-      keyHandle,
-      pubkey,
-    });
-  }
-}
@@ -1,33 +0,0 @@
-{
-  "name": "tauri-plugin-authenticator-api",
-  "version": "0.0.0",
-  "description": "Use hardware security-keys in your Tauri App.",
-  "license": "MIT or APACHE-2.0",
-  "authors": [
-    "Tauri Programme within The Commons Conservancy"
-  ],
-  "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
-  "exports": {
-    "import": "./dist-js/index.mjs",
-    "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
-  },
-  "scripts": {
-    "build": "rollup -c"
-  },
-  "files": [
-    "dist-js",
-    "!dist-js/**/*.map",
-    "README.md",
-    "LICENSE"
-  ],
-  "devDependencies": {
-    "tslib": "^2.5.0"
-  },
-  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
-  }
-}
@@ -1,11 +0,0 @@
-import { readFileSync } from "fs";
-
-import { createConfig } from "../../shared/rollup.config.mjs";
-
-export default createConfig({
-  input: "guest-js/index.ts",
-  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
-  ),
-  external: [/^@tauri-apps\/api/],
-});
@@ -1,212 +0,0 @@
-// Copyright 2021 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-use authenticator::{
-    authenticatorservice::AuthenticatorService, statecallback::StateCallback,
-    AuthenticatorTransports, KeyHandle, RegisterFlags, SignFlags, StatusUpdate,
-};
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
-use once_cell::sync::Lazy;
-use serde::Serialize;
-use sha2::{Digest, Sha256};
-use std::io;
-use std::sync::mpsc::channel;
-use std::{convert::Into, sync::Mutex};
-
-static MANAGER: Lazy<Mutex<AuthenticatorService>> = Lazy::new(|| {
-    let manager = AuthenticatorService::new().expect("The auth service should initialize safely");
-    Mutex::new(manager)
-});
-
-pub fn init_usb() {
-    let mut manager = MANAGER.lock().unwrap();
-    // theres also "add_detected_transports()" in the docs?
-    manager.add_u2f_usb_hid_platform_transports();
-}
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Registration {
-    pub key_handle: String,
-    pub pubkey: String,
-    pub register_data: String,
-    pub client_data: String,
-}
-
-pub fn register(application: String, timeout: u64, challenge: String) -> crate::Result<String> {
-    let (chall_bytes, app_bytes, client_data_string) =
-        format_client_data(application.as_str(), challenge.as_str());
-
-    // log the status rx?
-    let (status_tx, _status_rx) = channel::<StatusUpdate>();
-
-    let mut manager = MANAGER.lock().unwrap();
-
-    let (register_tx, register_rx) = channel();
-    let callback = StateCallback::new(Box::new(move |rv| {
-        register_tx.send(rv).unwrap();
-    }));
-
-    let res = manager.register(
-        RegisterFlags::empty(),
-        timeout,
-        chall_bytes,
-        app_bytes,
-        vec![],
-        status_tx,
-        callback,
-    );
-
-    match res {
-        Ok(_r) => {
-            let register_result = register_rx
-                .recv()
-                .expect("Problem receiving, unable to continue");
-
-            if let Err(e) = register_result {
-                return Err(e.into());
-            }
-
-            let (register_data, device_info) = register_result.unwrap(); // error already has been checked
-
-            // println!("Register result: {}", base64::encode(&register_data));
-            println!("Device info: {}", &device_info);
-
-            let (key_handle, public_key) =
-                _u2f_get_key_handle_and_public_key_from_register_response(&register_data).unwrap();
-            let key_handle_base64 = URL_SAFE_NO_PAD.encode(key_handle);
-            let public_key_base64 = URL_SAFE_NO_PAD.encode(public_key);
-            let register_data_base64 = URL_SAFE_NO_PAD.encode(&register_data);
-            println!("Key Handle: {}", &key_handle_base64);
-            println!("Public Key: {}", &public_key_base64);
-
-            // Ok(base64::encode(&register_data))
-            // Ok(key_handle_base64)
-            let res = serde_json::to_string(&Registration {
-                key_handle: key_handle_base64,
-                pubkey: public_key_base64,
-                register_data: register_data_base64,
-                client_data: client_data_string,
-            })?;
-            Ok(res)
-        }
-        Err(e) => Err(e.into()),
-    }
-}
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Signature {
-    pub key_handle: String,
-    pub sign_data: String,
-}
-
-pub fn sign(
-    application: String,
-    timeout: u64,
-    challenge: String,
-    key_handle: String,
-) -> crate::Result<String> {
-    let credential = match URL_SAFE_NO_PAD.decode(key_handle) {
-        Ok(v) => v,
-        Err(e) => {
-            return Err(e.into());
-        }
-    };
-    let key_handle = KeyHandle {
-        credential,
-        transports: AuthenticatorTransports::empty(),
-    };
-
-    let (chall_bytes, app_bytes, _) = format_client_data(application.as_str(), challenge.as_str());
-
-    let (sign_tx, sign_rx) = channel();
-    let callback = StateCallback::new(Box::new(move |rv| {
-        sign_tx.send(rv).unwrap();
-    }));
-
-    // log the status rx?
-    let (status_tx, _status_rx) = channel::<StatusUpdate>();
-
-    let mut manager = MANAGER.lock().unwrap();
-
-    let res = manager.sign(
-        SignFlags::empty(),
-        timeout,
-        chall_bytes,
-        vec![app_bytes],
-        vec![key_handle],
-        status_tx,
-        callback,
-    );
-    match res {
-        Ok(_v) => {
-            let sign_result = sign_rx
-                .recv()
-                .expect("Problem receiving, unable to continue");
-
-            if let Err(e) = sign_result {
-                return Err(e.into());
-            }
-
-            let (_, handle_used, sign_data, device_info) = sign_result.unwrap();
-
-            let sig = URL_SAFE_NO_PAD.encode(sign_data);
-
-            println!("Sign result: {sig}");
-            println!("Key handle used: {}", URL_SAFE_NO_PAD.encode(&handle_used));
-            println!("Device info: {}", &device_info);
-            println!("Done.");
-
-            let res = serde_json::to_string(&Signature {
-                sign_data: sig,
-                key_handle: URL_SAFE_NO_PAD.encode(&handle_used),
-            })?;
-            Ok(res)
-        }
-        Err(e) => Err(e.into()),
-    }
-}
-
-fn format_client_data(application: &str, challenge: &str) -> (Vec<u8>, Vec<u8>, String) {
-    let d =
-        format!(r#"{{"challenge": "{challenge}", "version": "U2F_V2", "appId": "{application}"}}"#);
-    let mut challenge = Sha256::new();
-    challenge.update(d.as_bytes());
-    let chall_bytes = challenge.finalize().to_vec();
-
-    let mut app = Sha256::new();
-    app.update(application.as_bytes());
-    let app_bytes = app.finalize().to_vec();
-
-    (chall_bytes, app_bytes, d)
-}
-
-fn _u2f_get_key_handle_and_public_key_from_register_response(
-    register_response: &[u8],
-) -> io::Result<(Vec<u8>, Vec<u8>)> {
-    if register_response[0] != 0x05 {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidData,
-            "Reserved byte not set correctly",
-        ));
-    }
-
-    // 1: reserved
-    // 65: public key
-    // 1: key handle length
-    // key handle
-    // x.509 cert
-    // sig
-
-    let key_handle_len = register_response[66] as usize;
-    let mut public_key = register_response.to_owned();
-    let mut key_handle = public_key.split_off(67);
-    let _attestation = key_handle.split_off(key_handle_len);
-
-    // remove fist (reserved) and last (handle len) bytes
-    let pk: Vec<u8> = public_key[1..public_key.len() - 1].to_vec();
-
-    Ok((key_handle, pk))
-}
@@ -1,22 +0,0 @@
-use serde::{Serialize, Serializer};
-
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error(transparent)]
-    Base64Decode(#[from] base64::DecodeError),
-    #[error(transparent)]
-    JSON(#[from] serde_json::Error),
-    #[error(transparent)]
-    U2F(#[from] u2f::u2ferror::U2fError),
-    #[error(transparent)]
-    Auth(#[from] authenticator::errors::AuthenticatorError),
-}
-
-impl Serialize for Error {
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(self.to_string().as_ref())
-    }
-}
@@ -1,76 +0,0 @@
-// Copyright 2021 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-mod auth;
-mod error;
-mod u2f;
-
-use tauri::{
-    plugin::{Builder as PluginBuilder, TauriPlugin},
-    Runtime,
-};
-
-pub use error::Error;
-type Result<T> = std::result::Result<T, Error>;
-
-#[tauri::command]
-fn init_auth() {
-    auth::init_usb();
-}
-
-#[tauri::command]
-fn register(timeout: u64, challenge: String, application: String) -> crate::Result<String> {
-    auth::register(application, timeout, challenge)
-}
-
-#[tauri::command]
-fn verify_registration(
-    challenge: String,
-    application: String,
-    register_data: String,
-    client_data: String,
-) -> crate::Result<String> {
-    u2f::verify_registration(application, challenge, register_data, client_data)
-}
-
-#[tauri::command]
-fn sign(
-    timeout: u64,
-    challenge: String,
-    application: String,
-    key_handle: String,
-) -> crate::Result<String> {
-    auth::sign(application, timeout, challenge, key_handle)
-}
-
-#[tauri::command]
-fn verify_signature(
-    challenge: String,
-    application: String,
-    sign_data: String,
-    client_data: String,
-    key_handle: String,
-    pubkey: String,
-) -> crate::Result<u32> {
-    u2f::verify_signature(
-        application,
-        challenge,
-        sign_data,
-        client_data,
-        key_handle,
-        pubkey,
-    )
-}
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    PluginBuilder::new("authenticator")
-        .invoke_handler(tauri::generate_handler![
-            init_auth,
-            register,
-            verify_registration,
-            sign,
-            verify_signature
-        ])
-        .build()
-}
@@ -1,105 +0,0 @@
-// Copyright 2021 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
-use chrono::prelude::*;
-use serde::Serialize;
-use std::convert::Into;
-use u2f::messages::*;
-use u2f::protocol::*;
-use u2f::register::*;
-
-static VERSION: &str = "U2F_V2";
-
-pub fn make_challenge(app_id: &str, challenge_bytes: Vec<u8>) -> Challenge {
-    let utc: DateTime<Utc> = Utc::now();
-    Challenge {
-        challenge: URL_SAFE_NO_PAD.encode(challenge_bytes),
-        timestamp: format!("{utc:?}"),
-        app_id: app_id.to_string(),
-    }
-}
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct RegistrationVerification {
-    pub key_handle: String,
-    pub pubkey: String,
-    pub device_name: Option<String>,
-}
-
-pub fn verify_registration(
-    app_id: String,
-    challenge: String,
-    register_data: String,
-    client_data: String,
-) -> crate::Result<String> {
-    let challenge_bytes = URL_SAFE_NO_PAD.decode(challenge)?;
-    let challenge = make_challenge(&app_id, challenge_bytes);
-    let client_data_bytes: Vec<u8> = client_data.as_bytes().into();
-    let client_data_base64 = URL_SAFE_NO_PAD.encode(client_data_bytes);
-    let client = U2f::new(app_id);
-    match client.register_response(
-        challenge,
-        RegisterResponse {
-            registration_data: register_data,
-            client_data: client_data_base64,
-            version: VERSION.to_string(),
-        },
-    ) {
-        Ok(v) => {
-            let rv = RegistrationVerification {
-                key_handle: URL_SAFE_NO_PAD.encode(&v.key_handle),
-                pubkey: URL_SAFE_NO_PAD.encode(&v.pub_key),
-                device_name: v.device_name,
-            };
-            Ok(serde_json::to_string(&rv)?)
-        }
-        Err(e) => Err(e.into()),
-    }
-}
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct SignatureVerification {
-    pub counter: u8,
-}
-
-pub fn verify_signature(
-    app_id: String,
-    challenge: String,
-    sign_data: String,
-    client_data: String,
-    key_handle: String,
-    pub_key: String,
-) -> crate::Result<u32> {
-    let challenge_bytes = URL_SAFE_NO_PAD.decode(challenge)?;
-    let chal = make_challenge(&app_id, challenge_bytes);
-    let client_data_bytes: Vec<u8> = client_data.as_bytes().into();
-    let client_data_base64 = URL_SAFE_NO_PAD.encode(client_data_bytes);
-    let key_handle_bytes = URL_SAFE_NO_PAD.decode(&key_handle)?;
-    let pubkey_bytes = URL_SAFE_NO_PAD.decode(pub_key)?;
-    let client = U2f::new(app_id);
-    let mut _counter: u32 = 0;
-    match client.sign_response(
-        chal,
-        Registration {
-            // here only needs pubkey and keyhandle
-            key_handle: key_handle_bytes,
-            pub_key: pubkey_bytes,
-            attestation_cert: None,
-            device_name: None,
-        },
-        SignResponse {
-            // here needs client data and sig data and key_handle
-            signature_data: sign_data,
-            client_data: client_data_base64,
-            key_handle,
-        },
-        _counter,
-    ) {
-        Ok(v) => Ok(v),
-        Err(e) => Err(e.into()),
-    }
-}
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -2,17 +2,17 @@
 name = "tauri-plugin-autostart"
 version = "0.0.0"
 description = "Automatically launch your application at startup."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
-auto-launch = "0.4"
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
+auto-launch = "0.5"
@@ -1,10 +1,10 @@
-![plugin-autostart](banner.png)
+![plugin-autostart](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/autostart/banner.png)

 Automatically launch your application at startup. Supports Windows, Mac (via AppleScript or Launch Agent), and Linux.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa
 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-autostart
+pnpm add https://github.com/tauri-apps/tauri-plugin-autostart#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-autostart
+npm add https://github.com/tauri-apps/tauri-plugin-autostart#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-autostart
+yarn add https://github.com/tauri-apps/tauri-plugin-autostart#v1
 ```

 ## Usage
@@ -66,6 +66,22 @@ disable();

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -24,9 +24,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -119,11 +119,12 @@ pub fn init<R: Runtime>(
                // exe path to not break it.
                let exe_path = current_exe.canonicalize()?.display().to_string();
                let parts: Vec<&str> = exe_path.split(".app/").collect();
-                let app_path = if parts.len() == 2 {
-                    format!("{}.app", parts.get(0).unwrap().to_string())
-                } else {
-                    exe_path
-                };
+                let app_path =
+                    if parts.len() == 2 && matches!(macos_launcher, MacosLauncher::AppleScript) {
+                        format!("{}.app", parts.get(0).unwrap().to_string())
+                    } else {
+                        exe_path
+                    };
                info!("auto_start path {}", &app_path);
                builder.set_app_path(&app_path);
            }
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["guest-js/*.ts"]
+}
@@ -2,16 +2,16 @@
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
 description = "Additional file system methods not included in the core API."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
@@ -1,10 +1,10 @@
-![tauri-plugin-fs-extra](banner.png)
+![plugin-fs-extra](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/fs-extra/banner.png)

 Additional file system methods not included in the core API.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa
 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-fs-extra
+pnpm add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-fs-extra
+npm add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-fs-extra
+yarn add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1
 ```

 ## Usage
@@ -60,6 +60,22 @@ await metadata("/path/to/file");

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -78,9 +78,10 @@ struct Metadata {
 }

 fn system_time_to_ms(time: std::io::Result<SystemTime>) -> u64 {
-    time.map(|t| {
-        let duration_since_epoch = t.duration_since(UNIX_EPOCH).unwrap();
-        duration_since_epoch.as_millis() as u64
+    time.map(|time| {
+        time.duration_since(UNIX_EPOCH)
+            .map(|t| t.as_millis() as u64)
+            .unwrap_or_else(|err| err.duration().as_millis() as u64)
    })
    .unwrap_or_default()
 }
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["guest-js/*.ts"]
+}
@@ -2,18 +2,18 @@
 name = "tauri-plugin-fs-watch"
 version = "0.0.0"
 description = "Watch files and directories for changes."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
 notify = { version = "6" , features = ["serde"] }
-notify-debouncer-mini = { version = "0.3" , features = ["serde"] }
+notify-debouncer-mini = { version = "0.4" , features = ["serde"] }
@@ -1,10 +1,10 @@
-![plugin-fs-watch](banner.png)
+![plugin-fs-watch](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/fs-watch/banner.png)

 Watch files and directories for changes using [notify](https://github.com/notify-rs/notify).

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa
 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-fs-watch
+pnpm add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-fs-watch
+npm add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-fs-watch
+yarn add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1
 ```

 ## Usage
@@ -57,17 +57,17 @@ import { watch, watchImmediate } from "tauri-plugin-fs-watch-api";
 const stopWatching = await watch(
  "/path/to/something",
  (event) => {
-    const { type, payload } = event;
+    const { kind, path } = event;
  },
-  { recursive: true }
+  { recursive: true },
 );

 const stopRawWatcher = await watchImmediate(
  ["/path/a", "/path/b"],
  (event) => {
-    const { path, operation, cookie } = event;
+    const { type, paths, attrs } = event;
  },
-  {}
+  {},
 );
 ```

@@ -75,6 +75,22 @@ const stopRawWatcher = await watchImmediate(

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -35,8 +35,8 @@ type RawEventKind =
  | "other";

 export type DebouncedEvent =
-  | { kind: "any"; path: string }
-  | { kind: "AnyContinous"; path: string };
+  | { kind: "Any"; path: string }[]
+  | { kind: "AnyContinuous"; path: string }[];

 async function unwatch(id: number): Promise<void> {
  await invoke("plugin:fs-watch|unwatch", { id });
@@ -45,7 +45,7 @@ async function unwatch(id: number): Promise<void> {
 export async function watch(
  paths: string | string[],
  cb: (event: DebouncedEvent) => void,
-  options: DebouncedWatchOptions = {}
+  options: DebouncedWatchOptions = {},
 ): Promise<UnlistenFn> {
  const opts = {
    recursive: false,
@@ -71,7 +71,7 @@ export async function watch(
    `watcher://debounced-event/${id}`,
    (event) => {
      cb(event.payload);
-    }
+    },
  );

  return () => {
@@ -83,7 +83,7 @@ export async function watch(
 export async function watchImmediate(
  paths: string | string[],
  cb: (event: RawEvent) => void,
-  options: WatchOptions = {}
+  options: WatchOptions = {},
 ): Promise<UnlistenFn> {
  const opts = {
    recursive: false,
@@ -109,7 +109,7 @@ export async function watchImmediate(
    `watcher://raw-event/${id}`,
    (event) => {
      cb(event.payload);
-    }
+    },
  );

  return () => {
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -91,7 +91,7 @@ async fn watch<R: Runtime>(

    let watcher = if let Some(delay) = options.delay_ms {
        let (tx, rx) = channel();
-        let mut debouncer = new_debouncer(Duration::from_millis(delay), None, tx)?;
+        let mut debouncer = new_debouncer(Duration::from_millis(delay), tx)?;
        let watcher = debouncer.watcher();
        for path in &paths {
            watcher.watch(path, mode)?;
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["guest-js/*.ts"]
+}
@@ -2,18 +2,18 @@
 name = "tauri-plugin-localhost"
 version = "0.1.0"
 description = "Expose your apps assets through a localhost server instead of the default custom protocol."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
 tiny_http = "0.12"
-http = "0.2"
+http = "1"
@@ -1,4 +1,4 @@
-![plugin-localhost](banner.png)
+![plugin-localhost](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/localhost/banner.png)

 Expose your apps assets through a localhost server instead of the default custom protocol.

@@ -6,7 +6,7 @@ Expose your apps assets through a localhost server instead of the default custom

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -67,6 +67,22 @@ fn main() {

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -63,7 +63,7 @@ impl Builder {
                let asset_resolver = app.asset_resolver();
                std::thread::spawn(move || {
                    let server =
-                        Server::http(&format!("localhost:{port}")).expect("Unable to spawn server");
+                        Server::http(format!("localhost:{port}")).expect("Unable to spawn server");
                    for req in server.incoming_requests() {
                        let path = req
                            .url()
@@ -2,22 +2,22 @@
 name = "tauri-plugin-log"
 version = "0.0.0"
 description = "Configurable logging for your Tauri app."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
 serde_repr = "0.1"
-byte-unit = "4.0"
+byte-unit = "5"
 fern = "0.6"
 log = { workspace = true, features = ["kv_unstable"] }
 time = { version = "0.3", features = ["formatting", "local-offset"] }

 [features]
-colored = ["fern/colored"]
+colored = ["fern/colored"]
@@ -1,10 +1,10 @@
-![plugin-log](banner.png)
+![plugin-log](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/log/banner.png)

 Configurable logging for your Tauri app.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -21,16 +21,18 @@ Install the Core plugin by adding the following to your `Cargo.toml` file:
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 ```

-You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
+If you want the single instance mechanism to only trigger for semver compatible instances of your apps, for example if you expect users to have multiple installations of your app installed, you can add `features = ["semver"]` to the dependency declaration in `Cargo.toml`.
+
+Then you can install the JavaScript Guest bindings using your preferred JavaScript package manager:

 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-log
+pnpm add https://github.com/tauri-apps/tauri-plugin-log#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-log
+npm add https://github.com/tauri-apps/tauri-plugin-log#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-log
+yarn add https://github.com/tauri-apps/tauri-plugin-log#v1
 ```

 ## Usage
@@ -83,6 +85,22 @@ Now, you can use the macros provided by the log crate to log messages from your

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -1,5 +1,5 @@
 import { invoke } from "@tauri-apps/api/tauri";
-import { listen, UnlistenFn } from "@tauri-apps/api/event";
+import { listen, type UnlistenFn, type Event } from "@tauri-apps/api/event";

 export type LogOptions = {
  file?: string;
@@ -43,7 +43,7 @@ enum LogLevel {
 async function log(
  level: LogLevel,
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  const traces = new Error().stack?.split("\n").map((line) => line.split("@"));

@@ -86,7 +86,7 @@ async function log(
 */
 export async function error(
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  await log(LogLevel.Error, message, options);
 }
@@ -108,7 +108,7 @@ export async function error(
 */
 export async function warn(
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  await log(LogLevel.Warn, message, options);
 }
@@ -130,7 +130,7 @@ export async function warn(
 */
 export async function info(
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  await log(LogLevel.Info, message, options);
 }
@@ -152,7 +152,7 @@ export async function info(
 */
 export async function debug(
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  await log(LogLevel.Debug, message, options);
 }
@@ -174,7 +174,7 @@ export async function debug(
 */
 export async function trace(
  message: string,
-  options?: LogOptions
+  options?: LogOptions,
 ): Promise<void> {
  await log(LogLevel.Trace, message, options);
 }
@@ -184,19 +184,38 @@ interface RecordPayload {
  message: string;
 }

-export async function attachConsole(): Promise<UnlistenFn> {
-  return await listen("log://log", (event) => {
-    const payload = event.payload as RecordPayload;
+type LoggerFn = (fn: RecordPayload) => void;
+
+/**
+ * Attaches a listener for the log, and calls the passed function for each log entry.
+ * @param fn
+ *
+ * @returns a function to cancel the listener.
+ */
+export async function attachLogger(fn: LoggerFn): Promise<UnlistenFn> {
+  return await listen("log://log", (event: Event<RecordPayload>) => {
+    const { level } = event.payload;
+    let { message } = event.payload;

    // Strip ANSI escape codes
-    const message = payload.message.replace(
+    message = message.replace(
      // TODO: Investigate security/detect-unsafe-regex
-      // eslint-disable-next-line no-control-regex, security/detect-unsafe-regex
+      // eslint-disable-next-line no-control-regex
      /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-      ""
+      "",
    );
+    fn({ message, level });
+  });
+}

-    switch (payload.level) {
+/**
+ * Attaches a listener that writes log entries to the console as they come in.
+ *
+ * @returns a function to cancel the listener.
+ */
+export async function attachConsole(): Promise<UnlistenFn> {
+  return attachLogger(({ level, message }: RecordPayload) => {
+    switch (level) {
      case LogLevel.Trace:
        console.log(message);
        break;
@@ -214,7 +233,7 @@ export async function attachConsole(): Promise<UnlistenFn> {
        break;
      default:
        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        throw new Error(`unknown log level ${payload.level}`);
+        throw new Error(`unknown log level ${level}`);
    }
  });
 }
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -118,7 +118,7 @@ pub enum LogTarget {
    ///
    /// The plugin will ensure the directory exists before writing logs.
    Folder(PathBuf),
-    /// Write logs to the OS specififc logs directory.
+    /// Write logs to the OS specific logs directory.
    ///
    /// ### Platform-specific
    ///
@@ -167,6 +167,7 @@ pub struct Builder {
    timezone_strategy: TimezoneStrategy,
    max_file_size: u128,
    targets: Vec<LogTarget>,
+    log_name: Option<String>,
 }

 impl Default for Builder {
@@ -189,6 +190,7 @@ impl Default for Builder {
            timezone_strategy: DEFAULT_TIMEZONE_STRATEGY,
            max_file_size: DEFAULT_MAX_FILE_SIZE,
            targets: DEFAULT_LOG_TARGETS.into(),
+            log_name: None,
        }
    }
 }
@@ -262,6 +264,29 @@ impl Builder {
        self
    }

+    /// Writes logs to the given file. Default: <app_name>.log)
+    ///
+    /// Note: This does not modify the directory logs go into. For that refer to `LogTarget::Folder`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use tauri_plugin_log::Builder;
+    /// let name = "custom-name";
+    /// let builder = Builder::default()
+    ///     .targets([
+    ///         LogTarget::LogDir
+    ///     ])
+    ///     .log_name(name)
+    ///     .build()
+    /// ); // Outputs content to custom-name.log
+    ///
+    /// ```
+    pub fn log_name<S: Into<String>>(mut self, log_name: S) -> Self {
+        self.log_name = Some(log_name.into());
+        self
+    }
+
    #[cfg(feature = "colored")]
    pub fn with_colors(self, colors: fern::colors::ColoredLevelConfig) -> Self {
        let format =
@@ -284,7 +309,10 @@ impl Builder {
        plugin::Builder::new("log")
            .invoke_handler(tauri::generate_handler![log])
            .setup(move |app_handle| {
-                let app_name = &app_handle.package_info().name;
+                let log_name = self
+                    .log_name
+                    .as_deref()
+                    .unwrap_or_else(|| &app_handle.package_info().name);

                // setup targets
                for target in &self.targets {
@@ -293,12 +321,12 @@ impl Builder {
                        LogTarget::Stderr => fern::Output::from(std::io::stderr()),
                        LogTarget::Folder(path) => {
                            if !path.exists() {
-                                fs::create_dir_all(path).unwrap();
+                                fs::create_dir_all(path)?;
                            }

                            fern::log_file(get_log_file_path(
                                &path,
-                                app_name,
+                                log_name,
                                &self.rotation_strategy,
                                &self.timezone_strategy,
                                self.max_file_size,
@@ -306,14 +334,17 @@ impl Builder {
                            .into()
                        }
                        LogTarget::LogDir => {
-                            let path = app_handle.path_resolver().app_log_dir().unwrap();
+                            let path = app_handle
+                                .path_resolver()
+                                .app_log_dir()
+                                .ok_or("app_log_dir is None")?;
                            if !path.exists() {
-                                fs::create_dir_all(&path).unwrap();
+                                fs::create_dir_all(&path)?;
                            }

                            fern::log_file(get_log_file_path(
                                &path,
-                                app_name,
+                                log_name,
                                &self.rotation_strategy,
                                &self.timezone_strategy,
                                self.max_file_size,
@@ -330,7 +361,7 @@ impl Builder {
                                };
                                let app_handle = app_handle.clone();
                                tauri::async_runtime::spawn(async move {
-                                    app_handle.emit_all("log://log", payload).unwrap();
+                                    let _ = app_handle.emit_all("log://log", payload);
                                });
                            })
                        }
@@ -347,12 +378,12 @@ impl Builder {

 fn get_log_file_path(
    dir: &impl AsRef<Path>,
-    app_name: &str,
+    log_name: &str,
    rotation_strategy: &RotationStrategy,
    timezone_strategy: &TimezoneStrategy,
    max_file_size: u128,
 ) -> plugin::Result<PathBuf> {
-    let path = dir.as_ref().join(format!("{app_name}.log"));
+    let path = dir.as_ref().join(format!("{log_name}.log"));

    if path.exists() {
        let log_size = File::open(&path)?.metadata()?.len() as u128;
@@ -361,16 +392,12 @@ fn get_log_file_path(
                RotationStrategy::KeepAll => {
                    let to = dir.as_ref().join(format!(
                        "{}_{}.log",
-                        app_name,
+                        log_name,
                        timezone_strategy
                            .get_now()
-                            .format(
-                                &time::format_description::parse(
-                                    "[year]-[month]-[day]_[hour]-[minute]-[second]"
-                                )
-                                .unwrap()
-                            )
-                            .unwrap(),
+                            .format(&time::format_description::parse(
+                                "[year]-[month]-[day]_[hour]-[minute]-[second]"
+                            )?)?,
                    ));
                    if to.is_file() {
                        // designated rotated log file name already exists
@@ -378,7 +405,10 @@ fn get_log_file_path(
                        let mut to_bak = to.clone();
                        to_bak.set_file_name(format!(
                            "{}.bak",
-                            to_bak.file_name().unwrap().to_string_lossy()
+                            to_bak
+                                .file_name()
+                                .map(|n| n.to_string_lossy())
+                                .unwrap_or_default()
                        ));
                        fs::rename(&to, to_bak)?;
                    }
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["guest-js/*.ts"]
+}
@@ -1,4 +1,3 @@
-authenticator
 autostart
 fs-extra
 fs-watch
@@ -1,7 +1,17 @@
 # Changelog

+## \[0.1.3]
+
+- Split up fs and asset scopes. **This will reset the asset protocol scope once!**
+  - [ad30286](https://github.com/tauri-apps/plugins-workspace/commit/ad3028646c96ed213a2f483823ffdc3c17b5fc1e) fix(persisted-scope): separately save asset protocol patterns ([#459](https://github.com/tauri-apps/plugins-workspace/pull/459)) on 2023-07-10
+
+## \[0.1.2]
+
+- Fix usage of directory patterns by removing glob asterisks at the end before allowing/forbidding them. This was causing them to be escaped, and so undesirable paths were allowed/forbidden while polluting the `.persisted_scope` file.
+  - [9174b80](https://github.com/tauri-apps/plugins-workspace/commit/9174b808dc37154999c119fcc3f31258a9c5a3fb) \[persisted scope] fix: handle recursive directory correctly ([#455](https://github.com/tauri-apps/plugins-workspace/pull/455)) on 2023-06-29
+
 ## \[0.1.1]

- The MSRV was raised to 1.64!
+- The MSRV was raised to 1.67!
 - The plugin now recursively unescapes saved patterns before allowing/forbidding them. This effectively prevents `.persisted-scope` files from blowing up, which caused Out-Of-Memory issues, while automatically fixing existing broken files seamlessly.
  - [ebb2eb2](https://github.com/tauri-apps/plugins-workspace/commit/ebb2eb2fe2ebfbb70530d16a983d396aa5829aa1) fix(persisted-scope): Prevent out-of-memory issues, fixes [#274](https://github.com/tauri-apps/plugins-workspace/pull/274) ([#328](https://github.com/tauri-apps/plugins-workspace/pull/328)) on 2023-04-26
@@ -1,21 +1,21 @@
 [package]
 name = "tauri-plugin-persisted-scope"
-version = "0.1.1"
+version = "0.1.3"
 description = "Save filesystem and asset scopes and restore them when the app is reopened."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
-aho-corasick = "1.0"
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
+aho-corasick = "1.1"
 bincode = "1"

 [features]
@@ -1,10 +1,10 @@
-![plugin-persisted-scope](banner.png)
+![plugin-persisted-scope](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/persisted-scope/banner.png)

 Save filesystem and asset scopes and restore them when the app is reopened.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -42,6 +42,22 @@ Afterwards the plugin will automatically save and restore filesystem and asset s

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -6,7 +6,7 @@ use aho_corasick::AhoCorasick;
 use serde::{Deserialize, Serialize};
 use tauri::{
    plugin::{Builder, TauriPlugin},
-    AppHandle, FsScopeEvent, Manager, Runtime,
+    FsScope, FsScopeEvent, Manager, Runtime,
 };

 use std::{
@@ -15,7 +15,10 @@ use std::{
    path::Path,
 };

+// Using 2 separate files so that we don't have to think about write conflicts and not break backwards compat.
 const SCOPE_STATE_FILENAME: &str = ".persisted-scope";
+#[cfg(feature = "protocol-asset")]
+const ASSET_SCOPE_STATE_FILENAME: &str = ".persisted-scope-asset";

 // Most of these patterns are just added to try to fix broken files in the wild.
 // After a while we can hopefully reduce it to something like [r"[?]", r"[*]", r"\\?\\\?\"]
@@ -42,6 +45,14 @@ enum Error {
    Bincode(#[from] Box<bincode::ErrorKind>),
 }

+#[derive(Debug, Default, Deserialize, Serialize, Eq, PartialEq, Hash)]
+enum TargetType {
+    #[default]
+    File,
+    Directory,
+    RecursiveDirectory,
+}
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 struct Scope {
    allowed_paths: Vec<String>,
@@ -58,16 +69,74 @@ fn fix_pattern(ac: &AhoCorasick, s: &str) -> String {
    s
 }

-fn save_scopes<R: Runtime>(app: &AppHandle<R>, app_dir: &Path, scope_state_path: &Path) {
-    let fs_scope = app.fs_scope();
+const RESURSIVE_DIRECTORY_SUFFIX: &str = "**";
+const DIRECTORY_SUFFIX: &str = "*";

+fn detect_scope_type(scope_state_path: &str) -> TargetType {
+    if scope_state_path.ends_with(RESURSIVE_DIRECTORY_SUFFIX) {
+        TargetType::RecursiveDirectory
+    } else if scope_state_path.ends_with(DIRECTORY_SUFFIX) {
+        TargetType::Directory
+    } else {
+        TargetType::File
+    }
+}
+
+fn fix_directory(path_str: &str) -> &Path {
+    let mut path = Path::new(path_str);
+
+    if path.ends_with(DIRECTORY_SUFFIX) || path.ends_with(RESURSIVE_DIRECTORY_SUFFIX) {
+        path = match path.parent() {
+            Some(value) => value,
+            None => return path,
+        };
+    }
+
+    path
+}
+
+fn allow_path(scope: &FsScope, path: &str) {
+    let target_type = detect_scope_type(path);
+
+    match target_type {
+        TargetType::File => {
+            let _ = scope.allow_file(path);
+        }
+        TargetType::Directory => {
+            // We remove the '*' at the end of it, else it will be escaped by the pattern.
+            let _ = scope.allow_directory(fix_directory(path), false);
+        }
+        TargetType::RecursiveDirectory => {
+            // We remove the '**' at the end of it, else it will be escaped by the pattern.
+            let _ = scope.allow_directory(fix_directory(path), true);
+        }
+    }
+}
+
+fn forbid_path(scope: &FsScope, path: &str) {
+    let target_type = detect_scope_type(path);
+
+    match target_type {
+        TargetType::File => {
+            let _ = scope.forbid_file(path);
+        }
+        TargetType::Directory => {
+            let _ = scope.forbid_directory(fix_directory(path), false);
+        }
+        TargetType::RecursiveDirectory => {
+            let _ = scope.forbid_directory(fix_directory(path), true);
+        }
+    }
+}
+
+fn save_scopes(scope: &FsScope, app_dir: &Path, scope_state_path: &Path) {
    let scope = Scope {
-        allowed_paths: fs_scope
+        allowed_paths: scope
            .allowed_patterns()
            .into_iter()
            .map(|p| p.to_string())
            .collect(),
-        forbidden_patterns: fs_scope
+        forbidden_patterns: scope
            .forbidden_patterns()
            .into_iter()
            .map(|p| p.to_string())
@@ -93,46 +162,74 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
            let app_dir = app.path_resolver().app_data_dir();

            if let Some(app_dir) = app_dir {
-                let scope_state_path = app_dir.join(SCOPE_STATE_FILENAME);
-
-                let _ = fs_scope.forbid_file(&scope_state_path);
+                let fs_scope_state_path = app_dir.join(SCOPE_STATE_FILENAME);
                #[cfg(feature = "protocol-asset")]
-                let _ = asset_protocol_scope.forbid_file(&scope_state_path);
+                let asset_scope_state_path = app_dir.join(ASSET_SCOPE_STATE_FILENAME);
+
+                let _ = fs_scope.forbid_file(&fs_scope_state_path);
+                #[cfg(feature = "protocol-asset")]
+                let _ = asset_protocol_scope.forbid_file(&asset_scope_state_path);

                // We're trying to fix broken .persisted-scope files seamlessly, so we'll be running this on the values read on the saved file.
                // We will still save some semi-broken values because the scope events are quite spammy and we don't want to reduce runtime performance any further.
                let ac = AhoCorasick::new(PATTERNS).unwrap(/* This should be impossible to fail since we're using a small static input */);

-                if scope_state_path.exists() {
-                    let scope: Scope = tauri::api::file::read_binary(&scope_state_path)
+                if fs_scope_state_path.exists() {
+                    let scope: Scope = tauri::api::file::read_binary(&fs_scope_state_path)
                        .map_err(Error::from)
                        .and_then(|scope| bincode::deserialize(&scope).map_err(Into::into))
                        .unwrap_or_default();
+
                    for allowed in &scope.allowed_paths {
                        let allowed = fix_pattern(&ac, allowed);
-
-                        let _ = fs_scope.allow_file(&allowed);
-                        #[cfg(feature = "protocol-asset")]
-                        let _ = asset_protocol_scope.allow_file(&allowed);
+                        allow_path(&fs_scope, &allowed);
                    }
                    for forbidden in &scope.forbidden_patterns {
                        let forbidden = fix_pattern(&ac, forbidden);
-
-                        let _ = fs_scope.forbid_file(&forbidden);
-                        #[cfg(feature = "protocol-asset")]
-                        let _ = asset_protocol_scope.forbid_file(&forbidden);
+                        forbid_path(&fs_scope, &forbidden);
                    }

                    // Manually save the fixed scopes to disk once.
                    // This is needed to fix broken .peristed-scope files in case the app doesn't update the scope itself.
-                    save_scopes(&app, &app_dir, &scope_state_path);
+                    save_scopes(&fs_scope, &app_dir, &fs_scope_state_path);
                }

+                #[cfg(feature = "protocol-asset")]
+                if asset_scope_state_path.exists() {
+                    let scope: Scope = tauri::api::file::read_binary(&asset_scope_state_path)
+                        .map_err(Error::from)
+                        .and_then(|scope| bincode::deserialize(&scope).map_err(Into::into))
+                        .unwrap_or_default();
+
+                    for allowed in &scope.allowed_paths {
+                        let allowed = fix_pattern(&ac, allowed);
+                        allow_path(&asset_protocol_scope, &allowed);
+                    }
+                    for forbidden in &scope.forbidden_patterns {
+                        let forbidden = fix_pattern(&ac, forbidden);
+                        forbid_path(&asset_protocol_scope, &forbidden);
+                    }
+
+                    // Manually save the fixed scopes to disk once.
+                    save_scopes(&asset_protocol_scope, &app_dir, &asset_scope_state_path);
+                }
+
+                #[cfg(feature = "protocol-asset")]
+                let app_dir_ = app_dir.clone();
+                let fs_scope_ = fs_scope.clone();
                fs_scope.listen(move |event| {
                    if let FsScopeEvent::PathAllowed(_) = event {
-                        save_scopes(&app, &app_dir, &scope_state_path);
+                        save_scopes(&fs_scope_, &app_dir, &fs_scope_state_path);
                    }
                });
+                #[cfg(feature = "protocol-asset")]
+                {
+                    let asset_protocol_scope_ = asset_protocol_scope.clone();
+                    asset_protocol_scope.listen(move |event| {
+                    if let FsScopeEvent::PathAllowed(_) = event {
+                        save_scopes(&asset_protocol_scope_, &app_dir_, &asset_scope_state_path);
+                    }
+                });}
            }
            Ok(())
        })
@@ -1,5 +1,10 @@
 # Changelog

+## \[1.0.5]
+
+- `TrayLeft`, `TrayRight` and `TrayCenter` will now position the window according to the tray position relative to the monitor dimensions to prevent windows being displayed partially off-screen.
+  - [3d27909](https://github.com/tauri-apps/plugins-workspace/commit/3d279094d44be78cdc5d1de3938f1414e13db6b0) fix(positioner): Prevent tray relative windows from being moved off-screen ([#291](https://github.com/tauri-apps/plugins-workspace/pull/291)) on 2023-09-27
+
 ## \[0.2.7]

 - Update Tauri to v1.0.0
@@ -1,21 +1,19 @@
 [package]
 name = "tauri-plugin-positioner"
-version = "1.0.4"
+version = "1.0.5"
 description = "Position your windows at well-known locations."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
 serde_repr = "0.1"

 [features]
-system-tray = [ "tauri/system-tray" ]
+system-tray = [ "tauri/system-tray" ]
@@ -1,4 +1,4 @@
-![plugin-positioner](banner.png)
+![plugin-positioner](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/positioner/banner.png)

 Position your windows at well-known locations.

@@ -6,7 +6,7 @@ This plugin is a port of [electron-positioner](https://github.com/jenslind/elect

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -40,11 +40,11 @@ yarn add tauri-plugin-positioner-api
 Or through git:

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-positioner
+pnpm add https://github.com/tauri-apps/tauri-plugin-positioner#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-positioner
+npm add https://github.com/tauri-apps/tauri-plugin-positioner#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-positioner
+yarn add https://github.com/tauri-apps/tauri-plugin-positioner#v1
 ```

 ## Usage
@@ -87,6 +87,22 @@ let _ = win.move_window(Position::TopRight);

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2021 - Jonas Kruckenberg. 2021 - Present - The Tauri Programme within The Commons Conservancy.
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -107,13 +107,20 @@ impl<R: Runtime> WindowExt for Window<R> {
            },
            #[cfg(feature = "system-tray")]
            TrayLeft => {
-                if let Some((tray_x, tray_y)) = tray_position {
-                    PhysicalPosition {
-                        x: tray_x,
-                        y: tray_y - window_size.height,
-                    }
+                if let (Some((tray_x, tray_y)), Some((_, _tray_height))) =
+                    (tray_position, tray_size)
+                {
+                    let y = tray_y - window_size.height;
+                    // Choose y value based on the target OS
+                    #[cfg(target_os = "windows")]
+                    let y = if y < 0 { tray_y + _tray_height } else { y };
+
+                    #[cfg(target_os = "macos")]
+                    let y = if y < 0 { tray_y } else { y };
+
+                    PhysicalPosition { x: tray_x, y }
                } else {
-                    panic!("tray position not set");
+                    panic!("Tray position not set");
                }
            }
            #[cfg(feature = "system-tray")]
@@ -129,11 +136,20 @@ impl<R: Runtime> WindowExt for Window<R> {
            }
            #[cfg(feature = "system-tray")]
            TrayRight => {
-                if let (Some((tray_x, tray_y)), Some((tray_width, _))) = (tray_position, tray_size)
+                if let (Some((tray_x, tray_y)), Some((tray_width, _tray_height))) =
+                    (tray_position, tray_size)
                {
+                    let y = tray_y - window_size.height;
+                    // Choose y value based on the target OS
+                    #[cfg(target_os = "windows")]
+                    let y = if y < 0 { tray_y + _tray_height } else { y };
+
+                    #[cfg(target_os = "macos")]
+                    let y = if y < 0 { tray_y } else { y };
+
                    PhysicalPosition {
                        x: tray_x + tray_width,
-                        y: tray_y - window_size.height,
+                        y,
                    }
                } else {
                    panic!("Tray position not set");
@@ -153,12 +169,19 @@ impl<R: Runtime> WindowExt for Window<R> {
            }
            #[cfg(feature = "system-tray")]
            TrayCenter => {
-                if let (Some((tray_x, tray_y)), Some((tray_width, _))) = (tray_position, tray_size)
+                if let (Some((tray_x, tray_y)), Some((tray_width, _tray_height))) =
+                    (tray_position, tray_size)
                {
-                    PhysicalPosition {
-                        x: tray_x + (tray_width / 2) - (window_size.width / 2),
-                        y: tray_y - window_size.height,
-                    }
+                    let x = tray_x + tray_width / 2 - window_size.width / 2;
+                    let y = tray_y - window_size.height;
+                    // Choose y value based on the target OS
+                    #[cfg(target_os = "windows")]
+                    let y = if y < 0 { tray_y + _tray_height } else { y };
+
+                    #[cfg(target_os = "macos")]
+                    let y = if y < 0 { tray_y } else { y };
+
+                    PhysicalPosition { x, y }
                } else {
                    panic!("Tray position not set");
                }
@@ -1 +0,0 @@
-../../shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["guest-js/*.ts"]
+}
@@ -2,23 +2,24 @@
 name = "tauri-plugin-single-instance"
 version = "0.0.0"
 description = "Ensure a single instance of your tauri app is running."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }
 exclude = ["/examples"]

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
+semver = { version = "1", optional = true }

 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
-version = "0.48"
+version = "0.59"
 features = [
    "Win32_System_Threading",
    "Win32_System_DataExchange",
@@ -31,3 +32,6 @@ features = [

 [target.'cfg(target_os = "linux")'.dependencies]
 zbus = "3"
+
+[features]
+semver = ["dep:semver"]
@@ -1,10 +1,10 @@
-![tauri-plugin-single-instance](banner.png)
+![plugin-single-instance](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/single-instance/banner.png)

 Ensure a single instance of your tauri app is running.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.67**_

 There are three general methods of installation that we can recommend.

@@ -52,6 +52,22 @@ fn main() {

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -1 +1,3 @@
 node_modules/
+dist/**
+!dist/.gitkeep
@@ -9,6 +9,6 @@
  "author": "",
  "license": "MIT",
  "devDependencies": {
-    "@tauri-apps/cli": "^1.2.3"
+    "@tauri-apps/cli": "1.6.3"
  }
 }
@@ -1,106 +0,0 @@
-lockfileVersion: 5.4
-
-specifiers:
-  '@tauri-apps/cli': ^1.0.0
-
-dependencies:
-  '@tauri-apps/cli': 1.0.2
-
-packages:
-
-  /@tauri-apps/cli-darwin-arm64/1.0.2:
-    resolution: {integrity: sha512-Ahd951yoYon1+WLNBg6xsx6Bb7+GJt7WwC1FllHZ2/iLCbrtWCS2qfeLS0L4ngBqCuWyL35JC/M2LIr9mcUzrg==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-darwin-x64/1.0.2:
-    resolution: {integrity: sha512-8wo+SN1zWoXFQVa/iyEt3Cs0vNMjxDXqVe3Srm4UNpgKboFN5mIgbugwqvM+aJKnEZAH8h8n+ZJUHzc4wtPGHA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-linux-arm-gnueabihf/1.0.2:
-    resolution: {integrity: sha512-PGQghMn0adt9PTnyi2K2o/CLG3tWbOyZvwQjam5cfQbK757WmMgPErC1VqsxiQc+PItWYvqoE9gjANiFc2MpAQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-linux-arm64-gnu/1.0.2:
-    resolution: {integrity: sha512-Uc+XNlWelrnRh7DYrdxBi8Oam9JAQM1GzgEwjupF6Pv7BwlODN7s0HImGPQOKrEkqzpfmYw7KpfgWiiEjS5/3Q==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-linux-arm64-musl/1.0.2:
-    resolution: {integrity: sha512-lVwCG1QzQs2zWP32H4+Dw8NKgJ6hBox2X+bmawGfV9Ce+K4P84bnqfNgpdaSAncjeiTjrO+g7yT9gJFQCOrjlQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-linux-x64-gnu/1.0.2:
-    resolution: {integrity: sha512-G2XmGxvufW9sgGhA3rx+HehcifVTUo8zyISd8DpvGwtpp6Z4WakbivzKFyGiNnnok0nvj/WUrLgBxtUbfdSY+A==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-linux-x64-musl/1.0.2:
-    resolution: {integrity: sha512-/eX536p+KXSmkFuINGeU6EQmYiQEXj6JXbmetmJmkXN0297HbtH3rS3wlyVDCnobRzh1hMeOJEnV+XA20GghMA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-win32-ia32-msvc/1.0.2:
-    resolution: {integrity: sha512-ZvnaKkCABqUbyUKlNk4RdxKyfOte30D5BxN1pj6iZNeKAwXEuTcgP6iPzOovdeaDirkIjcWCEZymwtZDXN4Rvg==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli-win32-x64-msvc/1.0.2:
-    resolution: {integrity: sha512-uMcQyQQD7nyxps34HyYBYUYzFwH26lP58/qdT/GZWvBL1Sv2rqkQXuxHT7xtp4g7nTs0fGRWOtfcnvYIr/1wDw==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tauri-apps/cli/1.0.2:
-    resolution: {integrity: sha512-OJdQJVwtKnTAuv2a9JQlOd0gHbbGsXwT+N6M6YQiXZ3/5WdlXey1zhnD78GXwZsf8Cz0R7QIGTBECO4ur4fnKg==}
-    engines: {node: '>= 10'}
-    hasBin: true
-    optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 1.0.2
-      '@tauri-apps/cli-darwin-x64': 1.0.2
-      '@tauri-apps/cli-linux-arm-gnueabihf': 1.0.2
-      '@tauri-apps/cli-linux-arm64-gnu': 1.0.2
-      '@tauri-apps/cli-linux-arm64-musl': 1.0.2
-      '@tauri-apps/cli-linux-x64-gnu': 1.0.2
-      '@tauri-apps/cli-linux-x64-musl': 1.0.2
-      '@tauri-apps/cli-win32-ia32-msvc': 1.0.2
-      '@tauri-apps/cli-win32-x64-msvc': 1.0.2
-    dev: false
@@ -1,5 +1,3 @@
-[workspace]
-
 [package]
 name = "single-instance-example"
 version = "0.1.0"
@@ -10,14 +8,13 @@ edition = "2021"
 rust-version = "1.57"

 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = [ "derive" ] }
-tauri = { version = "1", features = ["api-all"] }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
 tauri-plugin-single-instance = { path = "../../../" }

 [build-dependencies]
-tauri-build = { version = "1", features = [] }
+tauri-build = { workspace = true }

 [features]
-default = [ "custom-protocol" ]
 custom-protocol = [ "tauri/custom-protocol" ]
@@ -44,7 +44,7 @@
      "active": false
    },
    "allowlist": {
-      "all": true
+      "all": false
    },
    "windows": [
      {
@@ -10,6 +10,9 @@ mod platform_impl;
 #[path = "platform_impl/macos.rs"]
 mod platform_impl;

+#[cfg(feature = "semver")]
+mod semver_compat;
+
 pub(crate) type SingleInstanceCallback<R> =
    dyn FnMut(&AppHandle<R>, Vec<String>, String) + Send + Sync + 'static;

@@ -1,7 +1,8 @@
-#![cfg(target_os = "linux")]
-
 use std::sync::Arc;

+#[cfg(feature = "semver")]
+use crate::semver_compat::semver_compat_string;
+
 use crate::SingleInstanceCallback;
 use tauri::{
    plugin::{self, TauriPlugin},
@@ -26,6 +27,15 @@ impl<R: Runtime> SingleInstanceDBus<R> {
    }
 }

+#[cfg(feature = "semver")]
+fn dbus_id(config: Arc<Config>, version: semver::Version) -> String {
+    let mut id = config.tauri.bundle.identifier.replace(['.', '-'], "_");
+    id.push('_');
+    id.push_str(semver_compat_string(version).as_str());
+    id
+}
+
+#[cfg(not(feature = "semver"))]
 fn dbus_id(config: Arc<Config>) -> String {
    config.tauri.bundle.identifier.replace(['.', '-'], "_")
 }
@@ -33,7 +43,11 @@ fn dbus_id(config: Arc<Config>) -> String {
 pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
    plugin::Builder::new("single-instance")
        .setup(|app| {
+            #[cfg(feature = "semver")]
+            let id = dbus_id(app.config(), app.package_info().version.clone());
+            #[cfg(not(feature = "semver"))]
            let id = dbus_id(app.config());
+
            let single_instance_dbus = SingleInstanceDBus {
                callback: f,
                app_handle: app.clone(),
@@ -85,7 +99,15 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {

 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {
    if let Some(connection) = manager.try_state::<ConnectionHandle>() {
-        let dbus_name = format!("org.{}.SingleInstance", dbus_id(manager.config()));
+        #[cfg(feature = "semver")]
+        let id = dbus_id(
+            manager.config(),
+            manager.app_handle().package_info().version.clone(),
+        );
+        #[cfg(not(feature = "semver"))]
+        let id = dbus_id(manager.config());
+
+        let dbus_name = format!("org.{id}.SingleInstance",);
        let _ = connection.0.release_name(dbus_name);
    }
 }
@@ -1,12 +1,10 @@
-#![cfg(target_os = "macos")]
-
-use crate::SingleInstanceCallback;
-use tauri::{
-    plugin::{self, TauriPlugin},
-    Manager, Runtime,
-};
-pub fn init<R: Runtime>(_f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
-    plugin::Builder::new("single-instance").build()
-}
-
-pub fn destroy<R: Runtime, M: Manager<R>>(_manager: &M) {}
+use crate::SingleInstanceCallback;
+use tauri::{
+    plugin::{self, TauriPlugin},
+    Manager, Runtime,
+};
+pub fn init<R: Runtime>(_f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
+    plugin::Builder::new("single-instance").build()
+}
+
+pub fn destroy<R: Runtime, M: Manager<R>>(_manager: &M) {}
@@ -1,4 +1,5 @@
-#![cfg(target_os = "windows")]
+#[cfg(feature = "semver")]
+use crate::semver_compat::semver_compat_string;

 use crate::SingleInstanceCallback;
 use std::ffi::CStr;
@@ -29,7 +30,13 @@ const WMCOPYDATA_SINGLE_INSTANCE_DATA: usize = 1542;
 pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
    plugin::Builder::new("single-instance")
        .setup(|app| {
-            let id = &app.config().tauri.bundle.identifier;
+            #[allow(unused_mut)]
+            let mut id = app.config().tauri.bundle.identifier.clone();
+            #[cfg(feature = "semver")]
+            {
+                id.push('_');
+                id.push_str(semver_compat_string(app.package_info().version.clone()).as_str());
+            }

            let class_name = encode_wide(format!("{id}-sic"));
            let window_name = encode_wide(format!("{id}-siw"));
@@ -42,7 +49,7 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
                unsafe {
                    let hwnd = FindWindowW(class_name.as_ptr(), window_name.as_ptr());

-                    if hwnd != 0 {
+                    if !hwnd.is_null() {
                        let data = format!(
                            "{}|{}\0",
                            std::env::current_dir()
@@ -62,7 +69,7 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
                    }
                }
            } else {
-                app.manage(MutexHandle(hmutex));
+                app.manage(MutexHandle(hmutex as _));

                let hwnd = create_event_target_window::<R>(&class_name, &window_name);
                unsafe {
@@ -73,7 +80,7 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
                    )
                };

-                app.manage(TargetWindowHandle(hwnd));
+                app.manage(TargetWindowHandle(hwnd as _));
            }

            Ok(())
@@ -89,12 +96,12 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {
    if let Some(hmutex) = manager.try_state::<MutexHandle>() {
        unsafe {
-            ReleaseMutex(hmutex.0);
-            CloseHandle(hmutex.0);
+            ReleaseMutex(hmutex.0 as _);
+            CloseHandle(hmutex.0 as _);
        }
    }
    if let Some(hwnd) = manager.try_state::<TargetWindowHandle>() {
-        unsafe { DestroyWindow(hwnd.0) };
+        unsafe { DestroyWindow(hwnd.0 as _) };
    }
 }

@@ -106,6 +113,9 @@ unsafe extern "system" fn single_instance_window_proc<R: Runtime>(
 ) -> LRESULT {
    let data_ptr = GetWindowLongPtrW(hwnd, GWL_USERDATA)
        as *mut (AppHandle<R>, Box<SingleInstanceCallback<R>>);
+    if data_ptr.is_null() {
+        return DefWindowProcW(hwnd, msg, wparam, lparam);
+    }
    let (app_handle, callback) = &mut *data_ptr;

    match msg {
@@ -115,7 +125,7 @@ unsafe extern "system" fn single_instance_window_proc<R: Runtime>(
                let data = CStr::from_ptr((*cds_ptr).lpData as _).to_string_lossy();
                let mut s = data.split('|');
                let cwd = s.next().unwrap();
-                let args = s.into_iter().map(|s| s.to_string()).collect();
+                let args = s.map(|s| s.to_string()).collect();
                callback(app_handle, args, cwd.to_string());
            }
            1
@@ -138,12 +148,12 @@ fn create_event_target_window<R: Runtime>(class_name: &[u16], window_name: &[u16
            cbClsExtra: 0,
            cbWndExtra: 0,
            hInstance: GetModuleHandleW(std::ptr::null()),
-            hIcon: 0,
-            hCursor: 0,
-            hbrBackground: 0,
+            hIcon: std::ptr::null_mut(),
+            hCursor: std::ptr::null_mut(),
+            hbrBackground: std::ptr::null_mut(),
            lpszMenuName: std::ptr::null(),
            lpszClassName: class_name.as_ptr(),
-            hIconSm: 0,
+            hIconSm: std::ptr::null_mut(),
        };

        RegisterClassExW(&class);
@@ -167,8 +177,8 @@ fn create_event_target_window<R: Runtime>(class_name: &[u16], window_name: &[u16
            0,
            0,
            0,
-            0,
-            0,
+            std::ptr::null_mut(),
+            std::ptr::null_mut(),
            GetModuleHandleW(std::ptr::null()),
            std::ptr::null(),
        );
@@ -0,0 +1,15 @@
+/// Takes a version and spits out a String with trailing _x, thus only considering the digits
+/// relevant regarding semver compatibility
+pub fn semver_compat_string(version: semver::Version) -> String {
+    // for pre-release always treat each version separately
+    if !version.pre.is_empty() {
+        return version.to_string().replace(['.', '-'], "_");
+    }
+    match version.major {
+        0 => match version.minor {
+            0 => format!("0_0_{}", version.patch),
+            _ => format!("0_{}_x", version.minor),
+        },
+        _ => format!("{}_x_x", version.major),
+    }
+}
@@ -2,25 +2,26 @@
 name = "tauri-plugin-sql"
 version = "0.0.0"
 description = "Interface with SQL databases."
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+authors = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+#rust-version = { workspace = true }
+rust-version = "1.80"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-serde.workspace = true
-serde_json.workspace = true
-tauri.workspace = true
-log.workspace = true
-thiserror.workspace = true
+serde = { workspace = true }
+serde_json = { workspace = true }
+tauri = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
 futures-core = "0.3"
-sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "json", "time"] }
+sqlx = { version = "0.8", features = ["json", "time"] }
 time = "0.3"
 tokio = { version = "1", features = ["sync"] }

 [features]
-sqlite = ["sqlx/sqlite"]
-mysql = ["sqlx/mysql"]
-postgres = ["sqlx/postgres"]
+sqlite = ["sqlx/sqlite", "sqlx/runtime-tokio"]
+mysql = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"]
+postgres = ["sqlx/postgres", "sqlx/runtime-tokio-rustls"]
@@ -1,10 +1,10 @@
-![plugin-sql](banner.png)
+![plugin-sql](https://github.com/tauri-apps/plugins-workspace/raw/v1/plugins/sql/banner.png)

 Interface with SQL databases through [sqlx](https://github.com/launchbadge/sqlx). It supports the `sqlite`, `mysql` and `postgres` drivers, enabled by a Cargo feature.

 ## Install

-_This plugin requires a Rust version of at least **1.64**_
+_This plugin requires a Rust version of at least **1.80**_

 There are three general methods of installation that we can recommend.

@@ -28,11 +28,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa
 > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.

 ```sh
-pnpm add https://github.com/tauri-apps/tauri-plugin-sql
+pnpm add https://github.com/tauri-apps/tauri-plugin-sql#v1
 # or
-npm add https://github.com/tauri-apps/tauri-plugin-sql
+npm add https://github.com/tauri-apps/tauri-plugin-sql#v1
 # or
-yarn add https://github.com/tauri-apps/tauri-plugin-sql
+yarn add https://github.com/tauri-apps/tauri-plugin-sql#v1
 ```

 ## Usage
@@ -65,10 +65,118 @@ const db = await Database.load("postgres://postgres:password@localhost/test");
 await db.execute("INSERT INTO ...");
 ```

+## Syntax
+
+We use sqlx as our underlying library, adopting their query syntax:
+
+- sqlite and postgres use the "$#" syntax when substituting query data
+- mysql uses "?" when substituting query data
+
+```javascript
+// INSERT and UPDATE examples for sqlite and postgres
+const result = await db.execute(
+  "INSERT into todos (id, title, status) VALUES ($1, $2, $3)",
+  [todos.id, todos.title, todos.status],
+);
+
+const result = await db.execute(
+  "UPDATE todos SET title = $1, completed = $2 WHERE id = $3",
+  [todos.title, todos.status, todos.id],
+);
+
+// INSERT and UPDATE examples for mysql
+const result = await db.execute(
+  "INSERT into todos (id, title, status) VALUES (?, ?, ?)",
+  [todos.id, todos.title, todos.status],
+);
+
+const result = await db.execute(
+  "UPDATE todos SET title = ?, completed = ? WHERE id = ?",
+  [todos.title, todos.status, todos.id],
+);
+```
+
+## Migrations
+
+This plugin supports database migrations, allowing you to manage database schema evolution over time.
+
+### Defining Migrations
+
+Migrations are defined in Rust using the `Migration` struct. Each migration should include a unique version number, a description, the SQL to be executed, and the type of migration (Up or Down).
+
+Example of a migration:
+
+```rust
+use tauri_plugin_sql::{Migration, MigrationKind};
+
+let migration = Migration {
+    version: 1,
+    description: "create_initial_tables",
+    sql: "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT);",
+    kind: MigrationKind::Up,
+};
+```
+
+### Adding Migrations to the Plugin Builder
+
+Migrations are registered with the `Builder` struct provided by the plugin. Use the `add_migrations` method to add your migrations to the plugin for a specific database connection.
+
+Example of adding migrations:
+
+```rust
+use tauri_plugin_sql::{Builder, Migration, MigrationKind};
+
+fn main() {
+    let migrations = vec![
+        // Define your migrations here
+        Migration {
+            version: 1,
+            description: "create_initial_tables",
+            sql: "CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT);",
+            kind: MigrationKind::Up,
+        }
+    ];
+
+    tauri::Builder::default()
+        .plugin(
+            tauri_plugin_sql::Builder::default()
+                .add_migrations("sqlite:mydatabase.db", migrations)
+                .build(),
+        )
+        ...
+}
+```
+
+### Applying Migrations
+
+Migrations are applied automatically when the plugin is initialized. The plugin runs these migrations against the database specified by the connection string. Ensure that the migrations are defined in the correct order and are idempotent (safe to run multiple times).
+
+### Migration Management
+
+- **Version Control**: Each migration must have a unique version number. This is crucial for ensuring the migrations are applied in the correct order.
+- **Idempotency**: Write migrations in a way that they can be safely re-run without causing errors or unintended consequences.
+- **Testing**: Thoroughly test migrations to ensure they work as expected and do not compromise the integrity of your database.
+
 ## Contributing

 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

+## Partners
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://crabnebula.dev" target="_blank">
+          <img src="https://github.com/tauri-apps/plugins-workspace/raw/v1/.github/sponsors/crabnebula.svg" alt="CrabNebula" width="283">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+For the complete list of sponsors please visit our [website](https://tauri.app#sponsors) and [Open Collective](https://opencollective.com/tauri).
+
 ## License

 Code: (c) 2015 - Present - The Tauri Programme within The Commons Conservancy.
@@ -76,10 +76,29 @@ export default class Database {
   *
   * @example
   * ```ts
+   * // for sqlite & postgres
+   * // INSERT example
+   * const result = await db.execute(
+   *    "INSERT into todos (id, title, status) VALUES ($1, $2, $3)",
+   *    [ todos.id, todos.title, todos.status ]
+   * );
+   * // UPDATE example
   * const result = await db.execute(
   *    "UPDATE todos SET title = $1, completed = $2 WHERE id = $3",
   *    [ todos.title, todos.status, todos.id ]
   * );
+   *
+   * // for mysql
+   * // INSERT example
+   * const result = await db.execute(
+   *    "INSERT into todos (id, title, status) VALUES (?, ?, ?)",
+   *    [ todos.id, todos.title, todos.status ]
+   * );
+   * // UPDATE example
+   * const result = await db.execute(
+   *    "UPDATE todos SET title = ?, completed = ? WHERE id = ?",
+   *    [ todos.title, todos.status, todos.id ]
+   * );
   * ```
   */
  async execute(query: string, bindValues?: unknown[]): Promise<QueryResult> {
@@ -89,15 +108,13 @@ export default class Database {
        db: this.path,
        query,
        values: bindValues ?? [],
-      }
+      },
    );
-
    return {
      lastInsertId,
      rowsAffected,
    };
  }
-
  /**
   * **select**
   *
@@ -105,9 +122,15 @@ export default class Database {
   *
   * @example
   * ```ts
+   * // for sqlite & postgres
   * const result = await db.select(
   *    "SELECT * from todos WHERE id = $1", id
   * );
+   *
+   * // for mysql
+   * const result = await db.select(
+   *    "SELECT * from todos WHERE id = ?", id
+   * );
   * ```
   */
  async select<T>(query: string, bindValues?: unknown[]): Promise<T> {
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.8.1"
  },
  "dependencies": {
-    "@tauri-apps/api": "^1.2.0"
+    "@tauri-apps/api": "1.6.0"
  }
 }
@@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs";
 export default createConfig({
  input: "guest-js/index.ts",
  pkg: JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
+    readFileSync(new URL("./package.json", import.meta.url), "utf8"),
  ),
  external: [/^@tauri-apps\/api/],
 });
@@ -17,7 +17,14 @@ pub(crate) fn to_json(v: MySqlValueRef) -> Result<JsonValue, Error> {
                JsonValue::Null
            }
        }
-        "FLOAT" | "DOUBLE" => {
+        "FLOAT" => {
+            if let Ok(v) = ValueRef::to_owned(&v).try_decode::<f32>() {
+                JsonValue::from(v)
+            } else {
+                JsonValue::Null
+            }
+        }
+        "DOUBLE" => {
            if let Ok(v) = ValueRef::to_owned(&v).try_decode::<f64>() {
                JsonValue::from(v)
            } else {
--- a/Show More
+++ b/Show More