diff --git a/io.github.moku_project.Moku.yml b/io.github.moku_project.Moku.yml index b253d33..50bb032 100644 --- a/io.github.moku_project.Moku.yml +++ b/io.github.moku_project.Moku.yml @@ -238,6 +238,7 @@ modules: XDG_DATA_HOME: /run/build/moku/xdg-data TAURI_SKIP_DEVSERVER_CHECK: 'true' PKG_CONFIG_PATH: /usr/lib/pkgconfig:/usr/share/pkgconfig:/app/lib/pkgconfig + TAURI_CONFIG: '{"build":{"devUrl":null,"frontendDist":"../dist"},"app":{"windows":[{"devtools":false}]},"bundle":{"externalBin":[]}}' build-commands: - tar -xzf frontend-dist.tar.gz - . /usr/lib/sdk/rust-stable/enable.sh && PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/app/lib/pkgconfig cargo build --release --manifest-path src-tauri/Cargo.toml @@ -250,8 +251,7 @@ modules: sources: - type: git url: https://github.com/moku-project/Moku.git - tag: v0.10.0 - commit: 5c703bdba5f61cedea90a803a5f533e805070d59 + commit: b170a151f0213d1ade81b7543270fbe46bd2e8c5 - type: file path: packaging/frontend-dist.tar.gz sha256: 676ec2273ffd9a69248849c5d51dc4d59a5d5b68fbba7a4fe7e7b572a5f25f14 diff --git a/packaging/cargo-sources.json b/packaging/cargo-sources.json index 69687c3..8e9e5e9 100644 --- a/packaging/cargo-sources.json +++ b/packaging/cargo-sources.json @@ -4992,40 +4992,40 @@ { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/time/time-0.3.48.crate", - "sha256": "fc1aa89044e7786ffb2ec017acb22cb7de5b0be46d0f21aea2b224b8561e5db2", - "dest": "cargo/vendor/time-0.3.48" + "url": "https://static.crates.io/crates/time/time-0.3.47.crate", + "sha256": "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c", + "dest": "cargo/vendor/time-0.3.47" }, { "type": "inline", - "contents": "{\"package\": \"fc1aa89044e7786ffb2ec017acb22cb7de5b0be46d0f21aea2b224b8561e5db2\", \"files\": {}}", - "dest": "cargo/vendor/time-0.3.48", + "contents": "{\"package\": \"743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c\", \"files\": {}}", + "dest": "cargo/vendor/time-0.3.47", "dest-filename": ".cargo-checksum.json" }, { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/time-core/time-core-0.1.9.crate", - "sha256": "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109", - "dest": "cargo/vendor/time-core-0.1.9" + "url": "https://static.crates.io/crates/time-core/time-core-0.1.8.crate", + "sha256": "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca", + "dest": "cargo/vendor/time-core-0.1.8" }, { "type": "inline", - "contents": "{\"package\": \"9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109\", \"files\": {}}", - "dest": "cargo/vendor/time-core-0.1.9", + "contents": "{\"package\": \"7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca\", \"files\": {}}", + "dest": "cargo/vendor/time-core-0.1.8", "dest-filename": ".cargo-checksum.json" }, { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/time-macros/time-macros-0.2.28.crate", - "sha256": "9d3bfe86347f0cc659f586f01e26303ccd32418f26f30c7b0309b3ca3a07d695", - "dest": "cargo/vendor/time-macros-0.2.28" + "url": "https://static.crates.io/crates/time-macros/time-macros-0.2.27.crate", + "sha256": "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215", + "dest": "cargo/vendor/time-macros-0.2.27" }, { "type": "inline", - "contents": "{\"package\": \"9d3bfe86347f0cc659f586f01e26303ccd32418f26f30c7b0309b3ca3a07d695\", \"files\": {}}", - "dest": "cargo/vendor/time-macros-0.2.28", + "contents": "{\"package\": \"2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215\", \"files\": {}}", + "dest": "cargo/vendor/time-macros-0.2.27", "dest-filename": ".cargo-checksum.json" }, { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c28aa0e..0748fbc 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -4,7 +4,6 @@ "version": "0.10.0", "identifier": "io.github.MokuProject.Moku", "build": { - "devUrl": "http://localhost:1420", "frontendDist": "../dist", "beforeBuildCommand": "pnpm build:static" }, diff --git a/src-tauri/tauri.dev.conf.json b/src-tauri/tauri.dev.conf.json index d6c2f88..09a6e92 100644 --- a/src-tauri/tauri.dev.conf.json +++ b/src-tauri/tauri.dev.conf.json @@ -1,5 +1,6 @@ { "build": { + "devUrl": "http://localhost:1420", "beforeDevCommand": "pnpm dev" }, "app": {