fix(cli.rs): copy resources and binaries on dev, closes #1298 (#1946)

Author: lucasfernog

.changes/bundler-not-copy-resources-outdir.md

@@ -0,0 +1,5 @@
+---
+"tauri-bundler": patch
+---
+
+The process of copying binaries and resources to `project_out_directory` was moved to the Tauri CLI.

.changes/dev-copy-resources.md

@@ -0,0 +1,5 @@
+---
+"cli.rs": patch
+---
+
+Copy resources and binaries to `OUT_DIR` on `tauri dev` command.

tooling/bundler/src/bundle.rs

@@ -73,9 +73,6 @@ pub fn bundle_project(settings: Settings) -> crate::Result<Vec<Bundle>> {
     });
   }
 
-  settings.copy_resources(settings.project_out_directory())?;
-  settings.copy_binaries(settings.project_out_directory())?;
-
   print_finished(&bundles)?;
 
   Ok(bundles)

tooling/cli.rs/src/build.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 use anyhow::Context;
-use tauri_bundler::bundle::{bundle_project, PackageType, SettingsBuilder};
+use tauri_bundler::bundle::{bundle_project, PackageType};
 
 use crate::helpers::{
   app_paths::{app_dir, tauri_dir},
@@ -16,8 +16,6 @@ use crate::helpers::{
 
 use std::{env::set_current_dir, fs::rename, path::PathBuf, process::Command};
 
-mod rust;
-
 #[derive(Default)]
 pub struct Build {
   runner: Option<String>,
@@ -124,10 +122,10 @@ impl Build {
       cargo_features.extend(features);
     }
 
-    rust::build_project(runner, &self.target, cargo_features, self.debug)
+    crate::interface::rust::build_project(runner, &self.target, cargo_features, self.debug)
       .with_context(|| "failed to build app")?;
 
-    let app_settings = rust::AppSettings::new(&config_)?;
+    let app_settings = crate::interface::rust::AppSettings::new(&config_)?;
 
     let out_dir = app_settings
       .get_out_dir(self.debug)
@@ -162,17 +160,8 @@ impl Build {
         };
         std::fs::write(out_dir.join(filename), vcruntime_msm)?;
       }
-      let mut settings_builder = SettingsBuilder::new()
-        .package_settings(app_settings.get_package_settings())
-        .bundle_settings(app_settings.get_bundle_settings(&config_, &manifest)?)
-        .binaries(app_settings.get_binaries(&config_)?)
-        .project_out_directory(out_dir);
-
-      if self.verbose {
-        settings_builder = settings_builder.verbose();
-      }
 
-      if let Some(names) = self.bundles {
+      let package_types = if let Some(names) = self.bundles {
         let mut types = vec![];
         for name in names {
           if name == "none" {
@@ -190,8 +179,7 @@ impl Build {
             }
           }
         }
-
-        settings_builder = settings_builder.package_types(types);
+        Some(types)
       } else if let Some(targets) = &config_.tauri.bundle.targets {
         let mut types = vec![];
         let targets = targets.to_vec();
@@ -209,14 +197,26 @@ impl Build {
               }
             }
           }
-          settings_builder = settings_builder.package_types(types);
+          Some(types)
+        } else {
+          None
         }
-      }
-
-      // Bundle the project
-      let settings = settings_builder
-        .build()
-        .with_context(|| "failed to build bundler settings")?;
+      } else {
+        None
+      };
+
+      let settings = crate::interface::get_bundler_settings(
+        app_settings,
+        &manifest,
+        &config_,
+        &out_dir,
+        self.verbose,
+        package_types,
+      )
+      .with_context(|| "failed to build bundler settings")?;
+
+      settings.copy_resources(&out_dir)?;
+      settings.copy_binaries(&out_dir)?;
 
       let bundles = bundle_project(settings).with_context(|| "failed to bundle project")?;
 

tooling/cli.rs/src/dev.rs

@@ -97,6 +97,27 @@ impl Dev {
     let config = get_config(merge_config.as_deref())?;
     let mut process: Arc<SharedChild>;
 
+    let (settings, out_dir) = {
+      let config_guard = config.lock().unwrap();
+      let config_ = config_guard.as_ref().unwrap();
+      let app_settings = crate::interface::rust::AppSettings::new(&config_)?;
+      let out_dir = app_settings
+        .get_out_dir(true)
+        .with_context(|| "failed to get project out directory")?;
+      let settings = crate::interface::get_bundler_settings(
+        app_settings,
+        &Default::default(),
+        &config_,
+        &out_dir,
+        false,
+        None,
+      )
+      .with_context(|| "failed to build bundler settings")?;
+      (settings, out_dir)
+    };
+    settings.copy_resources(&out_dir)?;
+    settings.copy_binaries(&out_dir)?;
+
     if let Some(before_dev) = &config
       .lock()
       .unwrap()

tooling/cli.rs/src/helpers/manifest.rs

@@ -17,6 +17,7 @@ use std::{
   path::Path,
 };
 
+#[derive(Default)]
 pub struct Manifest {
   pub features: HashSet<String>,
 }

tooling/cli.rs/src/interface/mod.rs

@@ -0,0 +1,35 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+pub mod rust;
+
+use std::path::Path;
+
+use crate::helpers::{config::Config, manifest::Manifest};
+use tauri_bundler::bundle::{PackageType, Settings, SettingsBuilder};
+
+pub fn get_bundler_settings(
+  app_settings: rust::AppSettings,
+  manifest: &Manifest,
+  config: &Config,
+  out_dir: &Path,
+  verbose: bool,
+  package_types: Option<Vec<PackageType>>,
+) -> crate::Result<Settings> {
+  let mut settings_builder = SettingsBuilder::new()
+    .package_settings(app_settings.get_package_settings())
+    .bundle_settings(app_settings.get_bundle_settings(config, manifest)?)
+    .binaries(app_settings.get_binaries(&config)?)
+    .project_out_directory(out_dir);
+
+  if verbose {
+    settings_builder = settings_builder.verbose();
+  }
+
+  if let Some(types) = package_types {
+    settings_builder = settings_builder.package_types(types);
+  }
+
+  settings_builder.build().map_err(Into::into)
+}

tooling/cli.rs/src/build/rust.rs tooling/cli.rs/src/interface/rust.rstooling/cli.rs/src/build/rust.rs renamed to tooling/cli.rs/src/interface/rust.rs

@@ -12,6 +12,7 @@ mod dev;
 mod helpers;
 mod info;
 mod init;
+mod interface;
 mod sign;
 
 // temporary fork from https://github.com/mitsuhiko/console until 0.14.1+ release