Commit Graph
23 Commits
Author SHA1 Message Date
Evan Almloff b1de7d850c Merge branch 'master' into intigrate-collect-assets 2024-01-04 18:44:29 -06:00
Bennett-PetzoldandEvan Almloff 80a8e1f512 Add Cargo Arguments and Cross-Architecture Support (#1777)
* Add passthrough to cargo build

* Add platform_triple flag

* Add handling to bundle and serve commands

* Show full stacked error from Tauri in bundling

Previously only the top-level error was shown, giving only vague data
for debugging the build process

* Adjust bundle platform triple when cross compiling

* Rename --platform-triple to --target

* restore some deleted docs on CLI commands

---------

Co-authored-by: Evan Almloff <evanalmloff@gmail.com>
2024-01-02 15:19:29 -06:00
Evan Almloff 66e2c02bf7 Merge branch 'master' into intigrate-collect-assets 2023-12-08 08:49:17 -06:00
Evan Almloff 4215e2b247 fix cargo.toml/lock path capitalization for linux 2023-11-03 13:09:33 -05:00
Evan Almloff 51f342417a add examples to the default watch path 2023-10-30 14:41:41 -05:00
Evan Almloff 282e098086 Merge branch 'master' into intigrate-collect-assets 2023-09-04 08:42:14 -05:00
fanyang 4511b37da8 Fix cli compile error due to tauri bundler adding fields (#1416)
New fields for debian settings:

- desktop_template

For NSIS settings:

- custom_language_files
- template
2023-09-02 06:44:31 -05:00
Evan Almloff 5eca11fe3d update collect assets name 2023-08-18 14:54:57 -05:00
Evan Almloff c402b6cd36 collect assets in desktop debug mode 2023-08-16 17:01:51 -05:00
Evan Almloff 8d3c11ef15 inject included styles and preload images into the head 2023-08-16 16:16:34 -05:00
Evan Almloff 7bf0926938 use tauri bundle 1.2 2023-07-26 12:53:00 -07:00
Evan Almloff 489338d642 create cli bundle command 2023-07-26 12:40:50 -07:00
Evan Almloff 0c5025ffa0 WIP desktop serve hot reload 2023-07-18 10:24:29 -07:00
Miles Murgaw 9fab3cf4e3 Merge branch 'master' into cli-stuff 2023-07-15 12:40:23 -04:00
Brian Donovan 9cef71b6b9 fix(cli): improve error message for invalid config (#1200)
Previously an invalid `Dioxus.toml` file would yield this error when running e.g. `dx serve`:

```
Error: Failed to load `Dioxus.toml` because: Dioxus.toml parse failed
```

This doesn't give any indication why it failed to parse. This commit updates it to include why the parsing failed, e.g.:

```
Error: Failed to load Dioxus config because: Dioxus.toml missing field `name` for key `application` at line 38 column 1
```

I initially had it format the message to include `Dioxus.toml:38:1` to be clickable in some terminals, but the location specified didn't always seem particularly relevant to the actual problem so I left it as-is.

This also fixes what I believe would be an issue on case-sensitive file systems where if `dioxus.toml` existed it would try to read `Dioxus.toml`.

I'm still fairly new to Rust, so the `.as_path()` calls may not be the best way to deal with the fact that the borrow checker wouldn't let me re-use `crate_dir` and `dioxus_conf_file`. I'm open to suggestions!
2023-07-15 11:13:22 -05:00
Miles Murgaw d710b92696 fix: do it correctly 2023-07-14 20:41:27 -04:00
Miles Murgaw 41fd7a1040 feat: bin flag for serve and build 2023-07-14 20:06:54 -04:00
Miles Murgaw 5bc9e4556b feat: custom mkcert paths 2023-07-11 23:01:37 -04:00
Miles Murgaw b47e4fedcc feat: default web.https config 2023-07-11 19:49:41 -04:00
Miles Murgaw db93252faf feat: cli use local certificate 2023-07-11 00:25:16 -04:00
Miles Murgaw 2c8c601579 fix: clippy 2023-06-30 10:48:38 -04:00
Marc Espín 20c088b990 fix: Remove conflicting rustfmt config for cli (#1135) 2023-06-29 10:17:10 -05:00
Jonathan Kelley a9d7b4d32a Prepare CLI for move into mainline 2023-06-28 17:21:23 -07:00