Skip to content

Commit

Permalink
Tauri v2 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
qu1ck committed Oct 25, 2024
1 parent 5c03fb4 commit d81a703
Show file tree
Hide file tree
Showing 22 changed files with 2,506 additions and 1,544 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Transmission v2.40 or later is required.

Prerequisites:
- [Node.js 16](https://nodejs.org/) or later
- [rust 1.70](https://www.rust-lang.org/) or later
- [rust 1.77](https://www.rust-lang.org/) or later
- Geoip lookup database in mmdb format, put it in `src-tauri`
```
wget -nv -O src-tauri/dbip.mmdb "https://github.com/openscopeproject/TrguiNG/releases/latest/download/dbip.mmdb"
Expand Down
10 changes: 7 additions & 3 deletions ci/generate_pkgbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@

VERSION = REF[len("refs/tags/v"):]

with subprocess.Popen(["sha256sum", "dbip.mmdb"], stdout=subprocess.PIPE) as proc:
with subprocess.Popen(
["sha256sum", "dbip.mmdb"],
stdout=subprocess.PIPE) as proc:
DBIP_SHA = proc.stdout.read().decode()[:64]
with subprocess.Popen(["sha256sum", "TrguiNG.desktop"], stdout=subprocess.PIPE) as proc:
with subprocess.Popen(
["sha256sum", "TrguiNG.desktop"],
stdout=subprocess.PIPE) as proc:
DESKTOP_SHA = proc.stdout.read().decode()[:64]


Expand All @@ -30,7 +34,7 @@
arch=('x86_64')
license=('AGPL-3.0')
depends=('alsa-lib' 'cairo' 'desktop-file-utils' 'fontconfig' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'libayatana-appindicator' 'libsoup' 'openssl' 'webkit2gtk')
makedepends=('rust>=1.70.0' 'nodejs>=16.0.0' 'npm' 'git')
makedepends=('rust>=1.77.2' 'nodejs>=16.0.0' 'npm' 'git')
conflicts=('trgui-ng-git' 'trgui-ng-bin')
source=("git+https://github.com/openscopeproject/TrguiNG#tag=v$pkgver"
"https://github.com/openscopeproject/TrguiNG/releases/download/v$pkgver/dbip.mmdb"
Expand Down
295 changes: 196 additions & 99 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"tauri-dev": "tauri dev",
"build": "tauri build",
"build-bin": "tauri build -b none",
"build-bin": "tauri build -b",
"webpack-serve": "webpack serve --config webpack.dev.js",
"webpack-dev": "webpack --config webpack.dev.js",
"webpack-prod": "webpack --config webpack.prod.js",
Expand All @@ -17,7 +17,7 @@
},
"devDependencies": {
"@svgr/webpack": "^8.1.0",
"@tauri-apps/cli": "^1.6.0",
"@tauri-apps/cli": "^2.0.3",
"@types/lodash-es": "^4.17.12",
"@types/luxon": "^3.3.7",
"@types/react": "18.2.42",
Expand Down Expand Up @@ -59,7 +59,13 @@
"@tanstack/react-query-devtools": "^4.36.1",
"@tanstack/react-table": "^8.11.2",
"@tanstack/react-virtual": "^3.0.1",
"@tauri-apps/api": "^1.6.0",
"@tauri-apps/api": "^2.0.0",
"@tauri-apps/plugin-cli": "^2.0.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-dialog": "^2.0.1",
"@tauri-apps/plugin-fs": "^2.0.1",
"@tauri-apps/plugin-notification": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.1",
"@yornaath/batshit": "^0.7.1",
"buffer": "^6.0.3",
"flag-icons": "^6.15.0",
Expand Down
1 change: 1 addition & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Generated by Cargo
# will have compiled files and executables
/gen/
/target/
WixTools
Loading

0 comments on commit d81a703

Please sign in to comment.