tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-09-11 07:55:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli/dev): add --no-dev-server, ref #5708 (#5722)

Browse Source
This commit is contained in:
Amr Bashir 2022-11-30 15:34:51 +02:00 committed by GitHub
parent 04681a6b13
commit c0989848b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/cli-no-dev-server.md Normal file
View File

@ -0,0 +1,5 @@
---
"cli.rs": "patch"
---
Add `--no-dev-server` flag to the cli to disable the dev server for static files in dev mode.

47
tooling/cli/src/dev.rs
View File

@ -61,6 +61,9 @@ pub struct Options {
/// Disable the file watcher
#[clap(long)]
pub no_watch: bool,
/// Disable the dev server for static files.
#[clap(long)]
pub no_dev_server: bool,
}
pub fn command(options: Options) -> Result<()> {
@ -218,31 +221,33 @@ fn command_internal(mut options: Options) -> Result<()> {
.build
.dev_path
.clone();
if let AppUrl::Url(WindowUrl::App(path)) = &dev_path {
use crate::helpers::web_dev_server::{start_dev_server, SERVER_URL};
if path.exists() {
let path = path.canonicalize()?;
start_dev_server(path);
dev_path = AppUrl::Url(WindowUrl::External(SERVER_URL.parse().unwrap()));
if !options.no_dev_server {
if let AppUrl::Url(WindowUrl::App(path)) = &dev_path {
use crate::helpers::web_dev_server::{start_dev_server, SERVER_URL};
if path.exists() {
let path = path.canonicalize()?;
start_dev_server(path);
dev_path = AppUrl::Url(WindowUrl::External(SERVER_URL.parse().unwrap()));
// TODO: in v2, use an env var to pass the url to the app context
// or better separate the config passed from the cli internally and
// config passed by the user in `--config` into to separate env vars
// and the context merges, the user first, then the internal cli config
if let Some(c) = options.config {
let mut c: tauri_utils::config::Config = serde_json::from_str(&c)?;
c.build.dev_path = dev_path.clone();
options.config = Some(serde_json::to_string(&c).unwrap());
} else {
options.config = Some(format!(
r#"{{ "build": {{ "devPath": "{}" }} }}"#,
SERVER_URL
))
// TODO: in v2, use an env var to pass the url to the app context
// or better separate the config passed from the cli internally and
// config passed by the user in `--config` into to separate env vars
// and the context merges, the user first, then the internal cli config
if let Some(c) = options.config {
let mut c: tauri_utils::config::Config = serde_json::from_str(&c)?;
c.build.dev_path = dev_path.clone();
options.config = Some(serde_json::to_string(&c).unwrap());
} else {
options.config = Some(format!(
r#"{{ "build": {{ "devPath": "{}" }} }}"#,
SERVER_URL
))
}
}
}
}
reload_config(options.config.as_deref())?;
reload_config(options.config.as_deref())?;
}
if std::env::var_os("TAURI_SKIP_DEVSERVER_CHECK") != Some("true".into()) {
if let AppUrl::Url(WindowUrl::External(dev_server_url)) = dev_path {