fix: prettier_build unavailabe (#1410)
Co-authored-by: Evan Almloff <evanalmloff@gmail.com>
This commit is contained in:
1 parent
94f76946fc
commit
2cfa0e4ea9
4 files changed
+10
-13
No files matched your search
@@ -36,7 +36,7 @@ chrono = "0.4.19"
|
|||||||
anyhow = "1.0.53"
|
anyhow = "1.0.53"
|
||||||
hyper = "0.14.17"
|
hyper = "0.14.17"
|
||||||
hyper-rustls = "0.23.2"
|
hyper-rustls = "0.23.2"
|
||||||
indicatif = "0.17.0-rc.11"
|
indicatif = "0.17.5"
|
||||||
subprocess = "0.2.9"
|
subprocess = "0.2.9"
|
||||||
|
|
||||||
axum = { version = "0.5.1", features = ["ws", "headers"] }
|
axum = { version = "0.5.1", features = ["ws", "headers"] }
|
||||||
@@ -75,7 +75,6 @@ gitignore = "1.0.7"
|
|||||||
open = "4.1.0"
|
open = "4.1.0"
|
||||||
cargo-generate = "0.18"
|
cargo-generate = "0.18"
|
||||||
toml_edit = "0.19.11"
|
toml_edit = "0.19.11"
|
||||||
# dioxus-rsx = "0.0.1"
|
|
||||||
|
|
||||||
# bundling
|
# bundling
|
||||||
tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] }
|
tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] }
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ pub struct BuildResult {
|
|||||||
pub elapsed_time: u128,
|
pub elapsed_time: u128,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
|
pub fn build(config: &CrateConfig) -> Result<BuildResult> {
|
||||||
// [1] Build the project with cargo, generating a wasm32-unknown-unknown target (is there a more specific, better target to leverage?)
|
// [1] Build the project with cargo, generating a wasm32-unknown-unknown target (is there a more specific, better target to leverage?)
|
||||||
// [2] Generate the appropriate build folders
|
// [2] Generate the appropriate build folders
|
||||||
// [3] Wasm-bindgen the .wasm fiile, and move it into the {builddir}/modules/xxxx/xxxx_bg.wasm
|
// [3] Wasm-bindgen the .wasm fiile, and move it into the {builddir}/modules/xxxx/xxxx_bg.wasm
|
||||||
@@ -53,7 +53,8 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
|
|||||||
.arg("build")
|
.arg("build")
|
||||||
.arg("--target")
|
.arg("--target")
|
||||||
.arg("wasm32-unknown-unknown")
|
.arg("wasm32-unknown-unknown")
|
||||||
.arg("--message-format=json");
|
.arg("--message-format=json")
|
||||||
|
.arg("--quiet");
|
||||||
|
|
||||||
let cmd = if config.release {
|
let cmd = if config.release {
|
||||||
cmd.arg("--release")
|
cmd.arg("--release")
|
||||||
@@ -66,8 +67,6 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
|
|||||||
cmd
|
cmd
|
||||||
};
|
};
|
||||||
|
|
||||||
let cmd = if quiet { cmd.arg("--quiet") } else { cmd };
|
|
||||||
|
|
||||||
let cmd = if config.custom_profile.is_some() {
|
let cmd = if config.custom_profile.is_some() {
|
||||||
let custom_profile = config.custom_profile.as_ref().unwrap();
|
let custom_profile = config.custom_profile.as_ref().unwrap();
|
||||||
cmd.arg("--profile").arg(custom_profile)
|
cmd.arg("--profile").arg(custom_profile)
|
||||||
@@ -386,10 +385,9 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StopSpinOnDrop(pb.clone());
|
|
||||||
|
|
||||||
let stdout = cmd.detached().stream_stdout()?;
|
let stdout = cmd.detached().stream_stdout()?;
|
||||||
let reader = std::io::BufReader::new(stdout);
|
let reader = std::io::BufReader::new(stdout);
|
||||||
|
|
||||||
for message in cargo_metadata::Message::parse_stream(reader) {
|
for message in cargo_metadata::Message::parse_stream(reader) {
|
||||||
match message.unwrap() {
|
match message.unwrap() {
|
||||||
Message::CompilerMessage(msg) => {
|
Message::CompilerMessage(msg) => {
|
||||||
@@ -409,7 +407,7 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::CompilerArtifact(artifact) => {
|
Message::CompilerArtifact(artifact) => {
|
||||||
pb.set_message(format!("Compiling {} ", artifact.package_id));
|
pb.set_message(format!("⚙️ Compiling {} ", artifact.package_id));
|
||||||
pb.tick();
|
pb.tick();
|
||||||
}
|
}
|
||||||
Message::BuildScriptExecuted(script) => {
|
Message::BuildScriptExecuted(script) => {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ impl Build {
|
|||||||
|
|
||||||
match platform {
|
match platform {
|
||||||
Platform::Web => {
|
Platform::Web => {
|
||||||
crate::builder::build(&crate_config, false)?;
|
crate::builder::build(&crate_config)?;
|
||||||
}
|
}
|
||||||
Platform::Desktop => {
|
Platform::Desktop => {
|
||||||
crate::builder::build_desktop(&crate_config, false)?;
|
crate::builder::build_desktop(&crate_config, false)?;
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ pub async fn serve_default(
|
|||||||
config: CrateConfig,
|
config: CrateConfig,
|
||||||
start_browser: bool,
|
start_browser: bool,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let first_build_result = crate::builder::build(&config, false)?;
|
let first_build_result = crate::builder::build(&config)?;
|
||||||
|
|
||||||
log::info!("🚀 Starting development server...");
|
log::info!("🚀 Starting development server...");
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ pub async fn serve_hot_reload(
|
|||||||
config: CrateConfig,
|
config: CrateConfig,
|
||||||
start_browser: bool,
|
start_browser: bool,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let first_build_result = crate::builder::build(&config, false)?;
|
let first_build_result = crate::builder::build(&config)?;
|
||||||
|
|
||||||
log::info!("🚀 Starting development server...");
|
log::info!("🚀 Starting development server...");
|
||||||
|
|
||||||
@@ -474,7 +474,7 @@ async fn ws_handler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result<BuildResult> {
|
fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result<BuildResult> {
|
||||||
let result = builder::build(config, true)?;
|
let result = builder::build(config)?;
|
||||||
// change the websocket reload state to true;
|
// change the websocket reload state to true;
|
||||||
// the page will auto-reload.
|
// the page will auto-reload.
|
||||||
if config
|
if config
|
||||||
|
|||||||
Reference in new issue
Block a user