diff --git a/.gitmodules b/.gitmodules index 55b969a2..cf6f511a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src-extensions-wasm"] - path = src-extensions-wasm + path = lib/extensions-wasm url = https://github.com/Moosync/wasm-extension-runner branch = main diff --git a/Trunk.toml b/Trunk.toml index b8dbe1f8..548ee4b9 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -2,7 +2,7 @@ target = "index.html" [watch] -ignore = ["src-tauri", "target", "src-extensions"] +ignore = ["src-tauri", "target", "lib"] [serve] address = "127.0.0.1" diff --git a/buildext.sh b/buildext.sh index 109a7aa3..44fae1ec 100755 --- a/buildext.sh +++ b/buildext.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd src-extensions-wasm -rm -rf ../src-tauri/binaries/exthost-wasm-* +cd lib/extensions-wasm +rm -rf ../../src-tauri/binaries/exthost-wasm-* cargo build --release -mkdir -p ../src-tauri/binaries -cp target/release/wasm-extension-runner ../src-tauri/binaries/exthost-wasm-$(rustc -Vv | grep host | cut -f2 -d' ') +mkdir -p ../../src-tauri/binaries +cp target/release/wasm-extension-runner ../../src-tauri/binaries/exthost-wasm-$(rustc -Vv | grep host | cut -f2 -d' ') diff --git a/src-extensions-wasm b/lib/extensions-wasm similarity index 100% rename from src-extensions-wasm rename to lib/extensions-wasm diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json deleted file mode 100644 index fefb5109..00000000 --- a/src-tauri/tauri.conf.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "app": { - "macOSPrivateApi": false, - "windows": [ - { - "url": "/main/allsongs", - "height": 800, - "width": 1024, - "decorations": true, - "resizable": true - } - ], - "security": { - "assetProtocol": { - "enable": true, - "scope": { - "allow": ["**/*"], - "requireLiteralLeadingDot": false - } - }, - "csp": { - "default-src": "'self' tauri: ipc: http://ipc.localhost asset: http://tauri.localhost http://asset.localhost", - "connect-src": "ipc: http://ipc.localhost tauri: http://tauri.localhost", - "media-src": "'self' blob: asset: https://asset.localhost tauri: http://tauri.localhost ipc: http://ipc.localhost https: http:", - "img-src": "'self' asset: https://asset.localhost https: http:", - "style-src": "'unsafe-inline' 'self' tauri: ipc: http://ipc.localhost asset: http://tauri.localhost http://asset.localhost", - "frame-src": "youtube.com https://www.youtube.com", - "script-src": "'wasm-unsafe-eval' tauri: http://tauri.localhost" - }, - "dangerousDisableAssetCspModification": false, - "freezePrototype": false, - "pattern": { - "use": "brownfield" - } - }, - "withGlobalTauri": true - }, - "build": { - "beforeDevCommand": "trunk serve --config ../Trunk.toml", - "beforeBuildCommand": "trunk build --release --config ../Trunk.toml", - "devUrl": "http://localhost:1420", - "frontendDist": "../dist" - }, - "bundle": { - "active": true, - "createUpdaterArtifacts": true, - "externalBin": ["binaries/exthost-wasm"], - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ], - "linux": { - "deb": { - "desktopTemplate": "./moosync.desktop" - }, - "appimage": { - "bundleMediaFramework": true - } - } - }, - "identifier": "app.moosync.moosync", - "plugins": { - "deep-link": { - "mobile": [ - { "host": "moosync.app", "pathPrefix": ["/youtube", "/spotify"] } - ], - "desktop": { - "schemes": ["moosync"] - } - }, - "updater": { - "active": true, - "endpoints": [ - "https://github.com/Moosync/tauri/releases/latest/download/latest.json" - ], - "dialog": true, - "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQ4MDc4MUJFMTA3QzM2RjYKUldUMk5ud1F2b0VIMkNtSlZMcDhBSWxkVUxCaWNkYUZ6RGRHMC9PSkd1bEdscnhRY3lHNFRTYlEK" - } - }, - "productName": "Moosync", - "version": "0.0.2" -}