Merge branch 'master' into gui_search

2022-08-03 00:44:17 -07:00
parent b0a55c9b18
commit 51982dde62
79 changed files with 6320 additions and 6336 deletions
--- a/theseus_gui/src-tauri/tauri.conf.json
+++ b/theseus_gui/src-tauri/tauri.conf.json
@@ -4,7 +4,7 @@
  },
  "build": {
    "distDir": "../build",
-    "devPath": "http://localhost:3000",
+    "devPath": "http://localhost:5173",
    "beforeDevCommand": "pnpm dev:web",
    "beforeBuildCommand": "pnpm run build:web"
  },
@@ -32,13 +32,11 @@
      "shortDescription": "",
      "longDescription": "",
      "deb": {
-        "depends": [],
-        "useBootstrapper": false
+        "depends": []
      },
      "macOS": {
        "frameworks": [],
        "minimumSystemVersion": "",
-        "useBootstrapper": false,
        "exceptionDomain": "",
        "signingIdentity": null,
        "providerShortName": null,