minor pathing updates

.github/workflows/tauri-publish-2d.yml

@@ -36,9 +36,19 @@ jobs:
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
         with:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
+          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+        if: matrix.platform == 'macos-latest'
+
+      - name: Install dependencies
+        if: matrix.platform == 'macos-latest'
+        run: |
+          brew install pango
+
       - name: install dependencies (ubuntu only)
         if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
         run: |
@@ -48,13 +58,19 @@ jobs:
         # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
 
       - name: install frontend dependencies
-        run: cd ./crates/desktop/tauri-artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: |
+          cd ./frontend
+          npm add --global nx@latest
+          npm install
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_APP_PATH: ./crates/desktop/tauri-artcraft
+          TAURI_FRONTEND_PATH: ./frontend/apps/editor2d
         with:
           projectPath: ./crates/desktop/tauri-artcraft
+          distPath: ./frontend/apps/editor2d/dist
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'

Cargo.lock

@@ -4005,6 +4005,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
 
+[[package]]
+name = "fix-path-env"
+version = "0.0.0"
+source = "git+https://github.com/tauri-apps/fix-path-env-rs#0e479e2804edc1a7e5f15ece2b48ee30858c2838"
+dependencies = [
+ "home",
+ "strip-ansi-escapes",
+ "thiserror 1.0.63",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -11323,6 +11333,15 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "strip-ansi-escapes"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a8f8038e7e7969abb3f1b7c2a811225e9296da208539e0f79c5251d6cac0025"
+dependencies = [
+ "vte",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -12041,6 +12060,7 @@ dependencies = [
  "dirs 6.0.0",
  "errors",
  "filesys",
+ "fix-path-env",
  "futures 0.3.29",
  "image",
  "libloading 0.8.6",
@@ -13641,6 +13661,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "vte"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "w2l-download-job"
 version = "0.0.1"

crates/desktop/tauri-artcraft/Cargo.toml

@@ -43,6 +43,7 @@ chrono = { workspace = true }
 const_format = "0.2.34"
 directories = "6.0.0"
 dirs = "6.0.0"
+fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
 futures = "0.3"
 image = "0.25.5"
 log = { workspace = true }

crates/desktop/tauri-artcraft/src/main.rs

@@ -2,5 +2,6 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
+  // let _ = fix_path_env::fix();
   tauri_artcraft_app_lib::run();
 }

crates/desktop/tauri-artcraft/tauri.artcraft_2d.conf.toml

@@ -3,3 +3,5 @@
 frontendDist = "../../../frontend/apps/editor2d/dist"
 beforeDevCommand = "nx run editor2d:dev"
 devUrl = "http://localhost:5741"
+[bundle]
+targets = "dmg"

crates/desktop/tauri-artcraft/tauri.conf.json

@@ -6,8 +6,8 @@
   "build": {
     "frontendDist": "../../../frontend/apps/editor2d/dist",
     "devUrl": "http://localhost:5741",
-    "beforeDevCommand": "nx run editor2d:dev",
-    "beforeBuildCommand": "nx run editor2d:build"
+    "beforeDevCommand": "pwd && cd ./../../frontend && nx run editor2d:dev",
+    "beforeBuildCommand": "pwd && cd ./../../frontend && nx run editor2d:build"
   },
   "app": {
     "windows": [