diff --git a/.gitignore b/.gitignore index 6abb642..4cb2027 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ node_modules !.yarn/releases !.yarn/sdks !.yarn/versions + +**/src-tauri/comfyui/* diff --git a/packages/stablestudio-ui/package.json b/packages/stablestudio-ui/package.json index 0b9923c..f41a4dd 100644 --- a/packages/stablestudio-ui/package.json +++ b/packages/stablestudio-ui/package.json @@ -27,6 +27,7 @@ "@tanstack/react-query": "^4.22.0", "@tanstack/react-query-devtools": "^4.22.0", "@tanstack/react-virtual": "beta", + "@tauri-apps/api": "^1.4.0", "buffer": "^6.0.3", "date-fns": "^2.29.3", "file-saver": "^2.0.5", diff --git a/packages/stablestudio-ui/src-tauri/Cargo.toml b/packages/stablestudio-ui/src-tauri/Cargo.toml index bfa310a..ae72a81 100644 --- a/packages/stablestudio-ui/src-tauri/Cargo.toml +++ b/packages/stablestudio-ui/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.4.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.4.0", features = [] } +tauri = { version = "1.4.0", features = [ "fs-all", "path-all"] } [features] # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. diff --git a/packages/stablestudio-ui/src-tauri/src/main.rs b/packages/stablestudio-ui/src-tauri/src/main.rs index f5c5be2..e6ad770 100644 --- a/packages/stablestudio-ui/src-tauri/src/main.rs +++ b/packages/stablestudio-ui/src-tauri/src/main.rs @@ -2,7 +2,7 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { - tauri::Builder::default() - .run(tauri::generate_context!()) - .expect("error while running tauri application"); + tauri::Builder::default() + .run(tauri::generate_context!()) + .expect("error while running tauri application"); } diff --git a/packages/stablestudio-ui/src-tauri/tauri.conf.json b/packages/stablestudio-ui/src-tauri/tauri.conf.json index 801564e..2dcb053 100644 --- a/packages/stablestudio-ui/src-tauri/tauri.conf.json +++ b/packages/stablestudio-ui/src-tauri/tauri.conf.json @@ -11,11 +11,17 @@ }, "tauri": { "allowlist": { - "all": false + "fs": { + "scope": ["$RESOURCE/*", "$RESOURCE/comfyui/*"], + "all": true + }, + "path": { + "all": true + } }, "bundle": { "active": true, - "category": "DeveloperTool", + "category": "GraphicsAndDesign", "copyright": "", "deb": { "depends": [] @@ -28,7 +34,7 @@ "icons/icon.icns", "icons/icon.ico" ], - "identifier": "com.tauri.dev", + "identifier": "com.stabilityai.stablestudio", "longDescription": "", "macOS": { "entitlements": null, @@ -37,13 +43,22 @@ "providerShortName": null, "signingIdentity": null }, - "resources": [], + "resources": [ + "comfyui/*" + ], "shortDescription": "", - "targets": "all", + "targets": [ + "app", + "nsis", + "deb" + ], "windows": { "certificateThumbprint": null, "digestAlgorithm": "sha256", - "timestampUrl": "" + "timestampUrl": "", + "wix": { + "language": "en-US" + } } }, "security": { @@ -55,10 +70,10 @@ "windows": [ { "fullscreen": false, - "height": 600, + "height": 950, "resizable": true, "title": "StableStudio", - "width": 800 + "width": 1800 } ] } diff --git a/packages/stablestudio-ui/src/index.tsx b/packages/stablestudio-ui/src/index.tsx index 62a1827..5497aeb 100644 --- a/packages/stablestudio-ui/src/index.tsx +++ b/packages/stablestudio-ui/src/index.tsx @@ -1,9 +1,21 @@ +import { readTextFile } from "@tauri-apps/api/fs"; +import { resolveResource } from "@tauri-apps/api/path"; +// alternatively, use `window.__TAURI__.path.resolveResource` +// alternatively, use `window.__TAURI__.fs.readTextFile` + import ReactDOM from "react-dom/client"; import "~/GlobalVariables"; import { App } from "~/App"; +(async () => { + const resourcePath = await resolveResource( + "comfyui/README_VERY_IMPORTANT.txt" + ); + console.log(resourcePath, await readTextFile(resourcePath)); +})(); + const main = async () => { const root = document.getElementById("app"); root && diff --git a/yarn.lock b/yarn.lock index 9ddec84..1838869 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1278,6 +1278,7 @@ __metadata: "@tanstack/react-query": ^4.22.0 "@tanstack/react-query-devtools": ^4.22.0 "@tanstack/react-virtual": beta + "@tauri-apps/api": ^1.4.0 "@types/file-saver": ^2.0.5 "@types/lodash.throttle": ^4.1.7 "@types/react": ^18.0.27 @@ -1427,6 +1428,13 @@ __metadata: languageName: node linkType: hard +"@tauri-apps/api@npm:^1.4.0": + version: 1.4.0 + resolution: "@tauri-apps/api@npm:1.4.0" + checksum: 0c24b72d6bdb1180aafc6a19bdaad1501810f880f1a52f0fbe1b1b2b04fe0b6148deba7a3769a03b877e4ddf3008348b6e1c6cb725f17effb78c9a0a0e099dc5 + languageName: node + linkType: hard + "@tootallnate/once@npm:2": version: 2.0.0 resolution: "@tootallnate/once@npm:2.0.0"