refactor(core): move bundle script to /tauri crate (#1377)

* refactor(core): move bundle script to /tauri crate

* fix(cli): clippy

* fix(core): tests

Author: lucasfernog

.changes/refactor-tauri-entry.md

@@ -3,5 +3,3 @@
 ---
 
 The Tauri script is now injected with the webview `init` API, so it is available after page changes.
-It will no longer be injected on `${distDir}/index.tauri.html`, but we will add a `${distDir}/__tauri.js` file to read it at app compile time.
-You should add that to your `.gitignore` file.

api/rollup.config.js

@@ -70,8 +70,8 @@ export default [
     output: [
       {
         name: '__TAURI__',
-        dir: 'dist/', // if it needs to run in the browser
-        entryFileNames: 'tauri.bundle.umd.js',
+        dir: '../tauri/scripts',
+        entryFileNames: 'bundle.js',
         format: 'umd',
         plugins: [
           getBabelOutputPlugin({

cli/core/build.rs

@@ -1,31 +1,13 @@
 use std::{
-  env,
   env::current_dir,
   error::Error,
-  fs::{read_to_string, File},
+  fs::File,
   io::{BufWriter, Write},
-  path::Path,
 };
 
 mod config_definition;
 
 pub fn main() -> Result<(), Box<dyn Error>> {
-  let out_dir = env::var("OUT_DIR")?;
-
-  let dest_bundle_umd_path = Path::new(&out_dir).join("tauri.bundle.umd.js");
-  let mut bundle_umd_file = BufWriter::new(File::create(&dest_bundle_umd_path)?);
-
-  let bundle_umd_path = current_dir()?.join("../../api/dist/tauri.bundle.umd.js");
-  println!("cargo:rerun-if-changed={:?}", bundle_umd_path);
-  if let Ok(bundle_umd_js) = read_to_string(bundle_umd_path) {
-    write!(bundle_umd_file, "{}", bundle_umd_js)?;
-  } else {
-    write!(
-      bundle_umd_file,
-      r#"throw new Error("you are trying to use the global Tauri script but the @tauri-apps/api package wasn't compiled; run `yarn build` first")"#
-    )?;
-  }
-
   let schema = schemars::schema_for!(config_definition::Config);
   let schema_file_path = current_dir()?.join("schema.json");
   let mut schema_file = BufWriter::new(File::create(&schema_file_path)?);

cli/core/src/build.rs

@@ -5,16 +5,10 @@ use crate::helpers::{
   config::get as get_config,
   execute_with_output,
   manifest::rewrite_manifest,
-  Logger, TauriScript,
+  Logger,
 };
 
-use std::{
-  env::set_current_dir,
-  fs::{rename, File},
-  io::Write,
-  path::PathBuf,
-  process::Command,
-};
+use std::{env::set_current_dir, fs::rename, path::PathBuf, process::Command};
 
 mod rust;
 
@@ -63,20 +57,13 @@ impl Build {
     let config_guard = config.lock().unwrap();
     let config_ = config_guard.as_ref().unwrap();
 
-    // __tauri.js
-    let tauri_script = TauriScript::new()
-      .global_tauri(config_.build.with_global_tauri)
-      .get();
     let web_asset_path = PathBuf::from(&config_.build.dist_dir);
     if !web_asset_path.exists() {
       return Err(anyhow::anyhow!(
         "Unable to find your web assets, did you forget to build your web app? Your distDir is set to \"{:?}\".",
         web_asset_path
       ));
     }
-    let tauri_script_path = web_asset_path.join("__tauri.js");
-    let mut tauri_script_file = File::create(tauri_script_path)?;
-    tauri_script_file.write_all(tauri_script.as_bytes())?;
 
     if let Some(before_build) = &config_.build.before_build_command {
       let mut cmd: Option<&str> = None;

cli/core/src/dev.rs

@@ -2,7 +2,7 @@ use crate::helpers::{
   app_paths::{app_dir, tauri_dir},
   config::{get as get_config, reload as reload_config},
   manifest::rewrite_manifest,
-  Logger, TauriScript,
+  Logger,
 };
 
 use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
@@ -12,9 +12,6 @@ use shared_child::SharedChild;
 use std::{
   env::set_current_dir,
   ffi::OsStr,
-  fs::{create_dir_all, File},
-  io::Write,
-  path::PathBuf,
   process::{exit, Child, Command},
   sync::{
     mpsc::{channel, Receiver},
@@ -102,20 +99,6 @@ impl Dev {
 
     rewrite_manifest(config.clone())?;
 
-    // __tauri.js
-    {
-      let config_guard = config.lock().unwrap();
-      let config_ = config_guard.as_ref().unwrap();
-      let tauri_script = TauriScript::new()
-        .global_tauri(config_.build.with_global_tauri)
-        .get();
-      let tauri_dir_path = PathBuf::from(&config_.build.dist_dir);
-      let tauri_script_path = tauri_dir_path.join("__tauri.js");
-      create_dir_all(tauri_dir_path)?;
-      let mut tauri_script_file = File::create(tauri_script_path)?;
-      tauri_script_file.write_all(tauri_script.as_bytes())?;
-    }
-
     let (child_wait_tx, child_wait_rx) = channel();
     let child_wait_rx = Arc::new(Mutex::new(child_wait_rx));
 

cli/core/src/helpers/mod.rs

@@ -2,10 +2,8 @@ pub mod app_paths;
 pub mod config;
 mod logger;
 pub mod manifest;
-mod tauri_entry;
 
 pub use logger::Logger;
-pub use tauri_entry::TauriScript;
 
 use std::{
   io::{BufRead, BufReader},

cli/core/src/helpers/tauri_entry.rs

@@ -1,2 +1 @@
 src-tauri
-dist/__tauri.js

cli/tauri.js/test/jest/fixtures/app/.gitignore

@@ -31,8 +31,6 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
     quote!(None)
   };
 
-  let tauri_script_path = dist_dir.join("__tauri.js").display().to_string();
-
   // double braces are purposeful to force the code into a block expression
   Ok(quote! {{
     use ::tauri::api::private::{OnceCell, AsTauriContext};
@@ -53,11 +51,6 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
           #assets
         }
 
-        /// Make the __tauri.js a dependency for the compiler
-        fn raw_tauri_script() -> &'static str {
-          include_str!(#tauri_script_path)
-        }
-
         /// Default window icon to set automatically if exists
         fn default_window_icon() -> Option<&'static [u8]> {
           #default_window_icon