Merge remote-tracking branch 'origin/v1' into v2-merge-v1

tauri-apps · Jul 19, 2023 · 753cfe5 · 753cfe5
2 parents f5fbd80 + 0863f80
commit 753cfe5
Show file tree

Hide file tree

Showing 21 changed files with 1,104 additions and 1,141 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -10,27 +10,28 @@
     "format-check": "prettier --check ."
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
+    "@rollup/plugin-node-resolve": "15.1.0",
+    "@rollup/plugin-terser": "0.4.3",
+    "@rollup/plugin-typescript": "11.1.2",
+    "@typescript-eslint/eslint-plugin": "6.1.0",
+    "@typescript-eslint/parser": "6.1.0",
     "covector": "^0.9.0",
-    "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-standard-with-typescript": "^36.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": "^3.0.0",
-    "rollup": "^3.25.1",
-    "typescript": "^5.1.3"
+    "eslint": "8.45.0",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-config-standard-with-typescript": "36.1.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-n": "16.0.1",
+    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-security": "1.7.1",
+    "prettier": "3.0.0",
+    "rollup": "3.26.3",
+    "typescript": "5.1.6"
   },
   "resolutions": {
-    "semver": ">=7.5.2"
+    "semver": ">=7.5.2",
+    "optionator": ">=0.9.3"
   },
   "engines": {
-    "pnpm": ">=7.33.0"
+    "pnpm": ">=7.33.1"
   }
 }
diff --git a/plugins/authenticator/package.json b/plugins/authenticator/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json
@@ -24,7 +24,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/log/package.json b/plugins/log/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/os/package.json b/plugins/os/package.json
@@ -24,7 +24,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/process/package.json b/plugins/process/package.json
@@ -24,7 +24,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/single-instance/examples/vanilla/pnpm-lock.yaml b/plugins/single-instance/examples/vanilla/pnpm-lock.yaml
diff --git a/plugins/sql/README.md b/plugins/sql/README.md
@@ -74,6 +74,37 @@ 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],
+);
+```
+
 ## Contributing
 
 PRs accepted. Please make sure to read the Contributing Guide before making a pull request.

diff --git a/plugins/sql/guest-js/index.ts b/plugins/sql/guest-js/index.ts
@@ -84,10 +84,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> {
@@ -104,17 +123,22 @@ export default class Database {
       rowsAffected,
     };
   }
-
   /**
    * **select**
    *
    * Passes in a SELECT query to the database for execution.
    *
    * @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> {

diff --git a/plugins/sql/package.json b/plugins/sql/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/store/package.json b/plugins/store/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml
@@ -14,7 +14,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 iota_stronghold = "1"
-iota-crypto = "0.21"
+iota-crypto = "0.23"
 hex = "0.4"
 zeroize = { version = "1", features = [ "zeroize_derive" ] }
 

diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/upload/package.json b/plugins/upload/package.json
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"

diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json
@@ -11,14 +11,14 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^2.1.0",
-    "@sveltejs/kit": "^1.22.0",
+    "@sveltejs/adapter-auto": "2.1.0",
+    "@sveltejs/kit": "1.22.3",
     "@tauri-apps/cli": "2.0.0-alpha.10",
-    "svelte": "^4.0.4",
-    "svelte-check": "^3.4.4",
-    "tslib": "^2.6.0",
-    "typescript": "^5.1.6",
-    "vite": "^4.4.0"
+    "svelte": "4.0.5",
+    "svelte-check": "3.4.6",
+    "tslib": "2.6.0",
+    "typescript": "5.1.6",
+    "vite": "4.4.4"
   },
   "dependencies": {
     "@tauri-apps/plugin-websocket": "link:../../"

diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json
@@ -24,7 +24,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "tslib": "^2.5.0"
+    "tslib": "2.6.0"
   },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.5"