-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
refactor(tauri): support for building without environmental variables #850
Conversation
* only no-sever has been tried * test suite has not been updated to pass tests * TAURI_CONFIG and TAURI_INLINED_ASSETS currently does nothing
Idk why I thought it would have created a circular dependency. I must have experimented with something a bit different. Signed-off-by: Chip Reed <chip@chip.sh>
Because asset embedding had to be slightly reworked, I moved the equivalent of `tauri_includedir_codegen` into the proc-macro. I also embedded the `tauri_includedir` equivalent into `tauri-api/src/assets.rs`. I felt since the codegen was removed, the other didn't make sense as separate either. Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
config read helper was too general to be useful both inside the proc macro and outside of it. better off without it, since it was added during this feature Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Off the top of my head, some todos:
|
phf is now imported and used from `tauri-api` Signed-off-by: Chip Reed <chip@chip.sh>
I've left the bundler and cli completely untouched, only touching note for myself: Line 292 in d0c41e4
|
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
they are hard to see errors in when they are disabled on windows, but you are developing on windows Signed-off-by: Chip Reed <chip@chip.sh>
Signed-off-by: Chip Reed <chip@chip.sh>
this slipped through the cracks because CI doesn't enable the cli feature. Signed-off-by: Chip Reed <chip@chip.sh>
We should wait for WRY to land on dev before fixing the conflict issues here. |
We'll need to archive tauri-includedir since this change kills it :P |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is flipping awesome, but please don't change the TS style and watch out for overly expressive changelog stuff.
My bad 😂 |
Both
embedded-server
andno-server
fully work. Heres a checklist ill keep updated i guess:brotligzip)no-server
embedded-server
TAURI_INLINED_ASSETS
supportTAURI_CONFIG
supportAppConfig
->AppContext
to prevent repetition. (i.e.&application.config.config
->&application.ctx.config
)This is the replacement for #830. That PR was more about seeing if it was possible, this PR is about actually removing core environmental build variables from tauri.
This branch/pull request should be tracking changes from dev to prevent having a massive conflict at the end. This touches a few "core" files like
runner.rs
and has some tentacles in otherwise not related code due to movingtauri-api::config
intotauri-config
so conflicts are definitely going to happen.As of the first commit, it can build a

no-server
application that has been run withtauri dev
ortauri build
to generate theindex.tauri.html
.As a high level overview of additional changes planned in this branch:
embedded-server
. (and every existing way of using tauri)TAURI_CONFIG
andTAURI_INLINED_ASSETS
which are currently ignoredSee comments on #830 for a more specific overview if needed