Merge branch 'master' into build-examples

trunk-rs · Apr 16, 2023 · fcdfa8e · fcdfa8e
2 parents ba5250b + cb691cc
commit fcdfa8e
Show file tree

Hide file tree

Showing 29 changed files with 1,132 additions and 475 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[registries.crates-io]
+protocol = "sparse"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,9 +14,9 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-lint-${{ hashFiles('Cargo.lock') }}
+          key: ${{ runner.os }}-lint
           restore-keys: |
-            ${{ runner.os }}-lint-
+            ${{ runner.os }}-lint
 
       - name: Setup | Toolchain (clippy)
         uses: actions-rs/toolchain@v1
@@ -54,9 +54,9 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-check-${{ hashFiles('Cargo.lock') }}
+          key: ${{ runner.os }}-check
           restore-keys: |
-            ${{ runner.os }}-check-
+            ${{ runner.os }}-check
 
       - name: Setup | Rust
         uses: actions-rs/toolchain@v1
@@ -92,41 +92,65 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
+          key: ${{ runner.os }}-cargo
           restore-keys: |
-            ${{ runner.os }}-cargo-
+            ${{ runner.os }}-cargo
 
-      - name: Setup | Cache Examples
+      - name: Setup | Cache | Example proxy
         uses: actions/cache@v2
         with:
           path: examples/proxy/target
-          key: wasm32-example-proxy-debug-${{ hashFiles('examples/proxy/Cargo.lock') }}
+          key: wasm32-example-proxy
           restore-keys: |
-            wasm32-example-proxy-debug-
+            wasm32-example-proxy
 
-      - name: Setup | Cache Examples
+      - name: Setup | Cache | Example seed
         uses: actions/cache@v2
         with:
           path: examples/seed/target
-          key: wasm32-example-seed-debug-${{ hashFiles('examples/seed/Cargo.lock') }}
+          key: wasm32-example-seed
           restore-keys: |
-            wasm32-example-seed-debug-
+            wasm32-example-seed
 
-      - name: Setup | Cache Examples
+      - name: Setup | Cache | Example vanilla
         uses: actions/cache@v2
         with:
           path: examples/vanilla/target
-          key: wasm32-example-vanilla-debug-${{ hashFiles('examples/vanilla/Cargo.lock') }}
+          key: wasm32-example-vanilla
           restore-keys: |
-            wasm32-example-vanilla-debug-
+            wasm32-example-vanilla
 
-      - name: Setup | Cache Examples
+      - name: Setup | Cache | Example webworker
+        uses: actions/cache@v2
+        with:
+          path: examples/webworker/target
+          key: wasm32-example-webworker
+          restore-keys: |
+            wasm32-example-webworker
+
+      - name: Setup | Cache | Example webworker-gloo
+        uses: actions/cache@v2
+        with:
+          path: examples/webworker-gloo/target
+          key: wasm32-example-webworker-gloo
+          restore-keys: |
+            wasm32-example-webworker-gloo
+
+      - name: Setup | Cache | Example yew
         uses: actions/cache@v2
         with:
           path: examples/yew/target
-          key: wasm32-example-yew-debug-${{ hashFiles('examples/yew/Cargo.lock') }}
+          key: wasm32-example-yew
+          restore-keys: |
+            wasm32-example-yew
+
+      - name: Setup | Cache | Example yew-tailwindcss
+        uses: actions/cache@v2
+        with:
+          path: examples/yew-tailwindcss/target
+          key: wasm32-example-yew-tailwindcss
           restore-keys: |
-            wasm32-example-yew-debug-
+            wasm32-example-yew-tailwindcss
 
       - name: Setup | Rust
         uses: actions-rs/toolchain@v1
@@ -143,11 +167,19 @@ jobs:
         run: cargo run -- -h
 
       # Build examples via our newly built debug artifact.
-      - name: Build | Examples
+      - name: Build | Examples | proxy
         run: ${{ matrix.binPath }} --config=examples/proxy/Trunk.toml build
-      - name: Build | Examples
+      - name: Build | Examples | seed
         run: ${{ matrix.binPath }} --config=examples/seed/Trunk.toml build
-      - name: Build | Examples
+      - name: Build | Examples | vanilla
         run: ${{ matrix.binPath }} --config=examples/vanilla/Trunk.toml build
-      - name: Build | Examples
+      - name: Build | Examples | webworker
+        run: ${{ matrix.binPath }} --config=examples/webworker/Trunk.toml build
+      - name: Build | Examples | webworker-gloo
+        run: ${{ matrix.binPath }} --config=examples/webworker-gloo/Trunk.toml build
+      - name: Build | Examples | yew
         run: ${{ matrix.binPath }} --config=examples/yew/Trunk.toml build
+      - name: Build | Examples | yew-tailwindcss
+        run: ${{ matrix.binPath }} --config=examples/yew-tailwindcss/Trunk.toml build
+      - name: Build | Examples | no-rust
+        run: ${{ matrix.binPath }} --config=examples/no-rust/Trunk.toml build
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,16 +9,23 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 - Added `data-target-path` to `copy-dir`.
 - Allow processing `<script>` tags with the asset pipeline.
 - Added `data-loader-shim` to workers to create shim script.
+- Added tailwindcss support via `rel="tailwind-css"`.
+- Added support for `svg` files when using `rel="inline"`
+- Print all acessible addresses if `0.0.0.0` is used.
 - Added `--example` command line option to `trunk build`, `serve` and `watch`.
+
 ### changed
 - Updated gloo-worker example to use gloo-worker crate v2.1.
 - Our website (trunkrs.dev) now only updates on new releases.
 - Additional attributes are now passed through script tags (fixes #429)
 - Updated internal http stack to axum v0.6.0.
 - Updated CLI argument parser to clap v0.4.
+- Reduce error to warning when processing a project without Cargo.toml and no `<link rel="rust"/>` (fixes #487)
+
 ### fixed
 - 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`
 - Updated all dependencies in both Trunk and its examples, to fix currently open security advisories for old dependencies.
+- Fix [trunk/issues/330](https://github.com/thedodd/trunk/issues/330), to properly handle proxy endpoint with and without a slash at the end.
 
 ## 0.16.0
 ### added