diff --git a/crates/desktop/tauri-artcraft/tauri.artcraft_2d.conf.json b/crates/desktop/tauri-artcraft/tauri.artcraft_2d.conf.json deleted file mode 100644 index f8b0319588..0000000000 --- a/crates/desktop/tauri-artcraft/tauri.artcraft_2d.conf.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2.0.0-rc", - "productName": "ArtCraft 2D", - "version": "0.1.0", - "identifier": "ai.artcraft.app", - "build": { - "frontendDist": "../../../frontend/apps/editor2d/dist", - "devUrl": "http://localhost:5173", - "beforeDevCommand": "nx run editor2d:dev", - "beforeBuildCommand": "nx run editor2d:build" - }, - "app": { - "windows": [ - { - "title": "ArtCraft 2D", - "width": 2400, - "height": 1300, - "resizable": true, - "fullscreen": false - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "targets": "all", - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ] - } -} diff --git a/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.json b/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.json deleted file mode 100644 index 0cab995539..0000000000 --- a/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2.0.0-rc", - "productName": "ArtCraft 3D", - "version": "0.1.0", - "identifier": "ai.artcraft.app", - "build": { - "frontendDist": "../../../frontend/apps/editor3d/dist", - "devUrl": "http://localhost:5173", - "beforeDevCommand": "nx run editor3d:dev", - "beforeBuildCommand": "nx run editor3d:build" - }, - "app": { - "windows": [ - { - "title": "ArtCraft 3D", - "width": 2400, - "height": 1300, - "resizable": true, - "fullscreen": false - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "targets": "all", - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ] - } -} diff --git a/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.toml b/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.toml new file mode 100644 index 0000000000..d38271d390 --- /dev/null +++ b/crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.toml @@ -0,0 +1,5 @@ +# For some reason, we can't pass json files to the tauri dev command +[build] +frontendDist = "../../../frontend/apps/editor3d/dist" +beforeDevCommand = "nx run editor3d:dev" +devUrl = "http://localhost:5173" diff --git a/crates/desktop/tauri-artcraft/tauri.conf.json b/crates/desktop/tauri-artcraft/tauri.conf.json index babd6efb2f..c5ab1444ff 100644 --- a/crates/desktop/tauri-artcraft/tauri.conf.json +++ b/crates/desktop/tauri-artcraft/tauri.conf.json @@ -4,10 +4,10 @@ "version": "0.1.0", "identifier": "ai.artcraft.app", "build": { - "frontendDist": "../../../frontend/apps/editor3d/dist", - "devUrl": "http://localhost:5173", - "beforeDevCommand": "nx run editor3d:dev", - "beforeBuildCommand": "nx run editor3d:build" + "frontendDist": "../../../frontend/apps/editor2d/dist", + "devUrl": "http://localhost:5741", + "beforeDevCommand": "nx run editor2d:dev", + "beforeBuildCommand": "nx run editor2d:build" }, "app": { "windows": [ diff --git a/script/desktop/launch_desktop_2d.sh b/script/desktop/launch_desktop_2d.sh index ab2eb53c6c..ad3e25b157 100755 --- a/script/desktop/launch_desktop_2d.sh +++ b/script/desktop/launch_desktop_2d.sh @@ -20,5 +20,5 @@ export TAURI_APP_PATH="${root_dir}/crates/desktop/tauri-artcraft" export CONFIG_PATH="${TAURI_APP_PATH}/tauri.artcraft_2d.conf.toml" -#cargo tauri dev --no-watch -- --config "${CONFIG_PATH}" +# TODO: --no-watch cargo tauri dev --config "${CONFIG_PATH}" diff --git a/script/desktop/launch_desktop_3d.sh b/script/desktop/launch_desktop_3d.sh index ea1a0de542..5663317753 100755 --- a/script/desktop/launch_desktop_3d.sh +++ b/script/desktop/launch_desktop_3d.sh @@ -18,6 +18,7 @@ popd export TAURI_FRONTEND_PATH="${frontend_path}" export TAURI_APP_PATH="${root_dir}/crates/desktop/tauri-artcraft" -export CONFIG_PATH="${TAURI_APP_PATH}/tauri.artcraft_2d.conf.json" +export CONFIG_PATH="${TAURI_APP_PATH}/tauri.artcraft_3d.conf.toml" -cargo tauri dev --config "${TAURI_APP_PATH}/tauri.artcraft_2d.conf.json" -- --no-watch +# TODO: --no-watch +cargo tauri dev --config "${CONFIG_PATH}"