From 0cb594a1eb97efccd88fee85350dee3e9021e89a Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 8 Apr 2025 15:03:12 -0400 Subject: [PATCH] script to launch 2D + tauri on desktop --- frontend/editor2d/package-lock.json | 10 ---------- frontend/editor2d/package.json | 2 +- frontend/editor2d/yarn.lock | 27 ++++++++++++++++----------- script/launch_desktop_2d.sh | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 22 deletions(-) create mode 100755 script/launch_desktop_2d.sh diff --git a/frontend/editor2d/package-lock.json b/frontend/editor2d/package-lock.json index 04afbd280c..efe26d4f6f 100644 --- a/frontend/editor2d/package-lock.json +++ b/frontend/editor2d/package-lock.json @@ -4563,8 +4563,6 @@ }, "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "inBundle": true, "license": "MIT", @@ -5305,8 +5303,6 @@ }, "node_modules/npm/node_modules/cross-spawn/node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "inBundle": true, "license": "ISC", @@ -5355,8 +5351,6 @@ }, "node_modules/npm/node_modules/debug/node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true, "inBundle": true, "license": "MIT" @@ -7183,8 +7177,6 @@ }, "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "inBundle": true, "license": "MIT", @@ -7222,8 +7214,6 @@ }, "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "inBundle": true, "license": "MIT", diff --git a/frontend/editor2d/package.json b/frontend/editor2d/package.json index 97cc0adbd1..b048f23d6a 100644 --- a/frontend/editor2d/package.json +++ b/frontend/editor2d/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "echo 'realtime' && vite", + "dev": "echo 'editor2d' && vite", "build": "tsc -b && vite build", "build2": "vite build", "lint": "eslint .", diff --git a/frontend/editor2d/yarn.lock b/frontend/editor2d/yarn.lock index cb9f80a63c..0ac857a9c5 100644 --- a/frontend/editor2d/yarn.lock +++ b/frontend/editor2d/yarn.lock @@ -756,10 +756,15 @@ resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.19.1.tgz" integrity sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg== -"@rollup/rollup-darwin-arm64@4.24.0": +"@rollup/rollup-linux-x64-gnu@4.24.0": version "4.24.0" - resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz" - integrity sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA== + resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz" + integrity sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A== + +"@rollup/rollup-linux-x64-musl@4.24.0": + version "4.24.0" + resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz" + integrity sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ== "@sigstore/bundle@^2.3.2": version "2.3.2" @@ -831,10 +836,15 @@ resolved "https://registry.npmjs.org/@tauri-apps/api/-/api-2.2.0.tgz" integrity sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg== -"@tauri-apps/cli-darwin-arm64@2.4.0": +"@tauri-apps/cli-linux-x64-gnu@2.4.0": version "2.4.0" - resolved "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.4.0.tgz" - integrity sha512-MVzYrahJBgDyzUJ2gNEU8H+0oCVEucN115+CVorFnidHcJ6DtDRMCaKLkpjOZNfJyag1WQ25fu7imvZSe0mz/g== + resolved "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.4.0.tgz" + integrity sha512-ebRmV2HLIVms1KlNNueQCp3OrXBv6cimU3mYEh5NbZ8dH88f2sF46dFCyPq8Qr/Zti4qPEaAArVG7RYFjfECPw== + +"@tauri-apps/cli-linux-x64-musl@2.4.0": + version "2.4.0" + resolved "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.4.0.tgz" + integrity sha512-FOp2cBFyq5LnUr3he95Z99PQm3nCSJv2GZNeH7UqmUpeHwdcYuhBERU7C+8VDJJPR98Q5fkcoV00Pc4nw0v5KQ== "@tauri-apps/cli@^2.4.0": version "2.4.0" @@ -2103,11 +2113,6 @@ fs-minipass@^3.0.0, fs-minipass@^3.0.3: dependencies: minipass "^7.0.3" -fsevents@~2.3.2, fsevents@~2.3.3: - version "2.3.3" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" diff --git a/script/launch_desktop_2d.sh b/script/launch_desktop_2d.sh new file mode 100755 index 0000000000..5d3aa12905 --- /dev/null +++ b/script/launch_desktop_2d.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +# Tauri doesn't let you configure the frontend project directory statically, though they do provide an +# environment variable to pass it to the CLI. Without doing this, the tauri cli randomly walks the +# filesystem and finds the wrong frontend code. + +# TODO(bt,2025-02-13): This is not the correct way to get the root dir +root_dir=$(pwd) +frontend_path="${root_dir}/frontend/editor2d" + +pushd "${frontend_path}" +npm install +popd + +export TAURI_FRONTEND_PATH="${frontend_path}" +export TAURI_APP_PATH="${root_dir}/crates/desktop/tauri-4o" + +cargo tauri dev --no-watch