Commit graph

223 commits

Author SHA1 Message Date
Evan Almloff
49be972507 make dx clean clean the new .dioxus directory 2023-12-29 15:20:30 -06:00
Evan Almloff
1683ec8a72 introduce RAIIChild to drop the child process for desktop even when the exit is not planned 2023-12-29 14:36:18 -06:00
Evan Almloff
d88a662877 Rename --debug to --force-debug and improve docs 2023-12-29 11:11:39 -06:00
Evan Almloff
1acfd46b0b fix formatting 2023-12-29 10:08:10 -06:00
Evan Almloff
f7881aa1f0 fix some merge conflicts 2023-12-29 09:46:58 -06:00
Evan Almloff
601c63b67f manually apply debug assertions flag for fullstack debug mode 2023-12-22 09:25:35 -06:00
Evan Almloff
0914298bea Merge branch 'intigrate-collect-assets' of https://github.com/Demonthos/dioxus into intigrate-collect-assets 2023-12-21 18:05:02 -06:00
Evan Almloff
8b125231f0 make backend and frontend builds happen in parallel 2023-12-21 18:04:35 -06:00
ealmloff
2853b16cd6
Merge branch 'DioxusLabs:master' into intigrate-collect-assets 2023-12-21 14:00:35 -06:00
Evan Almloff
5ab0c48ddd fix clippy 2023-12-17 17:55:02 -06:00
Evan Almloff
2a764aaf6a remove some unused CLI imports 2023-12-17 15:42:58 -06:00
Evan Almloff
e7515d18c1 show multiple different error messages in hot reloading 2023-12-17 15:39:48 -06:00
Exotik850
cf413780c1
Make hot reload error only show once (#1725) 2023-12-17 15:26:40 -06:00
Evan Almloff
f646f68b60 Merge branch 'master' into maybe-sync-signal 2023-12-15 18:38:06 -06:00
Evan Almloff
70c3abb8df Merge branch 'master' into maybe-sync-signal 2023-12-14 12:29:32 -06:00
Exotik850
1ec230ae29
Autoformat ignores files in .gitignore (#1704)
* Make autofmt ignore gitignored files

* don't panic if it can't get the git ignore files

* replace some with ok

* Filter rs files from gitignore

* fmt

* remove early return

* only ignore paths that start with target

---------

Co-authored-by: Evan Almloff <evanalmloff@gmail.com>
2023-12-13 09:44:01 -06:00
xfalcon
0cb13942da
fix: command error with dx build --verbose (#1715)
error msg: cannot set both --verbose and --quiet
2023-12-13 08:30:40 -06:00
YuKun Liu
695bf009d1
fix: dx create not work (#1709) 2023-12-11 13:27:55 -06:00
Benjamin Manns
972235bd6f
Fix doc tests by adding formatting to CLI README (#1706)
The README for cli gets included in lib.rs via `include_str!`. The code snippets then get assumed to be Rust, which fails if running `cargo test --doc`. This is not a huge problem, but was brought to my attention because Nix's `buildRustPackage` runs `cargo test` including doc tests (unlike what get run for this project on CI). This means I can't update the Nix package to 0.4.3 without changing the test flags (which I think I'll see about doing anyways, as that's how Dioxus runs CI).
2023-12-10 12:16:59 -06:00
marc2332
ce5d7bd11b
rename to split-line-attributes 2023-12-09 16:51:41 +01:00
marc2332
52cb5ff951
feat: --inline-attributes option for autofmt 2023-12-09 11:16:26 +01:00
Evan Almloff
66e2c02bf7 Merge branch 'master' into intigrate-collect-assets 2023-12-08 08:49:17 -06:00
Exotik850
fc31876a57
Wasm target check before build (#1689)
* Add `rustup show` check for wasm32 target

* better place for check

* fmt

* clippy fmt
2023-12-07 12:35:16 -06:00
Jonathan Kelley
fe7df0c6a5
Merge pull request #1697 from ealmloff/hot-reload-temp-dir 2023-12-07 09:18:10 -08:00
Evan Almloff
9a13df2c73 move hot reload socket into the target directory 2023-12-07 07:00:59 -06:00
Jonathan Kelley
8f1791c039
Merge pull request #1597 from ColonelThirtyTwo/fmt-indent
Use indentation settings in dx fmt and vscode extension
2023-12-06 22:06:16 -08:00
Jonathan Kelley
edebe5be4a
Merge pull request #1653 from ealmloff/fix-hot-reload-missing-items
Fix missing items in hot reloading diffing
2023-12-06 21:38:36 -08:00
Jonathan Kelley
ea15c6a2eb
Merge branch 'master' into cli-config-library 2023-12-06 21:30:14 -08:00
Jonathan Kelley
d3f6ff703c
Release 0.4.3
dioxus@0.4.3
dioxus-autofmt@0.4.3
dioxus-check@0.4.3
dioxus-cli@0.4.3
dioxus-core@0.4.3
dioxus-core-macro@0.4.3
dioxus-desktop@0.4.3
dioxus-fullstack@0.4.3
dioxus-hooks@0.4.3
dioxus-hot-reload@0.4.3
dioxus-html@0.4.3
dioxus-interpreter-js@0.4.3
dioxus-liveview@0.4.3
dioxus-mobile@0.4.3
dioxus-native-core@0.4.3
dioxus-native-core-macro@0.4.3
dioxus-router@0.4.3
dioxus-router-macro@0.4.3
dioxus-rsx@0.4.3
dioxus-signals@0.4.3
dioxus-ssr@0.4.3
dioxus-tui@0.4.3
dioxus-web@0.4.3
dioxus_server_macro@0.4.3
fermi@0.4.3
generational-box@0.4.3
plasmo@0.4.3
rsx-rosetta@0.4.3

Generated by cargo-workspaces
2023-12-06 16:56:35 -08:00
Evan Almloff
b965fc23e9 use a temp directory for the hot reloading pipe on desktop, fullstack and liveview 2023-12-06 17:01:51 -06:00
Raul Cesar Teixeira
8149868ebc
Fixed conflict of "--verbose" and "--quiet" flags (#1686)
Co-authored-by: Raul Cesar <raul@zideco.dev>
2023-12-04 18:11:02 -06:00
Felix F Xu
d404ddfccf
fix false notification/rebuild for dx hot-reload (#1684)
* fix false notification/rebuild for dx hot-reload

* Make sure we have permissions and the changed file exists before reading the metadata

---------

Co-authored-by: ealmloff <evanalmloff@gmail.com>
2023-12-03 20:02:30 -06:00
Felix F Xu
a2ca1760c9
Set local_socket_stream to blocking (default) (#1682) 2023-12-02 19:25:27 -06:00
Evan Almloff
532ffaa614 fix merge 2023-11-20 18:36:18 -06:00
Evan Almloff
557630c419 Merge branch 'master' into cli-config-library 2023-11-20 18:35:24 -06:00
Evan Almloff
8cf8f66c27 add more logging to desktop hot reloading 2023-11-20 09:47:03 -06:00
Evan Almloff
0ee21dff1e fix missing item in hot reloading diffing 2023-11-20 09:33:39 -06:00
HJin.me
ff6c7efb41
fix: tailwind.css use absolute path (#1649) 2023-11-19 11:22:54 -06:00
Raman Hafiyatulin
098689083d
Related to #1547: use dioxus-cli within a workspace (wildcard-members, real package names) (#1642)
* Related to #1547: use `dioxus-cli` within a workspace

Although the `dx` CLI allows to specify a package name to chose from workspace members,
it does not support workspace members specified as glob-wildcards.
Neither it respects the effective package name, specified in the crate's `Cargo.toml`.

This PR addresses that issue:
- upon `dx build ...`, if the `--bin` CLI-argument is provided, treat the current dir as a workspace;
- search through the workspace's `members`: resolve each of them with `glob`;
- assume that any workspace member has a `Cargo.toml` in it (cargo does it, so it's okay);
- read said manifest, and check the package name in it;
- if found — there we have our sought package.

* Use cargo-metadata to find out the workspace structure

* glob is unused
2023-11-15 15:14:16 -06:00
Evan Almloff
e11f3fdc48 fix clippy 2023-11-15 09:30:15 -06:00
Evan Almloff
9bb464dd7d fix cli tests 2023-11-15 09:29:15 -06:00
Evan Almloff
cd48b3b7f9 allow base_path in the CLI 2023-11-15 08:23:12 -06:00
Evan Almloff
1ed66a54cc fix cli configuration environment variable 2023-11-14 15:50:04 -06:00
Evan Almloff
06be18a591 export lazy current config 2023-11-14 15:34:06 -06:00
Evan Almloff
5dc3486c53 Merge branch 'cli-serde-default' into cli-config-library 2023-11-10 16:26:58 -06:00
ealmloff
79e3fe677f
Merge branch 'master' into cli-serde-default 2023-11-10 16:22:53 -06:00
Evan Almloff
1b7017f67b fix formatting 2023-11-09 08:36:14 -06:00
Evan Almloff
8a2d170d96 pull out the CLI config data into a separate library 2023-11-08 12:48:25 -06:00
xTeKc
ca556ea9cb
update readme (#1615)
* Fix wasm-bindgen version mismatch

* fixes #1613
2023-11-06 13:32:42 -06:00
Evan Almloff
4215e2b247 fix cargo.toml/lock path capitalization for linux 2023-11-03 13:09:33 -05:00
divinerapier
f372144fd7
Bump tauri bundler for using proxy to fetch resources
Signed-off-by: divinerapier <sihao.fang@outlook.com>
2023-11-03 11:01:00 +08:00
Alex Parrill
52fb080193 Use indentation settings in dx fmt and vscode extension
Adds the ability to specify an indent string to public autofmt methods - either
a sequence of spaces or a tab character.

Get the indentation style and size from rustfmt for dx fmt, or from the editor
settings for the vscode extension.

Closes #1595
2023-11-01 17:24:18 -04:00
Evan Almloff
51f342417a add examples to the default watch path 2023-10-30 14:41:41 -05:00
Falco Hirschenberger
d4e6876ff6
Silence desktop build outputs from cargo (#1584)
Silence additional disturbing output from cargo in desktop builds
2023-10-27 08:29:43 -05:00
Evan Almloff
9d19f4d204 fix clippy 2023-10-16 10:44:08 -05:00
Evan Almloff
9f729dd6de fix clippy 2023-10-14 14:32:08 -05:00
ealmloff
a7736284c8
Merge branch 'master' into intigrate-collect-assets 2023-10-12 08:46:27 -05:00
Evan Almloff
b26985ea6c make debug build of fullstack applications load faster by default 2023-10-10 14:23:58 -05:00
Leonard
2d1234c3d1
Include README and Dioxus logo in package docs (#1536)
* Include README in docs.rs and add Dioxus logo

* Update README.md
2023-10-10 10:52:48 -05:00
Evan Almloff
b76f129083 Merge branch 'master' into intigrate-collect-assets 2023-10-10 09:57:16 -05:00
Leonard
c65a49fd0f
Remove redundant directories (#1535)
Also fix typo
2023-10-10 09:50:58 -05:00
Marc Espín
c8c4e85e65
feat: Remove unused deps (#1447)
* feat: Reduce dioxus-cli deps

* remove more unused deps
2023-10-09 10:14:46 -05:00
Timothy Mertz
cde1e886d6
cli: Add ability for autofmt to read stdin (#1529)
This change adds the ability for autofmt to read from stdin by using
'-f -' or '--file -'
2023-10-09 08:20:31 -05:00
Sridhar Ratnakumar
0d7bc86250
cli: Log connection errors during dx serve in desktop apps (#1515)
* cli: Log connection errors during `dx serve` in desktop apps

* add a note about the dioxus CLI

---------

Co-authored-by: Evan Almloff <evanalmloff@gmail.com>
2023-10-09 07:56:23 -05:00
Leonard
459f24d5e9
Clarify where serve warnings come from (#1524) 2023-10-05 13:05:14 -05:00
Sridhar Ratnakumar
91752e7220
cli: Fix typo, resouces (#1516) 2023-10-04 08:20:13 -05:00
Evan Almloff
e2f50cc689 Merge branch 'master' into intigrate-collect-assets 2023-09-22 07:56:00 -05:00
Leonard
07613c806b
Fix #1367 (#1471)
* Bump cargo_toml to 1.16.0

* Format
2023-09-18 18:51:04 -05:00
Evan Almloff
f976e08f71 Merge branch 'master' into intigrate-collect-assets 2023-09-17 19:40:14 -05:00
Evan Almloff
070ef6aec9 Merge branch 'master' into cli-serde-default 2023-09-17 19:00:13 -05:00
Evan Almloff
49a127b31e deduplicate serve code with hot reloading in the CLI crate 2023-09-09 16:18:52 -05:00
Evan Almloff
ffb5de91d1 Merge branch 'master' into intigrate-collect-assets 2023-09-05 13:45:37 -05:00
ealmloff
d5d974d5a3
Bump the dioxus-cli to 0.4.1 (#1424)
* bump the dioxus-cli version

* bump DIOXUS_CLI_VERSION constant

* Merge branch 'master' into bump-cli
2023-09-04 15:10:27 -05:00
Jonathan Kelley
4009064767
Merge pull request #1415 from ealmloff/pin-tauri-deps
Pin Tauri dependencies to a minor version
2023-09-04 11:30:25 -07:00
Evan Almloff
148b35a87a fix clippy 2023-09-04 08:42:30 -05:00
Evan Almloff
282e098086 Merge branch 'master' into intigrate-collect-assets 2023-09-04 08:42:14 -05:00
Marc Espín
95887e836c
fix: Add the --locked param to every cli installation command (#1427) 2023-09-04 07:28:38 -05:00
Evan Almloff
bc94f36934 restrict tauri bundler version to 1.3.0 only 2023-09-03 13:36:56 -05:00
YuKun Liu
2cfa0e4ea9
fix: prettier_build unavailabe (#1410)
Co-authored-by: Evan Almloff <evanalmloff@gmail.com>
2023-09-02 18:31:34 -05:00
Evan Almloff
71264b1ee3 bump bundler to "=1.3.*" 2023-09-02 18:28:44 -05:00
Evan Almloff
24f22b1b87 Merge branch 'master' into pin-tauri-deps 2023-09-02 18:15:29 -05:00
Leonard
94f76946fc
Improve CLI docs (#1404)
* Improve CLI docs

* Fixed all the typos (hopefully).
* Improved the bad English. This encompasses grammar, vocabulary, generally awkward phrases, etc. The result is easier to read and understand, and in some cases shorter.
* Made some formatting improvements. This includes making formatting more consistent, but I changed some of it to be better, at least in my opinion.
* Removed certain unnecessities, the biggest one being the commands documentation. I think this is unnecessary because of the `dx --help` command. It also needs to be updated every time a command gets added/updated/removed. It doesn't really provide much extra insight than `dx --help`.
* Improved plugin documentation. I added a warning to ignore all of it, which is ironic, but the fact is that plugins are probably going to change. But by the time I learned that, I already made some changes to the plugin docs. This includes a better guide on how to get started (although still bad since the plugin system is too messy), and some general changes like the aforementioned English or formatting.
* And more. I can't list it all, but I didn't use any destructive changes. The content might be reformatted (to be shorter or easier to understand), but the meaning isn't lost.

* Fix grammar in packages/cli/docs/src/creating.md

Co-authored-by: Evan Simkowitz <esimkowitz@users.noreply.github.com>

* Update README.md

* Change config example

---------

Co-authored-by: Evan Simkowitz <esimkowitz@users.noreply.github.com>
2023-09-02 17:59:20 -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
d94e2c104c pin Tauri dependencies to a minor version 2023-09-01 10:27:28 -05:00
Evan Simkowitz
de87ba6548
Update all uncommented commands to remove actions-rs (#1366)
* Update all uncommented commands to remove actions-rs (#1)

* install target in toolchain action

* add linux target explicitly

* try latest

* fix install
2023-08-22 19:48:03 -05:00
Evan Almloff
e162e3e4cf fix formatting 2023-08-21 16:07:49 -05:00
Evan Almloff
99268acc05 add an option to skip assets in the CLI 2023-08-21 16:05:25 -05:00
Evan Almloff
5eca11fe3d update collect assets name 2023-08-18 14:54:57 -05:00
Evan Almloff
4ee2bc259d fix clippy 2023-08-18 14:45:03 -05:00
Evan Almloff
1c58352456 implement fullstack assets integration 2023-08-18 14:30:23 -05:00
Evan Almloff
afb8578605 Merge branch 'fullstack-serve' into intigrate-collect-assets 2023-08-18 14:03:55 -05:00
Evan Almloff
e3aac14ec9 make clippy happy 2023-08-18 13:57:05 -05:00
Evan Almloff
bd743fa2f9 Add fullstack platform to serve and build commands 2023-08-18 13:55:00 -05:00
Evan Almloff
1ed814668a Set an environment variable during serve for bundling 2023-08-18 11:12:56 -05:00
Evan Almloff
9bfe9682b5 integrate with the bundle command 2023-08-18 10:27:38 -05:00
Evan Almloff
213b80790b fix release desktop builds 2023-08-18 09:55:49 -05:00
Evan Almloff
62f8e0f727 fix fullstack assets 2023-08-17 09:56:59 -05:00
Vinicius Gobbo Antunes de Oliveira
fa39408d58
If mkcert not enabled, require cert_path and key_path to be specified or error. (#1342) 2023-08-17 07:58:56 -05:00
Evan Almloff
77d11f6d9a Fix the asset config in the CLI 2023-08-16 17:24:30 -05:00
Evan Almloff
c402b6cd36 collect assets in desktop debug mode 2023-08-16 17:01:51 -05:00