refactor(tauri): support for building without environmental variables#850
Merged
lucasfernog merged 69 commits intodevfrom Feb 9, 2021
Merged
refactor(tauri): support for building without environmental variables#850lucasfernog merged 69 commits intodevfrom
lucasfernog merged 69 commits intodevfrom
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>
Member
Author
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>
Member
Author
|
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>
chippers
commented
Jul 20, 2020
Member
Author
|
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>
This was referenced Jul 21, 2020
Member
|
We should wait for WRY to land on dev before fixing the conflict issues here. |
Member
|
We'll need to archive tauri-includedir since this change kills it :P |
lucasfernog
approved these changes
Feb 9, 2021
nothingismagick
requested changes
Feb 9, 2021
Member
nothingismagick
left a comment
There was a problem hiding this comment.
This is flipping awesome, but please don't change the TS style and watch out for overly expressive changelog stuff.
Member
|
My bad 😂 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Both
embedded-serverandno-serverfully work. Heres a checklist ill keep updated i guess:brotligzip)no-serverembedded-serverTAURI_INLINED_ASSETSsupportTAURI_CONFIGsupportAppConfig->AppContextto 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.rsand has some tentacles in otherwise not related code due to movingtauri-api::configintotauri-configso conflicts are definitely going to happen.As of the first commit, it can build a

no-serverapplication that has been run withtauri devortauri buildto 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_CONFIGandTAURI_INLINED_ASSETSwhich are currently ignoredSee comments on #830 for a more specific overview if needed