Skip to content

Commit 36b082a

Browse files
authored
ci: pull .crate file from workspace target directory (#9732)
1 parent f45d35c commit 36b082a

File tree

10 files changed

+41
-18
lines changed

10 files changed

+41
-18
lines changed

.changes/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
],
7373
"assets": [
7474
{
75-
"path": "${ pkg.path }/target/package/${ pkg.pkg }-${ pkgFile.version }.crate",
75+
"path": "./target/package/${ pkg.pkg }-${ pkgFile.version }.crate",
7676
"name": "${ pkg.pkg }-${ pkgFile.version }.crate"
7777
}
7878
]

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tooling/webdriver/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[0.1.4]
4+
5+
### New Features
6+
7+
- [`435d7513`](https://www.github.com/tauri-apps/tauri/commit/435d7513e45eab8b512e9a7e695a1adef8a98a46)([#8609](https://www.github.com/tauri-apps/tauri/pull/8609)) Added `webviewOptions` object to the `tauri:options` capability to configure the [Edge webview options](https://learn.microsoft.com/en-us/microsoft-edge/webdriver-chromium/capabilities-edge-options#webviewoptions-object) on Windows.
8+
39
## \[0.1.3]
410

511
### What's Changed

tooling/webdriver/Cargo.lock

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

tooling/webdriver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ workspace = { }
22

33
[package]
44
name = "tauri-driver"
5-
version = "0.1.3"
5+
version = "0.1.4"
66
authors = [ "Tauri Programme within The Commons Conservancy" ]
77
categories = [ "gui", "web-programming" ]
88
license = "Apache-2.0 OR MIT"

tooling/webdriver/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ native WebDriver server for you behind the scenes. It requires two separate
99
ports to be used since two distinct [WebDriver Remote Ends] run.
1010

1111
You can configure the ports used with arguments when starting the binary:
12-
* `--port` (default: `4444`)
13-
* `--native-port` (default: `4445`)
12+
13+
- `--port` (default: `4444`)
14+
- `--native-port` (default: `4445`)
1415

1516
Supported platforms:
16-
* **[pre-alpha]** Linux w/ `WebKitWebDriver`
17-
* **[pre-alpha]** Windows w/ [Microsoft Edge Driver]
18-
* **[Todo]** macOS w/ [Appium Mac2 Driver] (probably)
17+
18+
- **[pre-alpha]** Linux w/ `WebKitWebDriver`
19+
- **[pre-alpha]** Windows w/ [Microsoft Edge Driver]
20+
- **[Todo]** macOS w/ [Appium Mac2 Driver] (probably)
1921

2022
_note: the (probably) items haven't been proof-of-concept'd yet, and if it is
2123
not possible to use the listed native webdriver, then a custom implementation

tooling/webdriver/src/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
1+
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: MIT
44

tooling/webdriver/src/main.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
1+
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: MIT
44

5+
//! [![](https://github.com/tauri-apps/tauri/raw/dev/.github/splash.png)](https://tauri.app)
6+
//!
7+
//! Cross-platform WebDriver server for Tauri applications.
8+
//!
9+
//! This is a [WebDriver Intermediary Node](https://www.w3.org/TR/webdriver/#dfn-intermediary-nodes) that wraps the native WebDriver server for platforms that [Tauri](https://github.com/tauri-apps/tauri) supports. Your WebDriver client will connect to the running `tauri-driver` server, and `tauri-driver` will handle starting the native WebDriver server for you behind the scenes. It requires two separate ports to be used since two distinct [WebDriver Remote Ends](https://www.w3.org/TR/webdriver/#dfn-remote-ends) run.
10+
11+
#![doc(
12+
html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png",
13+
html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png"
14+
)]
15+
516
mod cli;
617
mod server;
718
mod webdriver;

tooling/webdriver/src/server.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
1+
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: MIT
44

@@ -20,10 +20,14 @@ type HttpClient = Client<hyper::client::HttpConnector>;
2020
const TAURI_OPTIONS: &str = "tauri:options";
2121

2222
#[derive(Debug, Deserialize)]
23+
#[serde(rename_all = "camelCase")]
2324
struct TauriOptions {
2425
application: PathBuf,
2526
#[serde(default)]
2627
args: Vec<String>,
28+
#[cfg(target_os = "windows")]
29+
#[serde(default)]
30+
webview_options: Option<Value>,
2731
}
2832

2933
impl TauriOptions {
@@ -44,7 +48,7 @@ impl TauriOptions {
4448
map.insert("browserName".into(), json!("webview2"));
4549
map.insert(
4650
"ms:edgeOptions".into(),
47-
json!({"binary": self.application, "args": self.args}),
51+
json!({"binary": self.application, "args": self.args, "webviewOptions": self.webview_options}),
4852
);
4953
map
5054
}

tooling/webdriver/src/webdriver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
1+
// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: MIT
44

0 commit comments

Comments
 (0)