Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: Tauri 2.0 #1054

Draft
wants to merge 77 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
f1dee71
dev: Replace with sample Tauri 2.0 project
GeckoEidechse Dec 22, 2024
a1da748
refactor: Restructure UI logic folder structure to match main branch
GeckoEidechse Dec 22, 2024
04240e4
chore: Gitignore Vue project related code only in that specific subfo…
GeckoEidechse Dec 22, 2024
68eae7b
refactor: Re-order some entries in tauri.conf.json
GeckoEidechse Dec 22, 2024
bd52d5c
build: Keep debug symbols in release code
GeckoEidechse Dec 22, 2024
395d64f
build: Match npm package versions closer to main branch
GeckoEidechse Dec 22, 2024
e43e9fe
refactor: Adjust tsconfig file to match structure of main branch more…
GeckoEidechse Dec 23, 2024
2cc0579
refactor: Match index.html from main branch
GeckoEidechse Dec 23, 2024
7f2d69c
docs: Add README from main branch
GeckoEidechse Dec 23, 2024
1d9b213
build: Add same packages as from main branch
GeckoEidechse Dec 23, 2024
6d48542
chore: Remove leftover SVG
GeckoEidechse Dec 23, 2024
0474130
test: Update Python script for comparing version numbers
GeckoEidechse Dec 23, 2024
e0004b6
Merge branch 'main' into dev/tauri-2
GeckoEidechse Dec 23, 2024
f6e9ef4
ci: Update list of dependencies to install
GeckoEidechse Dec 23, 2024
a8f8b5e
feat: Replace icons with FlightCore ones
GeckoEidechse Dec 23, 2024
8a62de5
ci: Auto-accept installing dependencies
GeckoEidechse Dec 23, 2024
d039cd3
build: Add TS-RS bindings
GeckoEidechse Dec 23, 2024
770998b
build: Add language files
GeckoEidechse Dec 23, 2024
f44d60e
ci: Bump node version to 18
GeckoEidechse Dec 23, 2024
2332daf
fix: Restore asset files from main branch
GeckoEidechse Dec 23, 2024
e809f17
feat: Copy over CSS and some structure from App.vue from main branch
GeckoEidechse Dec 23, 2024
b312976
feat: Copy over more structure from main branch
GeckoEidechse Dec 23, 2024
9df8fb8
feat: Copy over more structure from main branch
GeckoEidechse Dec 23, 2024
99796a9
feat: Restore style.css from main branch
GeckoEidechse Dec 23, 2024
ff33baf
Restore more logic from main branch
GeckoEidechse Dec 23, 2024
ff23045
Restore more logic from main branch
GeckoEidechse Dec 23, 2024
9d308d5
Restore more logic from main branch
GeckoEidechse Dec 23, 2024
33834f4
Restore more files from main branch
GeckoEidechse Dec 23, 2024
65708d1
Restore more files from main branch
GeckoEidechse Dec 23, 2024
f6086b5
Restore more logic from main branch
GeckoEidechse Dec 23, 2024
e30a7f7
feat: Re-enable window minimising
GeckoEidechse Jan 2, 2025
189808f
fix: Remove leftover sample code
GeckoEidechse Jan 2, 2025
7b20e9f
feat: Add dev view to router
GeckoEidechse Jan 2, 2025
2bc53be
feat: Add router view
GeckoEidechse Jan 2, 2025
ad1db38
feat: Allow window drag
GeckoEidechse Jan 2, 2025
b28ddbb
feat: Hide titlebar
GeckoEidechse Jan 2, 2025
9566c60
feat: Add store capabilities and dependencies
GeckoEidechse Jan 2, 2025
8920ef2
feat: Partially re-implement DevView
GeckoEidechse Jan 2, 2025
ecab8ce
feat: Implement checking if debug mode
GeckoEidechse Jan 2, 2025
564649d
feat: Implement checking FlightCore outdated
GeckoEidechse Jan 2, 2025
9d8e16a
feat: Implement getting flightcore version number
GeckoEidechse Jan 2, 2025
1181c3e
feat: Implement finding game location
GeckoEidechse Jan 2, 2025
4e9a39b
feat: Implement verify_install_location
GeckoEidechse Jan 2, 2025
6a87dda
feat: Implement get_server_player_count
GeckoEidechse Jan 2, 2025
30e5291
fix: Actually use the store
GeckoEidechse Jan 3, 2025
5374d11
feat: Re-implement pull request selector
GeckoEidechse Jan 3, 2025
71469f4
feat: Re-implement store
GeckoEidechse Jan 3, 2025
a6aac04
feat: Partially re-implement PlayView
GeckoEidechse Jan 3, 2025
29984f8
feat: Re-implement pull request frontend logic
GeckoEidechse Jan 3, 2025
154a61a
feat: Re-implement search logic
GeckoEidechse Jan 3, 2025
3f8eb34
feat: Re-implement LanguageSelector
GeckoEidechse Jan 3, 2025
536a27c
fix: Store location name
GeckoEidechse Jan 3, 2025
3248a46
feat: Re-implement SettingsView
GeckoEidechse Jan 3, 2025
d7081e4
feat: Finish PlayView implementation
GeckoEidechse Jan 3, 2025
41c389a
feat: Re-implement changelog view and changelog fetching
GeckoEidechse Jan 3, 2025
99d471a
feat: Finish App.vue implementation
GeckoEidechse Jan 3, 2025
6b2ae53
feat: Finish DevView frontend logic
GeckoEidechse Jan 3, 2025
5e2959e
feat: Re-implement backend logic panic button
GeckoEidechse Jan 3, 2025
d8c220f
feat: Re-implement opening repair window
GeckoEidechse Jan 3, 2025
7ae9254
feat: Re-implement majority of backend
GeckoEidechse Jan 3, 2025
8cfad71
feat: Re-implement some missing fetching functions
GeckoEidechse Jan 4, 2025
5cab6b3
feat: Migrate emit function to Tauri v2 and re-implement Northstar in…
GeckoEidechse Jan 4, 2025
36912d1
fix: Disable plugin installation for now
GeckoEidechse Jan 5, 2025
beb0b68
feat: Add missing tauri functions to handler
GeckoEidechse Jan 5, 2025
fa39b79
fix: Remove sample greet function
GeckoEidechse Jan 5, 2025
aba764d
style: Autoformat
GeckoEidechse Jan 5, 2025
85dbde2
ci: Temp disable updater disabling step
GeckoEidechse Jan 5, 2025
27ae4c2
feat: Set up logger
GeckoEidechse Jan 5, 2025
3dd029c
feat: Re-add sentry
GeckoEidechse Jan 5, 2025
fa82013
feat: Log error if launching FlightCore fails
GeckoEidechse Jan 5, 2025
513f5fb
feat: Re-add vuex-shim.d.ts
GeckoEidechse Jan 5, 2025
5614a73
feat: Add entry for translation key
GeckoEidechse Jan 5, 2025
7407651
feat: Re-implement passing playercount etc to frontend
GeckoEidechse Jan 5, 2025
11fcace
Merge branch 'main' into dev/tauri-2
GeckoEidechse Jan 5, 2025
b86c7b2
style: remove unused parameters
Alystrasz Jan 5, 2025
5b29ade
build: update TypeScript configuration file
Alystrasz Jan 5, 2025
dc425f4
fix: adjust types to new Tauri types
Alystrasz Jan 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/push-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
- name: Create dist folder (Ubuntu only)
if: matrix.platform == 'ubuntu-22.04'
run: mkdir --parent src-vue/dist
Expand All @@ -70,7 +70,7 @@ jobs:
- name: install dependencies (ubuntu only)
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

