fix(tauri): update to tauri v2 (fixes audio)

zidoro · Nov 12, 2023 · 231a379 · 231a379
1 parent a2ae285
commit 231a379
Show file tree

Hide file tree

Showing 13 changed files with 516 additions and 915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ yarn-error.log*
 
 .idea/
 *.iml
+/lerna-debug.log
diff --git a/app/renderer/package.json b/app/renderer/package.json
@@ -33,6 +33,9 @@
   },
   "dependencies": {
     "@pomatez/shareables": "*",
+    "@tauri-apps/api": "2.0.0-alpha.8",
+    "@tauri-apps/plugin-autostart": "^2.0.0-alpha.1",
+    "@tauri-apps/plugin-window": "^2.0.0-alpha.1",
     "@types/autosize": "^3.0.7",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.63",
@@ -57,7 +60,6 @@
     "redux-devtools-extension": "^2.13.8",
     "redux-undo": "^1.0.1",
     "styled-components": "^5.3.11",
-    "tauri-plugin-autostart-api": "https://github.com/tauri-apps/tauri-plugin-autostart#v1",
     "use-stay-awake": "^0.1.5"
   },
   "devDependencies": {

diff --git a/app/renderer/public/index.html b/app/renderer/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: 'unsafe-inline'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: 'unsafe-inline'; connect-src 'self' http://ipc.localhost/">
     <title>Pomatez</title>
   </head>
   <body>

diff --git a/app/renderer/src/components/Titlebar.tsx b/app/renderer/src/components/Titlebar.tsx
@@ -27,8 +27,9 @@ type Props = {
 };
 
 const Titlebar: React.FC<Props> = ({ darkMode, timerType }) => {
-  const { onMinimizeCallback, onExitCallback } =
-    useContext(ConnnectorContext);
+  const { onMinimizeCallback, onExitCallback } = useContext(
+    ConnnectorContext
+  );
 
   const getAppIcon = useCallback(() => {
     switch (timerType) {
@@ -44,7 +45,7 @@ const Titlebar: React.FC<Props> = ({ darkMode, timerType }) => {
   }, [darkMode, timerType]);
 
   return (
-    <StyledTitlebar data-tauri-drag-region={true}>
+    <StyledTitlebar data-tauri-drag-region>
       <StyledMarkWrapper>
         <StyledMarkLogo src={getAppIcon()} />
         <StyledMarkName>

diff --git a/app/renderer/src/contexts/connectors/TauriConnector.tsx b/app/renderer/src/contexts/connectors/TauriConnector.tsx
@@ -17,11 +17,10 @@ import {
 } from "@pomatez/shareables";
 import { encodeSvg } from "../../utils";
 import { TraySVG } from "../../components";
-import { enable, disable } from "tauri-plugin-autostart-api";
+import { enable, disable } from "@tauri-apps/plugin-autostart";
+import { invoke } from "@tauri-apps/api/tauri";
 
 export const TauriConnectorProvider: React.FC = ({ children }) => {
-  const { invoke } = window.__TAURI__;
-
   const settings: SettingTypes = useSelector(
     (state: AppStateTypes) => state.settings
   );
@@ -31,12 +30,9 @@ export const TauriConnectorProvider: React.FC = ({ children }) => {
    * @param event
    * @param payload
    */
-  const send = useCallback(
-    (event: string, ...payload: any) => {
-      invoke(event.toLowerCase(), ...payload);
-    },
-    [invoke]
-  );
+  const send = useCallback(async (event: string, ...payload: any) => {
+    await invoke(event.toLowerCase(), ...payload);
+  }, []);
 
   useEffect(() => {
     if (settings.openAtLogin) {

diff --git a/app/renderer/src/extensions/window.extension.ts b/app/renderer/src/extensions/window.extension.ts
@@ -10,9 +10,6 @@ declare global {
         options?: Electron.OpenExternalOptions
       ) => Promise<void>;
     };
-    __TAURI__: {
-      invoke: (command: string, ...args: any[]) => void;
-    };
   }
 }