Skip to content

Commit 50556d7

Browse files
authored
Merge branch 'main' into fix-dx-serve-websocket-proxying
2 parents d42f617 + 741eb0a commit 50556d7

File tree

212 files changed

+10687
-4306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+10687
-4306
lines changed

.devcontainer/Dockerfile

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
ARG VARIANT="nightly-bookworm-slim"
22
FROM rustlang/rust:${VARIANT}
3-
ENV DEBIAN_FRONTEND noninteractive
4-
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
53

6-
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive
4+
ENV DEBIAN_FRONTEND=noninteractive
75

8-
RUN apt-get -qq install build-essential libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
6+
# Install required system libraries and NPM
7+
# Reference: https://dioxuslabs.com/learn/0.6/contributing/#before-you-contribute
8+
RUN apt-get update -qq \
9+
&& apt-get install -y -qq \
10+
libgdk3.0-cil \
11+
libatk1.0-dev \
12+
libcairo2-dev \
13+
libpango1.0-dev \
14+
libgdk-pixbuf2.0-dev \
15+
libsoup-3.0-dev \
16+
libjavascriptcoregtk-4.1-dev \
17+
libwebkit2gtk-4.1-dev \
18+
npm \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
# Set a shared folder for pre-installed browsers
22+
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
23+
24+
# Temporarily install Playwright globally to install the browsers and their dependencies
25+
RUN npm install -g @playwright/test && \
26+
npx playwright install --with-deps && \
27+
npm uninstall -g @playwright/test

.devcontainer/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ To use this dev container locally, make sure Docker is installed and in VSCode i
1919

2020
[Codespaces Setup](https://docs.github.com/en/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)
2121

22+
### Playwright Tests
23+
The dev container comes with Playwright dependencies pre-installed.
24+
You can run the tests located in `packages/playwright-tests` by using the VSCode extension or by executing commands such as:
25+
26+
```bash
27+
# Run all tests
28+
npx playwright test
29+
30+
# Run tests using the UI mode
31+
npx playwright test --ui-host=0.0.0.0
32+
```
33+
2234
## Troubleshooting
2335

2436
If having difficulty commiting with github, and you use ssh or gpg keys, you may need to ensure that the keys are being shared properly between your host and VSCode.

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"extensions": [
3131
"rust-lang.rust-analyzer",
3232
"tamasfe.even-better-toml",
33-
"serayuzgur.crates"
33+
"fill-labs.dependi",
34+
"ms-playwright.playwright"
3435
]
3536
}
3637
}

.github/workflows/main.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ env:
3939
CARGO_TERM_COLOR: always
4040
CARGO_INCREMENTAL: 0 # todo(jon): cargo-cache wipes incremental artifacts, but we eventually want to cache them
4141
RUST_BACKTRACE: 1
42-
rust_nightly: nightly-2024-10-20
42+
rust_nightly: nightly-2025-04-07
4343