- name: Move original TypeScript bindings
run: |
Expand Down Expand Up @@ -104,21 +104,21 @@ jobs:
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 18
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
- name: Disable self-updater
shell: bash
run: |
jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new
rm src-tauri/tauri.conf.json
mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
# - name: Disable self-updater
# shell: bash
# run: |
# jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new
# rm src-tauri/tauri.conf.json
# mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json
- uses: Swatinem/rust-cache@v2 # Cache Rust build artifacts
with:
workspaces: |
Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,18 @@ If you want to add translations for a new language that does not exist in Flight
## Roadmap

--> See https://github.com/R2NorthstarTools/FlightCore/issues/1

This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.

## Recommended IDE Setup

- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)

## Type Support For `.vue` Imports in TS

Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's Take Over mode by following these steps:

1. Run `Extensions: Show Built-in Extensions` from VS Code's command palette, look for `TypeScript and JavaScript Language Features`, then right click and select `Disable (Workspace)`. By default, Take Over mode will enable itself if the default TypeScript extension is disabled.
2. Reload the VS Code window by running `Developer: Reload Window` from the command palette.

You can learn more about Take Over mode [here](https://github.com/johnsoncodehk/volar/discussions/471).
123 changes: 70 additions & 53 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^1.6.0"
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-opener": "^2"
},
"devDependencies": {
"@tauri-apps/cli": "^1.6.0"
"@tauri-apps/cli": "^2"
}
}
2 changes: 1 addition & 1 deletion scripts/check_version_numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
with open("src-tauri/Cargo.toml", "rt") as f:
Cargo_toml = toml.load(f)

tauri_conf_json_version = tauri_conf_json["package"]["version"]
tauri_conf_json_version = tauri_conf_json["version"]
Cargo_toml_version = Cargo_toml["package"]["version"]

# Ensure same
Expand Down
47 changes: 0 additions & 47 deletions scripts/create-release-file.py

This file was deleted.

Loading
Loading