Skip to content

Rebase v2 branch on main#12

Merged
cristipufu merged 22 commits intoaptabase:v2from
nekename:v2
Nov 28, 2024
Merged

Rebase v2 branch on main#12
cristipufu merged 22 commits intoaptabase:v2from
nekename:v2

Conversation

@nekename
Copy link
Copy Markdown
Contributor

I have rebased the v2 branch on main in preparation for a second PR where I will update the plugin to the v2 stable.

goenning and others added 21 commits October 18, 2023 13:59
fix(build): update tsconfig.json
fix(deps): use @rollup/plugin-terser

- Updated package versions in package.json per any warnings; updated to tauri v2 package
- Updated tsconfig.json to remove a warning about Promises by updating target.
- Added moduleResolution="node" to improve code intellisense.
- Added exclude=["rollup.config.js"] to remove warning when it tries to compile that file (vscode intellisense)
- Updated dependency version in cargo.toml
- Replaced the locale with a dummy value
Updated the cargo instructions to reference the git repo and branch. Also added a section about loading the key from a .env file.
Fix typo: "tauri-plugin-localhost" to "tauri-plugin-aptabase"
(cherry picked from commit 97065f0)
@nekename
Copy link
Copy Markdown
Contributor Author

Not sure why there's conflicts, you can simply accept my changes.

@cristipufu cristipufu merged commit 93aab7e into aptabase:v2 Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants