Skip to content

Commit e0a4113

Browse files
committed
Merge branch 'main' into managing_state_graph
2 parents ee3f10b + 292e03f commit e0a4113

File tree

18 files changed

+1645
-138
lines changed

18 files changed

+1645
-138
lines changed

Cargo.lock

Lines changed: 33 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,45 @@ debug = 0
9595
[profile.android-dev]
9696
inherits = "dev"
9797

98+
[profile.wasm-release]
99+
inherits = "release"
100+
101+
[profile.server-release]
102+
inherits = "release"
103+
104+
[profile.ios-dev]
105+
inherits = "dev"
106+
107+
[profile.ios-release]
108+
inherits = "release"
109+
110+
[profile.android-release]
111+
inherits = "release"
112+
113+
[profile.windows-dev]
114+
inherits = "dev"
115+
116+
[profile.windows-release]
117+
inherits = "release"
118+
119+
[profile.macos-dev]
120+
inherits = "dev"
121+
122+
[profile.macos-release]
123+
inherits = "release"
124+
125+
[profile.linux-dev]
126+
inherits = "dev"
127+
128+
[profile.linux-release]
129+
inherits = "release"
130+
131+
[profile.liveview-dev]
132+
inherits = "dev"
133+
134+
[profile.liveview-release]
135+
inherits = "release"
136+
98137
[profile.release.build-override]
99138
opt-level = 3
100139
codegen-units = 1

Dioxus.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[application]
22
name = "docsite"
33

4+
[web.app]
5+
base_path = "docsite"

docs-src/0.6/src/cookbook/publishing.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,25 @@ Edit your `Dioxus.toml` to point your `out_dir` to the `docs` folder and the `ba
99
```toml
1010
[application]
1111
# ...
12-
out_dir = "docs"
13-
1412
[web.app]
1513
base_path = "your_repo"
1614
```
1715

1816
Then build your app and publish it to Github:
1917

2018
- Make sure GitHub Pages is set up for your repo to publish any static files in the docs directory
21-
- Build your app with:
19+
- Build your app into the `docs` directory with:
20+
```sh
21+
dx bundle --out-dir docs
22+
```
23+
- Move the static content from `docs/public` to `docs`
24+
```sh
25+
mv docs/public/* docs
26+
```
27+
- Make a copy of your `docs/index.html` file and rename the copy to `docs/404.html` so that your app will work with client-side routing:
2228
```sh
23-
dx build --release
29+
cp docs/index.html docs/404.html
2430
```
25-
- Make a copy of your `docs/index.html` file and rename the copy to `docs/404.html` so that your app will work with client-side routing
2631
- Add and commit with git
2732
- Push to GitHub
2833

docs-src/0.6/src/guide/new_app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We're going to use the bare-bones template for *HotDog*. Our app won't be too co
2121

2222
- Select "false" when asked if you want to create a fullstack website.
2323
- Select "false" for the router, though we *will* eventually add the router to the app.
24-
- Select no for TailwindCSS. If you want to use Tailwind, make sure to read the [TailwindCSS guide](../cookbook/tailwind.md).
24+
- Select "false" for TailwindCSS. If you want to use Tailwind, make sure to read the [TailwindCSS guide](../cookbook/tailwind.md).
2525
- Select "Web" as the default platform.
2626

2727
> 📣 You don't need `dx new` to create new Dioxus apps! Dioxus apps are Rust projects and can also be built with tools like cargo.

docs-src/0.6/src/guide/tooling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ We covered the setup instructions in [Getting Started](../getting_started/index.
1010

1111
- Rust is installed
1212
- You have a code editor installed
13-
- The wasm32-unknown-unknown Rust toolchain is installed
13+
- The wasm32-unknown-unknown Rust target is installed
1414
- The `dioxus-cli` is installed and up-to-date
1515
- System-specific dependencies are installed
1616

packages/docsite/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ server = [
7171
production = [
7272
"dioxus_docs_router/production",
7373
]
74+
doc_test = []

0 commit comments

Comments
 (0)