4444
jobs:
4545
check-msrv:
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- uses: actions/checkout@v4
51-
- uses: dtolnay/rust-toolchain@1.84.0
51+
- uses: dtolnay/rust-toolchain@1.86.0
5252
- uses: Swatinem/rust-cache@v2
5353
with:
5454
cache-all-crates: "true"
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
7575
version: 1.0
76-
- uses: dtolnay/rust-toolchain@1.84.0
76+
- uses: dtolnay/rust-toolchain@1.86.0
7777
with:
7878
components: rustfmt, clippy
7979
- uses: Swatinem/rust-cache@v2
@@ -92,7 +92,7 @@ jobs:
9292
with:
9393
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
9494
version: 1.0
95-
- uses: dtolnay/rust-toolchain@1.84.0
95+
- uses: dtolnay/rust-toolchain@1.86.0
9696
with:
9797
components: rustfmt, clippy
9898
- uses: Swatinem/rust-cache@v2
@@ -107,7 +107,7 @@ jobs:
107107
runs-on: ubuntu-latest
108108
steps:
109109
- uses: actions/checkout@v4
110-
- uses: dtolnay/rust-toolchain@1.84.0
110+
- uses: dtolnay/rust-toolchain@1.86.0
111111
with:
112112
components: rustfmt
113113
- uses: Swatinem/rust-cache@v2
@@ -152,7 +152,7 @@ jobs:
152152
with:
153153
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
154154
version: 1.0
155-
- uses: dtolnay/rust-toolchain@1.84.0
155+
- uses: dtolnay/rust-toolchain@1.86.0
156156
- uses: Swatinem/rust-cache@v2
157157
with:
158158
cache-all-crates: "true"
@@ -168,7 +168,7 @@ jobs:
168168
with:
169169
packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
170170
version: 1.0
171-
- uses: dtolnay/rust-toolchain@1.84.0
171+
- uses: dtolnay/rust-toolchain@1.86.0
172172
with:
173173
components: rustfmt, clippy
174174
- uses: Swatinem/rust-cache@v2
@@ -237,31 +237,31 @@ jobs:
237237
- {
238238
target: aarch64-apple-darwin,
239239
os: macos-latest,
240-
toolchain: "1.84.0",
240+
toolchain: "1.86.0",
241241
cross: false,
242242
command: "test",
243243
args: "--all --tests",
244244
}
245245
- {
246246
target: x86_64-apple-darwin,
247247
os: macos-13,
248-
toolchain: "1.84.0",
248+
toolchain: "1.86.0",
249249
cross: false,
250250
command: "test",
251251
args: "--all --tests",
252252
}
253253
- {
254254
target: aarch64-apple-ios,
255255
os: macos-latest,
256-
toolchain: "1.84.0",
256+
toolchain: "1.86.0",
257257
cross: false,
258258
command: "build",
259259
args: "--package dioxus-mobile",
260260
}
261261
- {
262262
target: aarch64-linux-android,
263263
os: ubuntu-latest,
264-
toolchain: "1.84.0",
264+
toolchain: "1.86.0",
265265
cross: true,
266266
command: "build",
267267
args: "--package dioxus-mobile",
@@ -302,15 +302,7 @@ jobs:
302302
name: "cargo test | windows"
303303
steps:
304304
- uses: actions/checkout@v4
305-
- name: Create Dev Drive using ReFS
306-
run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1
307-
308-
# actions/checkout does not let us clone into anywhere outside ${{ github.workspace }}, so we have to copy the clone...
309-
- name: Copy Git Repo to Dev Drive
310-
run: |
311-
Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse
312-
313-
- uses: dtolnay/[email protected]
305+
- uses: dtolnay/[email protected]
314306
with:
315307
components: rustfmt, clippy
316308
- uses: Swatinem/rust-cache@v2
@@ -343,7 +335,7 @@ jobs:
343335
# runs-on: ubuntu-latest
344336
# steps:
345337
# - uses: actions/checkout@v4
346-
# - uses: dtolnay/rust-toolchain@1.84.0
338+
# - uses: dtolnay/rust-toolchain@1.86.0
347339
# - uses: Swatinem/rust-cache@v2
348340
# with:
349341
# cache-all-crates: "true"

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: cargo doc --no-deps --workspace --all-features
5454

5555
- name: Deploy
56-
uses: JamesIves/github-pages-deploy-action@v4.6.9
56+
uses: JamesIves/github-pages-deploy-action@v4.7.3
5757
with:
5858
branch: gh-pages
5959
folder: target/doc

.github/workflows/setup-dev-drive.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ Write-Output `
2222
"RUSTUP_HOME=$($Drive)/.rustup" `
2323
"CARGO_HOME=$($Drive)/.cargo" `
2424
"UV_WORKSPACE=$($Drive)/uv" `
25-
>> $env:GITHUB_ENV
25+
"PATH=$($Drive)/.cargo/bin;$env:PATH" `
26+
>> $env:GITHUB_ENV

0 commit comments

Comments
 (0)