Merge branch 'dev' of https://github.com/tauri-apps/tauri into dev

examples/svelte/svelte-app/package.json

@@ -17,7 +17,7 @@
     "tauri:prod:build": "yarn tauri:prod build"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "6.0.0",
+    "@rollup/plugin-node-resolve": "7.0.0",
     "rollup": "1.29.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-livereload": "1.0.4",

examples/svelte/svelte-app/yarn.lock

@@ -23,10 +23,10 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-0.5.0.tgz#b21510597fd601e5d7c95008b76bf0d254ebfd31"
   integrity sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==
 
-"@rollup/plugin-node-resolve@6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-6.0.0.tgz#f351e29b45c007c17df4e28a0efd0d1f5662f59b"
-  integrity sha512-GqWz1CfXOsqpeVMcoM315+O7zMxpRsmhWyhJoxLFHVSp9S64/u02i7len/FnbTNbmgYs+sZyilasijH8UiuboQ==
+"@rollup/plugin-node-resolve@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.0.0.tgz#cce3826df801538b001972fbf9b6b1c22b69fdf8"
+  integrity sha512-+vOx2+WMBMFotYKM3yYeDGZxIvcQ7yO4g+SuKDFsjKaq8Lw3EPgfB6qNlp8Z/3ceDCEhHvC9/b+PgBGwDQGbzQ==
   dependencies:
     "@rollup/pluginutils" "^3.0.0"
     "@types/resolve" "0.0.8"

renovate.json

@@ -1,8 +1,6 @@
 {
   "extends": ["config:base"],
   "schedule": "after 3am on Wednesday",
-  "enabled": false,
-  "rebaseConflictedPrs": false,
   "ignorePaths": [],
   "labels": ["chore"],
   "enabledManagers": ["cargo", "npm"],
@@ -10,6 +8,10 @@
     "enabled": true
   },
   "packageRules": [
+    {
+      "packagePatterns": ["*"],
+      "enabled": false
+    },
     {
       "enabled": true,
       "paths": ["tauri/**"],
@@ -18,7 +20,8 @@
       "commitMessagePrefix": "chore(deps)",
       "lockFileMaintenance": {
         "enabled": true
-      }
+      },
+      "rebaseConflictedPrs": false
     },
     {
       "enabled": true,
@@ -28,7 +31,8 @@
       "commitMessagePrefix": "chore(deps)",
       "lockFileMaintenance": {
         "enabled": true
-      }
+      },
+      "rebaseConflictedPrs": false
     },
     {
       "enabled": true,
@@ -38,7 +42,8 @@
       "commitMessagePrefix": "chore(deps)",
       "lockFileMaintenance": {
         "enabled": true
-      }
+      },
+      "rebaseConflictedPrs": false
     },
     {
       "enabled": true,
@@ -48,7 +53,8 @@
       "commitMessagePrefix": "chore(deps)",
       "lockFileMaintenance": {
         "enabled": true
-      }
+      },
+      "rebaseConflictedPrs": false
     },
     {
       "enabled": true,

tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Lucas Fernandes Gonçalves Nogueira <lucas@quasar.dev>", "Daniel Thompson-Yvetot <denjell@sfosc.org>", "Tensor Programming <tensordeveloper@gmail.com>"]
 license = "MIT"
 homepage = "https://tauri-apps.org"

tauri/src/endpoints.rs

@@ -145,8 +145,8 @@ fn init() -> TauriResult<String> {
             }}
             ",
             fn = crate::event::emit_function_name(),
-            queue = crate::event::event_listeners_object_name(),
-            listeners = crate::event::event_queue_object_name(),
+            queue = crate::event::event_queue_object_name(),
+            listeners = crate::event::event_listeners_object_name()
   ));
 }