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.

Sign up for GitHub

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

Jump to bottom

feat: Tauri 2.0 #1054

Merged
merged 99 commits into from
Mar 2, 2025
Merged

feat: Tauri 2.0 #1054

merged 99 commits into from
Mar 2, 2025
+3,495 −2,692

Conversation

GeckoEidechse
Copy link
Member

@GeckoEidechse GeckoEidechse commented Dec 22, 2024 •
edited
Loading

Updating FlightCore to Tauri 2.0 by creating an sample Tauri 2.0 project and then porting over changes, one at a time.

Ported FlightCore to Tauri 2.0
We lost a few things in the process like

  • Message dialog for plugin install
  • Message dialog when WebView2 is not installed
  • ???

Open TODOs (post merge?)

  • Update mechanism

@GeckoEidechse GeckoEidechse marked this pull request as draft December 22, 2024 23:40
@github-actions github-actions bot added the merge conflicts Blocked by merge conflicts, waiting on the author to resolve label Dec 22, 2024
@GeckoEidechse
build: Keep debug symbols in release code
bd52d5c 
for sentry.io
@GeckoEidechse
build: Match npm package versions closer to main branch
395d64f
@GeckoEidechse
refactor: Adjust tsconfig file to match structure of main branch more…
e43e9fe 
… closely
@GeckoEidechse
refactor: Match index.html from main branch
2cc0579
@GeckoEidechse
docs: Add README from main branch
7f2d69c
@GeckoEidechse
build: Add same packages as from main branch
1d9b213
@GeckoEidechse
chore: Remove leftover SVG
6d48542
@GeckoEidechse
test: Update Python script for comparing version numbers
0474130 
to take manifest structure changes into account
@GeckoEidechse
Merge branch 'main' into dev/tauri-2
e0004b6
@GeckoEidechse
ci: Update list of dependencies to install
f6e9ef4
@GeckoEidechse
feat: Replace icons with FlightCore ones
a8f8b5e
@GeckoEidechse
ci: Auto-accept installing dependencies
8a62de5
@GeckoEidechse
build: Add TS-RS bindings
d039cd3
@GeckoEidechse
build: Add language files
770998b
@GeckoEidechse
ci: Bump node version to 18
f44d60e
@GeckoEidechse
fix: Restore asset files from main branch
2332daf
@GeckoEidechse
feat: Copy over CSS and some structure from App.vue from main branch
e809f17
@GeckoEidechse
feat: Copy over more structure from main branch
b312976
@GeckoEidechse
feat: Copy over more structure from main branch
9df8fb8
@GeckoEidechse
feat: Restore style.css from main branch
99796a9
@GeckoEidechse
Restore more logic from main branch
ff33baf
@GeckoEidechse
Restore more logic from main branch
ff23045
@GeckoEidechse
Restore more logic from main branch
9d308d5
@GeckoEidechse
Restore more files from main branch
33834f4
@github-actions github-actions bot removed the merge conflicts Blocked by merge conflicts, waiting on the author to resolve label Jan 6, 2025
@GeckoEidechse GeckoEidechse marked this pull request as ready for review March 2, 2025 00:47
@github-actions github-actions bot added the merge conflicts Blocked by merge conflicts, waiting on the author to resolve label Mar 2, 2025
@GeckoEidechse GeckoEidechse changed the title dev: Tauri 2.0 feat: Tauri 2.0 Mar 2, 2025
@GeckoEidechse
Copy link
Member Author

Aight, time to merge, fingers crossed ^^

@GeckoEidechse GeckoEidechse merged commit 5589307 into main Mar 2, 2025
14 checks passed
@GeckoEidechse GeckoEidechse deleted the dev/tauri-2 branch March 2, 2025 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merge conflicts Blocked by merge conflicts, waiting on the author to resolve
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GeckoEidechse @Alystrasz