Skip to content

Commit fcdfa8e

Browse files
authored
Merge branch 'master' into build-examples
2 parents ba5250b + cb691cc commit fcdfa8e

File tree

29 files changed

+1132
-475
lines changed

29 files changed

+1132
-475
lines changed

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[registries.crates-io]
2+
protocol = "sparse"

.github/workflows/ci.yaml

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
~/.cargo/registry
1515
~/.cargo/git
1616
target
17-
key: ${{ runner.os }}-lint-${{ hashFiles('Cargo.lock') }}
17+
key: ${{ runner.os }}-lint
1818
restore-keys: |
19-
${{ runner.os }}-lint-
19+
${{ runner.os }}-lint
2020
2121
- name: Setup | Toolchain (clippy)
2222
uses: actions-rs/toolchain@v1
@@ -54,9 +54,9 @@ jobs:
5454
~/.cargo/registry
5555
~/.cargo/git
5656
target
57-
key: ${{ runner.os }}-check-${{ hashFiles('Cargo.lock') }}
57+
key: ${{ runner.os }}-check
5858
restore-keys: |
59-
${{ runner.os }}-check-
59+
${{ runner.os }}-check
6060
6161
- name: Setup | Rust
6262
uses: actions-rs/toolchain@v1
@@ -92,41 +92,65 @@ jobs:
9292
~/.cargo/registry
9393
~/.cargo/git
9494
target
95-
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
95+
key: ${{ runner.os }}-cargo
9696
restore-keys: |
97-
${{ runner.os }}-cargo-
97+
${{ runner.os }}-cargo
9898
99-
- name: Setup | Cache Examples
99+
- name: Setup | Cache | Example proxy
100100
uses: actions/cache@v2
101101
with:
102102
path: examples/proxy/target
103-
key: wasm32-example-proxy-debug-${{ hashFiles('examples/proxy/Cargo.lock') }}
103+
key: wasm32-example-proxy
104104
restore-keys: |
105-
wasm32-example-proxy-debug-
105+
wasm32-example-proxy
106106
107-
- name: Setup | Cache Examples
107+
- name: Setup | Cache | Example seed
108108
uses: actions/cache@v2
109109
with:
110110
path: examples/seed/target
111-
key: wasm32-example-seed-debug-${{ hashFiles('examples/seed/Cargo.lock') }}
111+
key: wasm32-example-seed
112112
restore-keys: |
113-
wasm32-example-seed-debug-
113+
wasm32-example-seed
114114
115-
- name: Setup | Cache Examples
115+
- name: Setup | Cache | Example vanilla
116116
uses: actions/cache@v2
117117
with:
118118
path: examples/vanilla/target
119-
key: wasm32-example-vanilla-debug-${{ hashFiles('examples/vanilla/Cargo.lock') }}
119+
key: wasm32-example-vanilla
120120
restore-keys: |
121-
wasm32-example-vanilla-debug-
121+
wasm32-example-vanilla
122122
123-
- name: Setup | Cache Examples
123+
- name: Setup | Cache | Example webworker
124+
uses: actions/cache@v2
125+
with:
126+
path: examples/webworker/target
127+
key: wasm32-example-webworker
128+
restore-keys: |
129+
wasm32-example-webworker
130+
131+
- name: Setup | Cache | Example webworker-gloo
132+
uses: actions/cache@v2
133+
with:
134+
path: examples/webworker-gloo/target
135+
key: wasm32-example-webworker-gloo
136+
restore-keys: |
137+
wasm32-example-webworker-gloo
138+
139+
- name: Setup | Cache | Example yew
124140
uses: actions/cache@v2
125141
with:
126142
path: examples/yew/target
127-
key: wasm32-example-yew-debug-${{ hashFiles('examples/yew/Cargo.lock') }}
143+
key: wasm32-example-yew
144+
restore-keys: |
145+
wasm32-example-yew
146+
147+
- name: Setup | Cache | Example yew-tailwindcss
148+
uses: actions/cache@v2
149+
with:
150+
path: examples/yew-tailwindcss/target
151+
key: wasm32-example-yew-tailwindcss
128152
restore-keys: |
129-
wasm32-example-yew-debug-
153+
wasm32-example-yew-tailwindcss
130154
131155
- name: Setup | Rust
132156
uses: actions-rs/toolchain@v1
@@ -143,11 +167,19 @@ jobs:
143167
run: cargo run -- -h
144168

145169
# Build examples via our newly built debug artifact.
146-
- name: Build | Examples
170+
- name: Build | Examples | proxy
147171
run: ${{ matrix.binPath }} --config=examples/proxy/Trunk.toml build
148-
- name: Build | Examples
172+
- name: Build | Examples | seed
149173
run: ${{ matrix.binPath }} --config=examples/seed/Trunk.toml build
150-
- name: Build | Examples
174+
- name: Build | Examples | vanilla
151175
run: ${{ matrix.binPath }} --config=examples/vanilla/Trunk.toml build
152-
- name: Build | Examples
176+
- name: Build | Examples | webworker
177+
run: ${{ matrix.binPath }} --config=examples/webworker/Trunk.toml build
178+
- name: Build | Examples | webworker-gloo
179+
run: ${{ matrix.binPath }} --config=examples/webworker-gloo/Trunk.toml build
180+
- name: Build | Examples | yew
153181
run: ${{ matrix.binPath }} --config=examples/yew/Trunk.toml build
182+
- name: Build | Examples | yew-tailwindcss
183+
run: ${{ matrix.binPath }} --config=examples/yew-tailwindcss/Trunk.toml build
184+
- name: Build | Examples | no-rust
185+
run: ${{ matrix.binPath }} --config=examples/no-rust/Trunk.toml build

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,23 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
99
- Added `data-target-path` to `copy-dir`.
1010
- Allow processing `<script>` tags with the asset pipeline.
1111
- Added `data-loader-shim` to workers to create shim script.
12+
- Added tailwindcss support via `rel="tailwind-css"`.
13+
- Added support for `svg` files when using `rel="inline"`
14+
- Print all acessible addresses if `0.0.0.0` is used.
1215
- Added `--example` command line option to `trunk build`, `serve` and `watch`.
16+
1317
### changed
1418
- Updated gloo-worker example to use gloo-worker crate v2.1.
1519
- Our website (trunkrs.dev) now only updates on new releases.
1620
- Additional attributes are now passed through script tags (fixes #429)
1721
- Updated internal http stack to axum v0.6.0.
1822
- Updated CLI argument parser to clap v0.4.
23+
- Reduce error to warning when processing a project without Cargo.toml and no `<link rel="rust"/>` (fixes #487)
24+
1925
### fixed
2026
- Nested WS proxies - if `backend=ws://localhost:8000/ws` is set, queries for `ws://localhost:8080/ws/entityX` will be linked with `ws://localhost:8000/ws/entityX`
2127
- Updated all dependencies in both Trunk and its examples, to fix currently open security advisories for old dependencies.
28+
- Fix [trunk/issues/330](https://github.com/thedodd/trunk/issues/330), to properly handle proxy endpoint with and without a slash at the end.
2229

2330
## 0.16.0
2431
### added

0 commit comments

Comments
 (0)