diff --git a/crates/desktop/artcraft/tauri.artcraft_2d.conf.toml b/crates/desktop/artcraft/tauri.artcraft_2d.conf.toml deleted file mode 100644 index 3e486a8818..0000000000 --- a/crates/desktop/artcraft/tauri.artcraft_2d.conf.toml +++ /dev/null @@ -1,5 +0,0 @@ -# For some reason, we can't pass json files to the tauri dev command -[build] -frontendDist = "../../../frontend/apps/editor2d/dist" -beforeDevCommand = "npx nx run editor2d:dev" -devUrl = "http://localhost:5741" diff --git a/crates/desktop/artcraft/tauri.artcraft_2d.no_dev.conf.toml b/crates/desktop/artcraft/tauri.artcraft_2d.no_dev.conf.toml deleted file mode 100644 index ae75cfba6c..0000000000 --- a/crates/desktop/artcraft/tauri.artcraft_2d.no_dev.conf.toml +++ /dev/null @@ -1,5 +0,0 @@ -# For some reason, we can't pass json files to the tauri dev command -[build] -frontendDist = "../../../frontend/apps/editor2d/dist" -beforeDevCommand = "echo 'no dev'" -devUrl = "http://localhost:5741" diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml b/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml deleted file mode 100644 index 69ae44539a..0000000000 --- a/crates/desktop/artcraft/tauri.artcraft_3d.conf.toml +++ /dev/null @@ -1,9 +0,0 @@ -# For some reason, we can't pass json files to the tauri dev command -[build] -frontendDist = "../../../frontend/apps/editor3d/dist" -beforeDevCommand = "npx nx run editor3d:dev" -devUrl = "http://localhost:5173" - -[[app.windows]] -decorations = true -title = "ArtCraft" \ No newline at end of file diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json index 2c1bf75efa..fd9005e6bd 100644 --- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json +++ b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json @@ -12,7 +12,7 @@ "resizable": true, "fullscreen": false, "dragDropEnabled": false, - "decorations": false + "decorations": true } ] } diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml deleted file mode 100644 index 0a4aa9e9b2..0000000000 --- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.toml +++ /dev/null @@ -1,10 +0,0 @@ -# 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" -beforeDevCommand = "echo 'no dev'" -devUrl = "http://localhost:5173" - -[[app.windows]] -decorations = true -title = "ArtCraft" diff --git a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json b/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json deleted file mode 100644 index 2c1bf75efa..0000000000 --- a/crates/desktop/artcraft/tauri.artcraft_3d.no_dev_windows.conf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "build": { - "frontendDist": "../../../frontend/apps/editor3d/dist", - "beforeDevCommand": "echo 'no dev'", - "devUrl": "http://localhost:5173", - "beforeBuildCommand": "npx nx run editor3d:build" - }, - "app": { - "windows": [ - { - "title": "ArtCraft", - "resizable": true, - "fullscreen": false, - "dragDropEnabled": false, - "decorations": false - } - ] - } -} diff --git a/crates/desktop/artcraft/tauri2.conf.json b/crates/desktop/artcraft/tauri2.conf.json deleted file mode 100644 index ead7bdabe4..0000000000 --- a/crates/desktop/artcraft/tauri2.conf.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2.0.0-rc", - "productName": "ArtCraft", - "version": "0.0.1", - "identifier": "ai.artcraft.app", - "build": { - "frontendDist": "../../../frontend/apps/editor3d/dist", - "devUrl": "http://localhost:5173", - "beforeDevCommand": "echo", - "beforeBuildCommand": "nx run editor2d:build" - }, - "app": { - "windows": [ - { - "title": "ArtCraft", - "width": 2400, - "height": 1300, - "resizable": true, - "fullscreen": false, - "decorations": 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/script/artcraft/unix_build.sh b/script/artcraft/unix_build.sh index f4bde4f14e..dff5bc3200 100755 --- a/script/artcraft/unix_build.sh +++ b/script/artcraft/unix_build.sh @@ -14,7 +14,7 @@ rust_crate_path="${root_dir}/crates/desktop/artcraft" # it decoheres the and corrupts terminal output, and it's slow. This configuration # allows us to start without it. Simply launch `nx` and the dev server as a separate # process and leave tauri out of the loop -config_path="${rust_crate_path}/tauri.artcraft_3d.no_dev.conf.toml" +config_path="${rust_crate_path}/tauri.artcraft_3d.no_dev.conf.json" pushd "${frontend_path}" || exit diff --git a/script/artcraft/unix_rust_dev.sh b/script/artcraft/unix_rust_dev.sh index 6d1b9c4e8f..c2f5457c24 100755 --- a/script/artcraft/unix_rust_dev.sh +++ b/script/artcraft/unix_rust_dev.sh @@ -19,7 +19,7 @@ sqlite_db_file="/tmp/tasks.sqlite" # it decoheres the and corrupts terminal output, and it's slow. This configuration # allows us to start without it. Simply launch `nx` and the dev server as a separate # process and leave tauri out of the loop -config_path="${rust_crate_path}/tauri.artcraft_3d.no_dev.conf.toml" +config_path="${rust_crate_path}/tauri.artcraft_3d.no_dev.conf.json" export TAURI_FRONTEND_PATH="${frontend_path}" export TAURI_APP_PATH="${rust_crate_path}"