diff --git a/.github/workflows/miri.yml b/.github/workflows/miri.yml
index 73b38dec9..0146e98bc 100644
--- a/.github/workflows/miri.yml
+++ b/.github/workflows/miri.yml
@@ -6,6 +6,13 @@ on:
branches:
- 'auto'
- 'try'
+ paths:
+ - packages/**
+ - examples/**
+ - src/**
+ - .github/**
+ - lib.rs
+ - Cargo.toml
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
branches:
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 84891f403..7fe524bb3 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -4,22 +4,20 @@ on:
branches: [ main, master ]
pull_request:
branches: [ main, master ]
+defaults:
+ run:
+ working-directory: ./playwright-tests
jobs:
test:
if: github.event.pull_request.draft == false
timeout-minutes: 60
runs-on: ubuntu-20.04
steps:
+ # Do our best to cache the toolchain and node install steps
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- - name: Install dependencies
- run: npm ci
- - name: Install Playwright
- run: npm install -D @playwright/test
- - name: Install Playwright Browsers
- run: npx playwright install --with-deps
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
@@ -29,11 +27,18 @@ jobs:
- uses: Swatinem/rust-cache@v2
- name: Install WASM toolchain
run: rustup target add wasm32-unknown-unknown
- - name: Install Dioxus CLI
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: --path packages/cli
+ - name: Install dependencies
+ run: npm ci
+ - name: Install Playwright
+ run: npm install -D @playwright/test
+ - name: Install Playwright Browsers
+ run: npx playwright install --with-deps
+ # Cache the CLI by using cargo run internally
+ # - name: Install Dioxus CLI
+ # uses: actions-rs/cargo@v1
+ # with:
+ # command: install
+ # args: --path packages/cli
- name: Run Playwright tests
run: npx playwright test
- uses: actions/upload-artifact@v3
diff --git a/package-lock.json b/playwright-tests/package-lock.json
similarity index 76%
rename from package-lock.json
rename to playwright-tests/package-lock.json
index 348b505d4..4f1b932ac 100644
--- a/package-lock.json
+++ b/playwright-tests/package-lock.json
@@ -9,23 +9,23 @@
"version": "1.0.0",
"license": "ISC",
"devDependencies": {
- "@playwright/test": "^1.34.3"
+ "@playwright/test": "^1.36.1"
}
},
"node_modules/@playwright/test": {
- "version": "1.34.3",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.34.3.tgz",
- "integrity": "sha512-zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw==",
+ "version": "1.36.1",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.36.1.tgz",
+ "integrity": "sha512-YK7yGWK0N3C2QInPU6iaf/L3N95dlGdbsezLya4n0ZCh3IL7VgPGxC6Gnznh9ApWdOmkJeleT2kMTcWPRZvzqg==",
"dev": true,
"dependencies": {
"@types/node": "*",
- "playwright-core": "1.34.3"
+ "playwright-core": "1.36.1"
},
"bin": {
"playwright": "cli.js"
},
"engines": {
- "node": ">=14"
+ "node": ">=16"
},
"optionalDependencies": {
"fsevents": "2.3.2"
@@ -52,15 +52,15 @@
}
},
"node_modules/playwright-core": {
- "version": "1.34.3",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.34.3.tgz",
- "integrity": "sha512-2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw==",
+ "version": "1.36.1",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.1.tgz",
+ "integrity": "sha512-7+tmPuMcEW4xeCL9cp9KxmYpQYHKkyjwoXRnoeTowaeNat8PoBMk/HwCYhqkH2fRkshfKEOiVus/IhID2Pg8kg==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
},
"engines": {
- "node": ">=14"
+ "node": ">=16"
}
}
}
diff --git a/package.json b/playwright-tests/package.json
similarity index 90%
rename from package.json
rename to playwright-tests/package.json
index ceb38db89..31d444420 100644
--- a/package.json
+++ b/playwright-tests/package.json
@@ -12,6 +12,6 @@
"author": "",
"license": "ISC",
"devDependencies": {
- "@playwright/test": "^1.34.3"
+ "@playwright/test": "^1.36.1"
}
}
diff --git a/playwright-tests/playwright-report/index.html b/playwright-tests/playwright-report/index.html
new file mode 100644
index 000000000..71730368d
--- /dev/null
+++ b/playwright-tests/playwright-report/index.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+ Playwright Test Report
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/playwright.config.js b/playwright-tests/playwright.config.js
similarity index 89%
rename from playwright.config.js
rename to playwright-tests/playwright.config.js
index d7f019bbd..54fe810a7 100644
--- a/playwright.config.js
+++ b/playwright-tests/playwright.config.js
@@ -12,7 +12,7 @@ const path = require("path");
* @see https://playwright.dev/docs/test-configuration
*/
module.exports = defineConfig({
- testDir: "./playwright-tests",
+ testDir: ".",
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
@@ -81,16 +81,16 @@ module.exports = defineConfig({
stdout: "pipe",
},
{
- cwd: path.join(process.cwd(), "playwright-tests", "web"),
- command: "dx serve",
+ cwd: path.join(process.cwd(), "web"),
+ command: "cargo run --package dioxus-cli -- serve",
port: 8080,
timeout: 10 * 60 * 1000,
reuseExistingServer: !process.env.CI,
stdout: "pipe",
},
{
- cwd: path.join(process.cwd(), 'playwrite-tests', 'fullstack'),
- command: 'dx build --features web --release\ncargo run --release --features ssr',
+ cwd: path.join(process.cwd(), 'fullstack'),
+ command: 'cargo run --package dioxus-cli -- build --features web --release\ncargo run --release --features ssr',
port: 3333,
timeout: 10 * 60 * 1000,
reuseExistingServer: !process.env.CI,