From 6076573c989fb627453eb110d4ff5b8a79cc3ff0 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 01:13:17 +0100 Subject: [PATCH 01/12] fix: release to tauri branch --- .releaserc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.releaserc b/.releaserc index 8b38ab71..2d816ed7 100644 --- a/.releaserc +++ b/.releaserc @@ -2,10 +2,7 @@ "branches": [ "master", "main", - { - "name": "feature/tauri", - "prerelease": true - } + "tauri" ], "plugins": [ [ From e8486a5e65d73bcb7bc6044147d4c9e8e7c36923 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 01:14:01 +0100 Subject: [PATCH 02/12] fix: release to tauri branch --- .github/workflows/ci.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98dfca6d..5736987d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,7 @@ on: tags: - "v*" branches: - - feature/tauri + - tauri #- master #- main @@ -34,12 +34,13 @@ jobs: matrix: node-version: [18.x] #, macos-latest - platform: [windows-latest, ubuntu-latest] + #windows-latest, + platform: [ubuntu-latest] include: - os: ubuntu-latest rust_target: x86_64-unknown-linux-gnu - - os: windows-latest - rust_target: x86_64-pc-windows-msvc + #- os: windows-latest + # rust_target: x86_64-pc-windows-msvc #- os: macos-latest # rust_target: x86_64-apple-darwin #- os: macos-latest From 11fcf2e87acfd5e7cc9ac822046d405326b7d41b Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 01:31:38 +0100 Subject: [PATCH 03/12] fix: release to tauri branch --- .releaserc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.releaserc b/.releaserc index 2d816ed7..1544b1ce 100644 --- a/.releaserc +++ b/.releaserc @@ -1,8 +1,11 @@ { "branches": [ - "master", "main", - "tauri" + "master", + { + "name": "tauri", + "prerelease": true + } ], "plugins": [ [ From 0ba5387601ccf883021b18016de270b3be8e57c5 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 01:57:36 +0100 Subject: [PATCH 04/12] fix: release to tauri --- .github/workflows/ci.yaml | 2 +- package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5736987d..cad52ff0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -148,7 +148,7 @@ jobs: run: | sudo apt-get install -y jq chmod +x ./scripts/prepareCMD.sh - semantic-release + semantic-release --branches tauri cleanup: name: Cleanup actions diff --git a/package.json b/package.json index d7bcef1b..6e155b0e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "tauri:dev": "tauri dev", "tauri:build": "tauri build", "tauri:dev:release": "tauri dev --release", - "tauri:build": "tauri build", "tauri:build:dev": "tauri build --debug", "tauri:clean": "cd src-tauri && cargo clean" }, From 9ef599ddc9e7175f35b9aa70c4a5b29210c797d5 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 9 May 2023 03:48:34 +0100 Subject: [PATCH 05/12] fix: fix app not loading on linux builds - update tauri - fix dist directory path BREAKING CHANGES --- .vscode/settings.json | 2 +- package.json | 4 +- pnpm-lock.yaml | 70 +++++++++---------- scripts/setup_tauri_dev_linux.sh | 0 src-tauri/Cargo.lock | 116 +++++++++++++++++++++++-------- src-tauri/Cargo.toml | 19 +++-- src-tauri/tauri.conf.json | 14 ++-- 7 files changed, 145 insertions(+), 80 deletions(-) mode change 100644 => 100755 scripts/setup_tauri_dev_linux.sh diff --git a/.vscode/settings.json b/.vscode/settings.json index 31883407..d274496d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ "editor.codeActionsOnSave": { "source.fixAll": true }, - "cSpell.words": ["clippy", "shakram", "tamasfe"] + "cSpell.words": ["appimage", "clippy", "jsketcher", "shakram", "tamasfe"] } diff --git a/package.json b/package.json index 6e155b0e..dc469dc5 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@babel/preset-react": "^7.18.6", "@babel/preset-stage-2": "^7.8.3", "@babel/preset-typescript": "^7.18.6", - "@tauri-apps/cli": "^1.2.3", + "@tauri-apps/cli": "^1.3.1", "@types/react": "^18.0.26", "@types/react-dom": "^18.0.9", "@typescript-eslint/eslint-plugin": "^5.45.1", @@ -84,7 +84,7 @@ "dependencies": { "@dxfjs/parser": "^0.2.0", "@tarikjabiri/dxf": "^2.6.2", - "@tauri-apps/api": "^1.2.0", + "@tauri-apps/api": "^1.3.0", "@types/three": "^0.146.0", "browser-xml2js": "^0.4.19", "classnames": "^2.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7e2cf610..29842490 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,8 +8,8 @@ dependencies: specifier: ^2.6.2 version: 2.6.2 '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: ^1.3.0 + version: 1.3.0 '@types/three': specifier: ^0.146.0 version: 0.146.0 @@ -124,8 +124,8 @@ devDependencies: specifier: ^7.18.6 version: 7.18.6(@babel/core@7.20.5) '@tauri-apps/cli': - specifier: ^1.2.3 - version: 1.2.3 + specifier: ^1.3.1 + version: 1.3.1 '@types/react': specifier: ^18.0.26 version: 18.0.26 @@ -1770,13 +1770,13 @@ packages: resolution: {integrity: sha512-3xIKsFwwF47kbvGCeNkXP3W1DguDhLn2ExIl83nMTd6QDdbMjE1ezWJbGh3ytVE7ZQ9lUMJ1Az2CnrXgVEqNFA==} dev: false - /@tauri-apps/api@1.2.0: - resolution: {integrity: sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==} + /@tauri-apps/api@1.3.0: + resolution: {integrity: sha512-AH+3FonkKZNtfRtGrObY38PrzEj4d+1emCbwNGu0V2ENbXjlLHMZQlUh+Bhu/CRmjaIwZMGJ3yFvWaZZgTHoog==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@1.2.3: - resolution: {integrity: sha512-phJN3fN8FtZZwqXg08bcxfq1+X1JSDglLvRxOxB7VWPq+O5SuB8uLyssjJsu+PIhyZZnIhTGdjhzLSFhSXfLsw==} + /@tauri-apps/cli-darwin-arm64@1.3.1: + resolution: {integrity: sha512-QlepYVPgOgspcwA/u4kGG4ZUijlXfdRtno00zEy+LxinN/IRXtk+6ErVtsmoLi1ZC9WbuMwzAcsRvqsD+RtNAg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -1784,8 +1784,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-darwin-x64@1.2.3: - resolution: {integrity: sha512-jFZ/y6z8z6v4yliIbXKBXA7BJgtZVMsITmEXSuD6s5+eCOpDhQxbRkr6CA+FFfr+/r96rWSDSgDenDQuSvPAKw==} + /@tauri-apps/cli-darwin-x64@1.3.1: + resolution: {integrity: sha512-fKcAUPVFO3jfDKXCSDGY0MhZFF/wDtx3rgFnogWYu4knk38o9RaqRkvMvqJhLYPuWaEM5h6/z1dRrr9KKCbrVg==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -1793,8 +1793,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@1.2.3: - resolution: {integrity: sha512-C7h5vqAwXzY0kRGSU00Fj8PudiDWFCiQqqUNI1N+fhCILrzWZB9TPBwdx33ZfXKt/U4+emdIoo/N34v3TiAOmQ==} + /@tauri-apps/cli-linux-arm-gnueabihf@1.3.1: + resolution: {integrity: sha512-+4H0dv8ltJHYu/Ma1h9ixUPUWka9EjaYa8nJfiMsdCI4LJLNE6cPveE7RmhZ59v9GW1XB108/k083JUC/OtGvA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -1802,8 +1802,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@1.2.3: - resolution: {integrity: sha512-buf1c8sdkuUzVDkGPQpyUdAIIdn5r0UgXU6+H5fGPq/Xzt5K69JzXaeo6fHsZEZghbV0hOK+taKV4J0m30UUMQ==} + /@tauri-apps/cli-linux-arm64-gnu@1.3.1: + resolution: {integrity: sha512-Pj3odVO1JAxLjYmoXKxcrpj/tPxcA8UP8N06finhNtBtBaxAjrjjxKjO4968KB0BUH7AASIss9EL4Tr0FGnDuw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1811,8 +1811,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@1.2.3: - resolution: {integrity: sha512-x88wPS9W5xAyk392vc4uNHcKBBvCp0wf4H9JFMF9OBwB7vfd59LbQCFcPSu8f0BI7bPrOsyHqspWHuFL8ojQEA==} + /@tauri-apps/cli-linux-arm64-musl@1.3.1: + resolution: {integrity: sha512-tA0JdDLPFaj42UDIVcF2t8V0tSha40rppcmAR/MfQpTCxih6399iMjwihz9kZE1n4b5O4KTq9GliYo50a8zYlQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1820,8 +1820,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@1.2.3: - resolution: {integrity: sha512-ZMz1jxEVe0B4/7NJnlPHmwmSIuwiD6ViXKs8F+OWWz2Y4jn5TGxWKFg7DLx5OwQTRvEIZxxT7lXHi5CuTNAxKg==} + /@tauri-apps/cli-linux-x64-gnu@1.3.1: + resolution: {integrity: sha512-FDU+Mnvk6NLkqQimcNojdKpMN4Y3W51+SQl+NqG9AFCWprCcSg62yRb84751ujZuf2MGT8HQOfmd0i77F4Q3tQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1829,8 +1829,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@1.2.3: - resolution: {integrity: sha512-B/az59EjJhdbZDzawEVox0LQu2ZHCZlk8rJf85AMIktIUoAZPFbwyiUv7/zjzA/sY6Nb58OSJgaPL2/IBy7E0A==} + /@tauri-apps/cli-linux-x64-musl@1.3.1: + resolution: {integrity: sha512-MpO3akXFmK8lZYEbyQRDfhdxz1JkTBhonVuz5rRqxwA7gnGWHa1aF1+/2zsy7ahjB2tQ9x8DDFDMdVE20o9HrA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1838,8 +1838,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@1.2.3: - resolution: {integrity: sha512-ypdO1OdC5ugNJAKO2m3sb1nsd+0TSvMS9Tr5qN/ZSMvtSduaNwrcZ3D7G/iOIanrqu/Nl8t3LYlgPZGBKlw7Ng==} + /@tauri-apps/cli-win32-ia32-msvc@1.3.1: + resolution: {integrity: sha512-9Boeo3K5sOrSBAZBuYyGkpV2RfnGQz3ZhGJt4hE6P+HxRd62lS6+qDKAiw1GmkZ0l1drc2INWrNeT50gwOKwIQ==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -1847,8 +1847,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@1.2.3: - resolution: {integrity: sha512-CsbHQ+XhnV/2csOBBDVfH16cdK00gNyNYUW68isedmqcn8j+s0e9cQ1xXIqi+Hue3awp8g3ImYN5KPepf3UExw==} + /@tauri-apps/cli-win32-x64-msvc@1.3.1: + resolution: {integrity: sha512-wMrTo91hUu5CdpbElrOmcZEoJR4aooTG+fbtcc87SMyPGQy1Ux62b+ZdwLvL1sVTxnIm//7v6QLRIWGiUjCPwA==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1856,20 +1856,20 @@ packages: dev: true optional: true - /@tauri-apps/cli@1.2.3: - resolution: {integrity: sha512-erxtXuPhMEGJPBtnhPILD4AjuT81GZsraqpFvXAmEJZ2p8P6t7MVBifCL8LznRknznM3jn90D3M8RNBP3wcXTw==} + /@tauri-apps/cli@1.3.1: + resolution: {integrity: sha512-o4I0JujdITsVRm3/0spfJX7FcKYrYV1DXJqzlWIn6IY25/RltjU6qbC1TPgVww3RsRX63jyVUTcWpj5wwFl+EQ==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.2.3 - '@tauri-apps/cli-darwin-x64': 1.2.3 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.2.3 - '@tauri-apps/cli-linux-arm64-gnu': 1.2.3 - '@tauri-apps/cli-linux-arm64-musl': 1.2.3 - '@tauri-apps/cli-linux-x64-gnu': 1.2.3 - '@tauri-apps/cli-linux-x64-musl': 1.2.3 - '@tauri-apps/cli-win32-ia32-msvc': 1.2.3 - '@tauri-apps/cli-win32-x64-msvc': 1.2.3 + '@tauri-apps/cli-darwin-arm64': 1.3.1 + '@tauri-apps/cli-darwin-x64': 1.3.1 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.3.1 + '@tauri-apps/cli-linux-arm64-gnu': 1.3.1 + '@tauri-apps/cli-linux-arm64-musl': 1.3.1 + '@tauri-apps/cli-linux-x64-gnu': 1.3.1 + '@tauri-apps/cli-linux-x64-musl': 1.3.1 + '@tauri-apps/cli-win32-ia32-msvc': 1.3.1 + '@tauri-apps/cli-win32-x64-msvc': 1.3.1 dev: true /@types/body-parser@1.19.2: diff --git a/scripts/setup_tauri_dev_linux.sh b/scripts/setup_tauri_dev_linux.sh old mode 100644 new mode 100755 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 53c948ca..70ed3876 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -87,7 +87,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -205,7 +205,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -623,6 +623,19 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "embed-resource" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" +dependencies = [ + "cc", + "rustc_version", + "toml 0.7.3", + "vswhom", + "winreg", +] + [[package]] name = "embed_plist" version = "1.2.2" @@ -860,7 +873,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -877,7 +890,21 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.5", + "system-deps 6.1.0", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.1.0", ] [[package]] @@ -889,7 +916,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "x11", ] @@ -964,7 +991,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "winapi", ] @@ -1010,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -1040,7 +1067,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -1081,7 +1108,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -1388,9 +1415,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "line-wrap" @@ -1701,7 +1728,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -1948,9 +1975,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -2205,18 +2232,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", @@ -2473,9 +2500,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr 0.15.1", "heck 0.4.1", @@ -2486,9 +2513,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704522803dda895767f69198af8351b0a3f4fe2e293c3ca54cce0ecba05a97f2" +checksum = "dd3cde9c0cd2b872616bba26b818e0d6469330196869d7e5000dba96ce9431df" dependencies = [ "bitflags", "cairo-rs", @@ -2501,6 +2528,7 @@ dependencies = [ "gdk", "gdk-pixbuf", "gdk-sys", + "gdkwayland-sys", "gdkx11-sys", "gio", "glib", @@ -2731,12 +2759,12 @@ dependencies = [ [[package]] name = "tauri-winres" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7a78dc04f75fb5ab815e66ac561c81e92a968a40f29e7c21afd152d694fad8" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ - "toml 0.5.11", - "version_check", + "embed-resource", + "toml 0.7.3", ] [[package]] @@ -3052,6 +3080,26 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "walkdir" version = "2.3.3" @@ -3172,7 +3220,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -3470,11 +3518,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "wry" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c846dc4dda988e959869dd0802cd27417c9696e584593e49178aeee28890d25" +checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" dependencies = [ "base64 0.13.1", "block", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c04bc150..d38570ed 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" description = "A Tauri App" authors = ["autodrop3d, xibyte"] license = "LICENSE" -repository = "https://github.com/Xibyte/jsketcher" +repository = "https://github.com/xibyte/jsketcher" default-run = "app" edition = "2021" -rust-version = "1.69" +rust-version = "1.64" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,7 +22,18 @@ tauri = { version = "1.3.0", features = [] } [features] # by default Tauri runs in production mode # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = [ "custom-protocol" ] +default = ["custom-protocol"] # this feature is used for production builds where `devPath` points to the filesystem # DO NOT remove this -custom-protocol = [ "tauri/custom-protocol" ] +custom-protocol = ["tauri/custom-protocol"] + +[profile] +[profile.dev] +debug = 0 + +[profile.release] +panic = "abort" +codegen-units = 1 +lto = true +opt-level = "s" +#strip = true \ No newline at end of file diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3e27f80d..0ff29177 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -4,7 +4,7 @@ "beforeBuildCommand": "pnpm build", "beforeDevCommand": "pnpm start", "devPath": "http://localhost:3000", - "distDir": "../build" + "distDir": "../dist" }, "package": { "productName": "jsketcher", @@ -21,18 +21,14 @@ "deb": { "depends": [] }, + "appimage": { + "bundleMediaFramework": true + }, "externalBin": [], - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" - ], + "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"], "identifier": "com.jsketcher.dev", "longDescription": "", "macOS": { - "entitlements": null, "exceptionDomain": "", "frameworks": [], From b00299d5c1b1e199c1c0ca0dac49d42e204c5b29 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 03:49:04 +0100 Subject: [PATCH 06/12] fix: update readme --- .vscode/settings.json | 2 +- README.md | 142 ++++++++++++++++++++++++++---------------- 2 files changed, 89 insertions(+), 55 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 31883407..a3adb9cf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ "editor.codeActionsOnSave": { "source.fixAll": true }, - "cSpell.words": ["clippy", "shakram", "tamasfe"] + "cSpell.words": ["BREP", "clippy", "jsketcher", "shakram", "tamasfe", "xibyte"] } diff --git a/README.md b/README.md index 68ef1981..80a23fd7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ -JSketcher +# JSketcher + =========== ![JSketcher Logo](./web/img/JSketcher-logo.svg) -JSketcher is a **parametric** 2D and 3D CAD modeler written for the web. +JSketcher is a **parametric** 2D and 3D CAD modeler written for the web. Sketch solver is completely implemented in javascript/typescript. @@ -20,86 +21,119 @@ Sketch solver is completely implemented in javascript/typescript. [Workbench Dev Guide](./dev-guide/index.md) -[Comercial Licencing](https://www.autodrop3d.com/parametric-cad-beta.html) +[Commercial Licensing](https://www.autodrop3d.com/parametric-cad-beta.html) Please consider supporting this project by becoming a backer + ============== -Current Status +## Current Status + ============== -JSketcher is a parametric 3d modeler employing a 2D constraint solver for sketches and the feature/history metaphor to build models. The 2D constraint solver is completely written in javascript/typescript and is implemented in both the 3D CAD and the 2D sketcher. Originally developed by xibyte to make models for 3d printing. Today JSketcher provides a rich set of tools for visualizing, selecting/interacting with 3D geometry, tracking and storing model history all built on the foundation of the 2D sketcher engine and employing a custom wasm build of the OpenCascade kernel (https://github.com/Autodrop3d/occt-interpreter) for solid modeling operations. +`JSketcher` is a _parametric_ 3d modeler employing a 2D constraint solver for sketches and the feature/history metaphor to build models. The 2D constraint solver is completely written in javascript/typescript and is implemented in both the 3D CAD and the 2D sketcher. Originally developed by [`xibyte`](https://github.com/xibyte) to make models for 3d printing. Today `JSketcher` provides a rich set of tools for visualizing, selecting/interacting with 3D geometry, tracking and storing model history all built on the foundation of the 2D sketcher engine and employing a custom wasm build of the [OpenCascade kernel](https://github.com/Autodrop3d/occt-interpreter) for solid modeling operations. +## Major Components and features -Major Components and features ============== -* Geometric Constraint Solver. This is a most crucial component which allows to solve a system of geometric constraints applied to a sketch. - See below the list of supported constraints. -* 2D Sketcher. Allows to design 2d sketches applying geometric constraints. Uses HTML5 canvas for rendering. -* 3D Boolean engine. OpenCascade is used to perform booleans on BREP objects. -* Feature History. Accumulates features builds a 3d model step by step. A compare step is employed to propagate edge/face IDs forward to provide a stable and robust model. -* Export to **STL**, **DWG** and **SVG** formats -* Saving projects in the browser locale storage -* Repository of dimensions. For example if there is a line length constraint applied, it's not necessary to hardcode some length value. - A dimension with a symbolic name can be created and the constraint can refer to that dimension by name. - Once value of dimension gets changed the sketch is resolved again accordingly to the new dimension values. -* 2D measurement tool. Allows adding dimensions on a 2D drawing(Linear, Vertical, Horizontal and Arc/Circle dimension are supported) -* No any server-side needed. Only client side Javascript and wasm. + +- Geometric Constraint Solver. This is a most crucial component which allows to solve a system of geometric constraints applied to a sketch. + +> See below the list of supported constraints. + +- 2D Sketcher. Allows to design 2d sketches applying geometric constraints. Uses HTML5 canvas for rendering. +- 3D Boolean engine. OpenCascade is used to perform booleans on `BREP` objects. +- Feature History. Accumulates features builds a 3d model step by step. A compare step is employed to propagate edge/face IDs forward to provide a stable and robust model. +- Export to **STL**, **DWG** and **SVG** formats +- Saving projects in the browser locale storage +- Repository of dimensions. For example if there is a line length constraint applied, it's not necessary to hardcode some length value. + +> **Note**: A dimension with a symbolic name can be created and the constraint can refer to that dimension by name. Once value of dimension gets changed the sketch is resolved again accordingly to the new dimension values. + +- 2D measurement tool. Allows adding dimensions on a 2D drawing(Linear, Vertical, Horizontal and Arc/Circle dimension are supported) +- No any server-side needed. Only client side Javascript and wasm. This modeler is already used for: -* Designing of 3d models to get them 3d-printed. 3D models are based on parametric 2d sketches. All models can be exported as an STL file and 3d-printed after. -* Creating of 2d parametric sketches which could be exported to DWG or SVG format. +- Designing of 3d models to get them 3d-printed. 3D models are based on parametric `2D` sketches. All models can be exported as an STL file and 3d-printed after. +- Creating of 2d parametric sketches which could be exported to DWG or SVG format. + +## Supported Constraints -Supported Constraints ===================== -* Coincident -* Vertical -* Horizontal -* Parallel -* Perpendicular -* Point to Line Distance -* Point to Object Distance -* Entity Equality(radius/length) -* Tangent -* Radius -* Point On Line -* Point On Arc / Ellipse -* Point In Middle -* Angle -* Symmetry -* Lock Convexity -* Fillet Meta Constraint - -Get Started With the Code +- Coincident +- Vertical +- Horizontal +- Parallel +- Perpendicular +- Point to Line Distance +- Point to Object Distance +- Entity Equality(radius/length) +- Tangent +- Radius +- Point On Line +- Point On Arc / Ellipse +- Point In Middle +- Angle +- Symmetry +- Lock Convexity +- Fillet Meta Constraint + +## Get Started With the Code + ========================= -Install node.js +### Install node.js and packages + +For this step, you can use any package manager you like. + +We recommend using `pnpm` + +```bash +npm install -g pnpm ``` -npm install -npm start + +```bash +pnpm install +pnpm start ``` -Goto http://localhost:3000 using your browser. Tested on google chrome but known to work in firefox and edge. +Navigate `http://localhost:3000` using your browser. Tested on google chrome but known to work in firefox and edge. + +Generate `Tauri` Build for desktop -Generate Electron Build for desktop ========================= + + +### Install Tauri Deps + +Navigate to the [scripts](./scripts/) folder and run the following command: + +```bash +chmod +x ./setup_tauri.sh ``` -npm run electron:package:linux -npm run electron:package:win -npm run electron:package:mac + + +### Build for Desktop + +```bash +pnpm tauri build ``` -The resulting binary will be placed in the dist folder that is generated. +The resulting binary will be placed in the dist folder that is generated. -Note: -Build targeting windows from linux requires wine to be installed. +> **Note**: Build targeting windows from linux requires wine to be installed. + +Linux build produces app image and deb for installation. +To use the app image you must do a `chmod`: + +```bash +chmod +x jsketcher-*.*.*.AppImage +``` -Linux build produces app image and deb for installation. -To use the app image you must do a 'chmod +x jsketcher-*.*.*.AppImage' +Contributing Please see [.github/CONTRIBUTING.md](.github/CONTRIBUTING.md ) -Contributing Please see [.github/CONTRIBUTING.md ](.github/CONTRIBUTING.md ) ========================= From 3edb4cf63516fe70f6cf2175c194bfaa03f25a6e Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 9 May 2023 04:09:45 +0100 Subject: [PATCH 07/12] fix: semantic-release --- .github/workflows/ci.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cad52ff0..d76c7d27 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,8 +2,6 @@ name: Produce Desktop Binary Builds on: workflow_dispatch: push: - tags: - - "v*" branches: - tauri #- master @@ -148,7 +146,7 @@ jobs: run: | sudo apt-get install -y jq chmod +x ./scripts/prepareCMD.sh - semantic-release --branches tauri + semantic-release cleanup: name: Cleanup actions From 6964dd9d6dbff7b6adade3cf826c83d6e47bb992 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 11:34:28 +0100 Subject: [PATCH 08/12] Update .releaserc --- .releaserc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.releaserc b/.releaserc index 1544b1ce..36a8181d 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,6 @@ { "branches": [ - "main", - "master", + "release", { "name": "tauri", "prerelease": true From d8dda145749fb340171c8a236cf881e39b5e346f Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 11:50:36 +0100 Subject: [PATCH 09/12] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d76c7d27..5f0d64a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -134,7 +134,7 @@ jobs: with: node-version: 18 - run: npm install -g conventional-changelog-conventionalcommits - - run: npm install -g semantic-release@v19.0.5 + - run: npm install -g semantic-release@v21.0.2 - run: npm install -g @semantic-release/exec - run: npm install -g @semantic-release/git - run: npm install -g @semantic-release/release-notes-generator From 3343d2cb4aed2facf5dbe14f4c8f8fca54e19c8c Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 11:53:00 +0100 Subject: [PATCH 10/12] fix: Update .releaserc --- .releaserc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 36a8181d..d741a0ff 100644 --- a/.releaserc +++ b/.releaserc @@ -1,9 +1,15 @@ { "branches": [ - "release", + "main", + "master", + "release", { "name": "tauri", "prerelease": true + }, + { + "name": "feature/tauri", + "prelease": true } ], "plugins": [ From dd099b8ad8df081254f005ade8eaeef8978c215f Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Tue, 9 May 2023 11:54:00 +0100 Subject: [PATCH 11/12] fix: remove repo from package.json --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index dc469dc5..c9b1c1c5 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,6 @@ "tauri:build:dev": "tauri build --debug", "tauri:clean": "cd src-tauri && cargo clean" }, - "repository": { - "type": "git", - "url": "https://github.com/xibyte/jsketcher.git" - }, "keywords": [ "parametric", "cad" From 6a4f4949e9d173916da8363c28d64751fd73dfce Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 9 May 2023 11:04:23 +0000 Subject: [PATCH 12/12] chore(major): 1.0.0-tauri.1 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 1.0.0-tauri.1 (2023-05-09) ### ⚠ BREAKING CHANGES * CHANGES ### 🍕 Features * add setup scripts for setting up tauri dev environment ([0c41a33](https://github.com/ZanzyTHEbar/jsketcher/commit/0c41a33d0e9dee8ecd645d04e9eb551980680941)) * **dxf:** add support for dimensions in dxf. ([56c884c](https://github.com/ZanzyTHEbar/jsketcher/commit/56c884ccfd551e0b2dcbee0fc0a0eff62fb6a338)) * add support for dxf blocks ([#200](https://github.com/ZanzyTHEbar/jsketcher/issues/200)) ([322d47f](https://github.com/ZanzyTHEbar/jsketcher/commit/322d47f80255d01b8bfcbaa110f0e790e91fa0d1)) * add support for dxf files import ([2fa2866](https://github.com/ZanzyTHEbar/jsketcher/commit/2fa2866296068bb785f3adeb6e18afe19a698100)) * finish up CI system ([5a688d1](https://github.com/ZanzyTHEbar/jsketcher/commit/5a688d1a9eec64d210ea140c9f9584fb4079a245)) * initial cir release ([2f94a6e](https://github.com/ZanzyTHEbar/jsketcher/commit/2f94a6eb82c91757d5e4b21ae4956dda3aadddfc)) * initial tauri commit ([0a0bb54](https://github.com/ZanzyTHEbar/jsketcher/commit/0a0bb5485e8f8d513115f210c57074d0e3e1c93e)) * update tauri version ([90168da](https://github.com/ZanzyTHEbar/jsketcher/commit/90168da42c37424180dece3c62acc2ca5f83dd50)) ### 🐛 Bug Fixes * .releasesrc file not having a main branch ([04f2e2c](https://github.com/ZanzyTHEbar/jsketcher/commit/04f2e2c6b77ee76bb14a584e7c7b273d5a0f5884)) * .releasesrc file not having a main branch ([25ae8a4](https://github.com/ZanzyTHEbar/jsketcher/commit/25ae8a464b90535596827ca023af93bb2fb64a0a)) * **dxf:** add dimLayers to the export. ([#183](https://github.com/ZanzyTHEbar/jsketcher/issues/183)) ([a3349b5](https://github.com/ZanzyTHEbar/jsketcher/commit/a3349b5da4c61de42ccebac76978da10c9e2d8f3)) * fix app not loading on linux builds ([9ef599d](https://github.com/ZanzyTHEbar/jsketcher/commit/9ef599ddc9e7175f35b9aa70c4a5b29210c797d5)) * fix release asset types ([8f73410](https://github.com/ZanzyTHEbar/jsketcher/commit/8f73410c7434d7c055fb405fcf11b99adf033db2)) * release to tauri ([0ba5387](https://github.com/ZanzyTHEbar/jsketcher/commit/0ba5387601ccf883021b18016de270b3be8e57c5)) * release to tauri branch ([11fcf2e](https://github.com/ZanzyTHEbar/jsketcher/commit/11fcf2e87acfd5e7cc9ac822046d405326b7d41b)) * release to tauri branch ([e8486a5](https://github.com/ZanzyTHEbar/jsketcher/commit/e8486a5e65d73bcb7bc6044147d4c9e8e7c36923)) * release to tauri branch ([6076573](https://github.com/ZanzyTHEbar/jsketcher/commit/6076573c989fb627453eb110d4ff5b8a79cc3ff0)) * remove caching of pnpm in ci ([96165f3](https://github.com/ZanzyTHEbar/jsketcher/commit/96165f3e1e24ef90cfc1c131ab681313f94b6d89)) * remove old path ([f0b426c](https://github.com/ZanzyTHEbar/jsketcher/commit/f0b426c14fecae1d09e06039ce273789693742ee)) * remove repo from package.json ([dd099b8](https://github.com/ZanzyTHEbar/jsketcher/commit/dd099b8ad8df081254f005ade8eaeef8978c215f)) * script for linux ([46bda82](https://github.com/ZanzyTHEbar/jsketcher/commit/46bda827261d9d17d0c09acbb7ec98972c8c5d8a)) * semantic-release ([3edb4cf](https://github.com/ZanzyTHEbar/jsketcher/commit/3edb4cf63516fe70f6cf2175c194bfaa03f25a6e)) * Update .releaserc ([3343d2c](https://github.com/ZanzyTHEbar/jsketcher/commit/3343d2cb4aed2facf5dbe14f4c8f8fca54e19c8c)) * update readme ([b00299d](https://github.com/ZanzyTHEbar/jsketcher/commit/b00299d5c1b1e199c1c0ca0dac49d42e204c5b29)) * windows failing to build ([def0782](https://github.com/ZanzyTHEbar/jsketcher/commit/def0782b76181ed7fbb662805d54abc703cb35c3)) --- CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++++++++ package.json | 2 +- src-tauri/Cargo.toml | 24 +++++++++++----------- src-tauri/tauri.conf.json | 10 +++++++-- 4 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..3953c53f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,43 @@ +# 📦 Changelog +[![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) +[![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) +> All notable changes to this project will be documented in this file + +## 1.0.0-tauri.1 (2023-05-09) + + +### ⚠ BREAKING CHANGES + +* CHANGES + +### 🍕 Features + +* add setup scripts for setting up tauri dev environment ([0c41a33](https://github.com/ZanzyTHEbar/jsketcher/commit/0c41a33d0e9dee8ecd645d04e9eb551980680941)) +* **dxf:** add support for dimensions in dxf. ([56c884c](https://github.com/ZanzyTHEbar/jsketcher/commit/56c884ccfd551e0b2dcbee0fc0a0eff62fb6a338)) +* add support for dxf blocks ([#200](https://github.com/ZanzyTHEbar/jsketcher/issues/200)) ([322d47f](https://github.com/ZanzyTHEbar/jsketcher/commit/322d47f80255d01b8bfcbaa110f0e790e91fa0d1)) +* add support for dxf files import ([2fa2866](https://github.com/ZanzyTHEbar/jsketcher/commit/2fa2866296068bb785f3adeb6e18afe19a698100)) +* finish up CI system ([5a688d1](https://github.com/ZanzyTHEbar/jsketcher/commit/5a688d1a9eec64d210ea140c9f9584fb4079a245)) +* initial cir release ([2f94a6e](https://github.com/ZanzyTHEbar/jsketcher/commit/2f94a6eb82c91757d5e4b21ae4956dda3aadddfc)) +* initial tauri commit ([0a0bb54](https://github.com/ZanzyTHEbar/jsketcher/commit/0a0bb5485e8f8d513115f210c57074d0e3e1c93e)) +* update tauri version ([90168da](https://github.com/ZanzyTHEbar/jsketcher/commit/90168da42c37424180dece3c62acc2ca5f83dd50)) + + +### 🐛 Bug Fixes + +* .releasesrc file not having a main branch ([04f2e2c](https://github.com/ZanzyTHEbar/jsketcher/commit/04f2e2c6b77ee76bb14a584e7c7b273d5a0f5884)) +* .releasesrc file not having a main branch ([25ae8a4](https://github.com/ZanzyTHEbar/jsketcher/commit/25ae8a464b90535596827ca023af93bb2fb64a0a)) +* **dxf:** add dimLayers to the export. ([#183](https://github.com/ZanzyTHEbar/jsketcher/issues/183)) ([a3349b5](https://github.com/ZanzyTHEbar/jsketcher/commit/a3349b5da4c61de42ccebac76978da10c9e2d8f3)) +* fix app not loading on linux builds ([9ef599d](https://github.com/ZanzyTHEbar/jsketcher/commit/9ef599ddc9e7175f35b9aa70c4a5b29210c797d5)) +* fix release asset types ([8f73410](https://github.com/ZanzyTHEbar/jsketcher/commit/8f73410c7434d7c055fb405fcf11b99adf033db2)) +* release to tauri ([0ba5387](https://github.com/ZanzyTHEbar/jsketcher/commit/0ba5387601ccf883021b18016de270b3be8e57c5)) +* release to tauri branch ([11fcf2e](https://github.com/ZanzyTHEbar/jsketcher/commit/11fcf2e87acfd5e7cc9ac822046d405326b7d41b)) +* release to tauri branch ([e8486a5](https://github.com/ZanzyTHEbar/jsketcher/commit/e8486a5e65d73bcb7bc6044147d4c9e8e7c36923)) +* release to tauri branch ([6076573](https://github.com/ZanzyTHEbar/jsketcher/commit/6076573c989fb627453eb110d4ff5b8a79cc3ff0)) +* remove caching of pnpm in ci ([96165f3](https://github.com/ZanzyTHEbar/jsketcher/commit/96165f3e1e24ef90cfc1c131ab681313f94b6d89)) +* remove old path ([f0b426c](https://github.com/ZanzyTHEbar/jsketcher/commit/f0b426c14fecae1d09e06039ce273789693742ee)) +* remove repo from package.json ([dd099b8](https://github.com/ZanzyTHEbar/jsketcher/commit/dd099b8ad8df081254f005ade8eaeef8978c215f)) +* script for linux ([46bda82](https://github.com/ZanzyTHEbar/jsketcher/commit/46bda827261d9d17d0c09acbb7ec98972c8c5d8a)) +* semantic-release ([3edb4cf](https://github.com/ZanzyTHEbar/jsketcher/commit/3edb4cf63516fe70f6cf2175c194bfaa03f25a6e)) +* Update .releaserc ([3343d2c](https://github.com/ZanzyTHEbar/jsketcher/commit/3343d2cb4aed2facf5dbe14f4c8f8fca54e19c8c)) +* update readme ([b00299d](https://github.com/ZanzyTHEbar/jsketcher/commit/b00299d5c1b1e199c1c0ca0dac49d42e204c5b29)) +* windows failing to build ([def0782](https://github.com/ZanzyTHEbar/jsketcher/commit/def0782b76181ed7fbb662805d54abc703cb35c3)) diff --git a/package.json b/package.json index c9b1c1c5..9f72a2c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jsketcher", - "version": "0.1.0", + "version": "1.0.0", "private": true, "description": "JS.Sketcher is a parametric 2D and 3D CAD modeler written in pure javascript", "scripts": { diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d38570ed..b0c4ecb5 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "0.1.0" +version = "1.0.0" description = "A Tauri App" authors = ["autodrop3d, xibyte"] license = "LICENSE" @@ -9,22 +9,23 @@ default-run = "app" edition = "2021" rust-version = "1.64" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[build-dependencies] -tauri-build = { version = "1.3.0", features = [] } +[build-dependencies.tauri-build] +version = "1.3.0" +features = [] [dependencies] serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.3.0", features = [] } + +[dependencies.serde] +version = "1.0" +features = ["derive"] + +[dependencies.tauri] +version = "1.3.0" +features = [] [features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL default = ["custom-protocol"] -# this feature is used for production builds where `devPath` points to the filesystem -# DO NOT remove this custom-protocol = ["tauri/custom-protocol"] [profile] @@ -36,4 +37,3 @@ panic = "abort" codegen-units = 1 lto = true opt-level = "s" -#strip = true \ No newline at end of file diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 0ff29177..33be1ef3 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "jsketcher", - "version": "0.1.0" + "version": "1.0.0" }, "tauri": { "allowlist": { @@ -25,7 +25,13 @@ "bundleMediaFramework": true }, "externalBin": [], - "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], "identifier": "com.jsketcher.dev", "longDescription": "", "macOS": {