Merge pull request #823 from VPKSoft/dependabot/npm_and_yarn/producti…

…on-dependencies-e6199c972a

Bump the production-dependencies group with 11 updates

package.json

@@ -17,29 +17,29 @@
         "@fortawesome/free-regular-svg-icons": "^6.6.0",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@fortawesome/react-fontawesome": "^0.2.2",
-        "@tauri-apps/api": "^2.0.0-rc.0",
-        "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.0",
-        "@tauri-apps/plugin-dialog": "^2.0.0-rc.0",
-        "@tauri-apps/plugin-process": "^2.0.0-rc.0",
-        "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
-        "@tauri-apps/plugin-updater": "^2.0.0-rc.0",
+        "@tauri-apps/api": "^2.0.0-rc.4",
+        "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.1",
+        "@tauri-apps/plugin-dialog": "^2.0.0-rc.1",
+        "@tauri-apps/plugin-process": "^2.0.0-rc.1",
+        "@tauri-apps/plugin-shell": "^2.0.0-rc.1",
+        "@tauri-apps/plugin-updater": "^2.0.0-rc.1",
         "@vitejs/plugin-react": "^4.3.1",
-        "antd": "^5.20.2",
+        "antd": "^5.20.3",
         "classnames": "^2.5.1",
         "dompurify": "^3.1.6",
         "gauth-decode": "^0.1.1",
-        "html-react-parser": "^5.1.12",
+        "html-react-parser": "^5.1.15",
         "html5-qrcode": "^2.3.8",
         "i18next": "^23.14.0",
         "jodit-react": "^4.1.2",
-        "marked": "^14.0.0",
+        "marked": "^14.1.0",
         "qrcode": "^1.5.4",
         "react": "^18.3.1",
         "react-countdown-circle-timer": "^3.2.1",
         "react-dom": "^18.3.1",
         "react-i18next": "^15.0.1",
         "react-secure-storage": "^1.3.2",
-        "styled-components": "^6.1.12",
+        "styled-components": "^6.1.13",
         "tauri-plugin-window-state": "github:tauri-apps/tauri-plugin-window-state#v2"
     },
     "devDependencies": {

src/utilities/app/Files.ts

@@ -61,6 +61,10 @@ const EmptyGeneralEntryString: GeneralEntry<string> = { type: "tags", values: []
  */
 const failed: FileResult = { ok: false, fileData: [], fileName: "", tags: EmptyGeneralEntryString };
 
+type OpenDialogReturn = {
+    path?: string;
+};
+
 /**
  * Displays an open file dialog and returns the user selected file.
  * @param extensionName The name of the file extension to display to the user via the open file dialog.
@@ -77,7 +81,12 @@ const selectFileToOpen = async (extensionName: string, extension = "pkd") => {
         ],
     });
 
-    return filePath?.path ?? null;
+    // Compatibility fix for frontend dependencies vs. backend dependencies for Tauri breaking change. TODO::Remove when fully merged.
+    if (filePath === null) {
+        return "";
+    }
+
+    return typeof filePath === "string" ? filePath : ((filePath as OpenDialogReturn)?.path ?? null);
 };
 
 /**