Refactor(All): Update and Format Deps for 2018 (#397)

* remove extern crate and macro_use

* fix test file

* update CLI

* organize imports

* organize core

* update api

* update updater

* update create-react-app

* update gatsby example

* update next-js example

* update svelte example

* update vanilla-js example

* update nuxt example

* update quasar example

* update vue example

* update templates.

* update build.rs

Co-authored-by: Lucas Fernandes Nogueira <lucasfernandesnog@gmail.com>

cli/tauri-bundler/Cargo.toml

@@ -23,8 +23,7 @@ libflate = "0.1"
 md5 = "0.7.0"
 msi = "0.2"
 
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 strsim = "0.10.0"
 tar = "0.4"
 target_build_utils = "0.3"

cli/tauri-bundler/src/bundle.rs

@@ -18,6 +18,7 @@ mod wix;
 
 pub use self::common::{print_error, print_finished};
 pub use self::settings::{BuildArtifact, PackageType, Settings};
+
 use std::path::PathBuf;
 
 pub fn bundle_project(settings: Settings) -> crate::Result<Vec<PathBuf>> {

cli/tauri-bundler/src/bundle/category.rs

@@ -1,5 +1,6 @@
-use serde;
 use std::fmt;
+
+use serde;
 use strsim;
 
 const CONFIDENCE_THRESHOLD: f64 = 0.8;

cli/tauri-bundler/src/bundle/common.rs

@@ -1,9 +1,12 @@
 use crate::ResultExt;
+
 use std;
 use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::{self, BufWriter, Write};
 use std::path::{Component, Path, PathBuf};
+
+use error_chain::bail;
 use term;
 use walkdir;
 

cli/tauri-bundler/src/bundle/deb_bundle.rs

@@ -20,20 +20,22 @@
 
 use super::common;
 use crate::{ResultExt, Settings};
+
 use ar;
 use icns;
 use image::png::{PNGDecoder, PNGEncoder};
 use image::{self, GenericImageView, ImageDecoder};
 use libflate::gzip;
 use md5;
+use tar;
+use walkdir::WalkDir;
+
 use std::collections::BTreeSet;
 use std::convert::TryInto;
 use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
-use tar;
-use walkdir::WalkDir;
 
 pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   let arch = match settings.binary_arch() {

cli/tauri-bundler/src/bundle/ios_bundle.rs

@@ -10,9 +10,11 @@
 
 use super::common;
 use crate::{ResultExt, Settings};
+
 use icns;
 use image::png::{PNGDecoder, PNGEncoder};
 use image::{self, GenericImageView, ImageDecoder};
+
 use std::collections::BTreeSet;
 use std::convert::TryInto;
 use std::ffi::OsStr;

cli/tauri-bundler/src/bundle/msi_bundle.rs

@@ -1,6 +1,7 @@
 use super::common;
 use super::settings::Settings;
 use super::wix;
+
 use std;
 use std::path::PathBuf;
 

cli/tauri-bundler/src/bundle/osx_bundle.rs

@@ -19,10 +19,13 @@
 
 use super::common;
 use crate::{ResultExt, Settings};
+
 use chrono;
 use dirs;
+use error_chain::bail;
 use icns;
 use image::{self, GenericImageView};
+
 use std::cmp::min;
 use std::ffi::OsStr;
 use std::fs::{self, File};
@@ -71,10 +74,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   copy_binary_to_bundle(&bundle_directory, settings)
     .chain_err(|| format!("Failed to copy binary from {:?}", settings.binary_path()))?;
 
-  create_path_hook(&bundle_directory, settings)
-    .chain_err(|| "Failed to create _boot wrapper")?;
-
-
+  create_path_hook(&bundle_directory, settings).chain_err(|| "Failed to create _boot wrapper")?;
 
   Ok(vec![app_bundle_path])
 }
@@ -87,10 +87,7 @@ fn copy_binary_to_bundle(bundle_directory: &Path, settings: &Settings) -> crate:
   )
 }
 
-fn create_path_hook(
-  bundle_dir: &Path,
-  settings: &Settings,
-) -> crate::Result<()> {
+fn create_path_hook(bundle_dir: &Path, settings: &Settings) -> crate::Result<()> {
   let file = &mut common::create_file(&bundle_dir.join("MacOS/__bootstrapper"))?;
   // Create a shell script to bootstrap the  $PATH for Tauri, so environments like node are available.
   write!(

cli/tauri-bundler/src/bundle/rpm_bundle.rs

@@ -1,4 +1,5 @@
 use crate::Settings;
+
 use std::path::PathBuf;
 
 pub fn bundle_project(_settings: &Settings) -> crate::Result<Vec<PathBuf>> {

cli/tauri-bundler/src/bundle/settings.rs

@@ -2,16 +2,19 @@ use super::category::AppCategory;
 use crate::bundle::common;
 
 use clap::ArgMatches;
+use error_chain::bail;
 use glob;
+use serde::Deserialize;
+use target_build_utils::TargetInfo;
+use tauri_utils::platform::target_triple;
+use toml;
+use walkdir;
+
 use std;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
 use std::path::{Path, PathBuf};
-use target_build_utils::TargetInfo;
-use tauri_utils::platform::target_triple;
-use toml;
-use walkdir;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum PackageType {

cli/tauri-bundler/src/bundle/wix.rs

@@ -5,15 +5,16 @@ use super::settings::Settings;
 use handlebars::{to_json, Handlebars};
 use lazy_static::lazy_static;
 use regex::Regex;
+use serde::Serialize;
 use sha2::Digest;
+use uuid::Uuid;
+use zip::ZipArchive;
 
 use std::collections::BTreeMap;
 use std::fs::{create_dir_all, remove_dir_all, write, File};
 use std::io::{BufRead, BufReader, Cursor, Read, Write};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use uuid::Uuid;
-use zip::ZipArchive;
 
 // URLS for the WIX toolchain.  Can be used for crossplatform compilation.
 pub const WIX_URL: &str =

cli/tauri-bundler/src/main.rs

@@ -1,19 +1,10 @@
-#[macro_use]
-extern crate clap;
-
-#[macro_use]
-extern crate error_chain;
-
-#[macro_use]
-extern crate serde_derive;
-
-#[cfg(test)]
-extern crate tempfile;
-
 mod bundle;
 
 use crate::bundle::{bundle_project, check_icons, BuildArtifact, PackageType, Settings};
-use clap::{App, AppSettings, Arg, SubCommand};
+
+use clap::{crate_version, App, AppSettings, Arg, SubCommand};
+use error_chain::{bail, error_chain};
+
 use std::env;
 use std::process;
 

cli/tauri.js/templates/src-tauri/Cargo.toml

@@ -13,8 +13,7 @@ build = "src/build.rs"
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = <%= tauriDep || `{ version = "0.3" }` %>
 
 [target."cfg(windows)".build-dependencies]

cli/tauri.js/templates/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

cli/tauri.js/templates/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/react/create-react-app/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/react/create-react-app/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/react/create-react-app/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/react/gatsby-themed-site/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/react/gatsby-themed-site/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/react/gatsby-themed-site/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/react/next.js/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/react/next.js/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/react/next.js/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/svelte/svelte-app/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "all-api", "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/svelte/svelte-app/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/svelte/svelte-app/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/vanillajs/monolith/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "all-api", "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/vanillajs/monolith/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/vanillajs/monolith/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/vue/nuxt-app/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "all-api", "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/vue/nuxt-app/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/vue/nuxt-app/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

examples/vue/quasar-app/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ resources = [ "resources" ]
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = [ "derive" ] }
 tauri = { path = "../../../../tauri", features = [ "all-api", "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/vue/quasar-app/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/vue/quasar-app/src-tauri/src/main.rs

@@ -5,9 +5,7 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
+use serde::Serialize;
 
 use std::io::BufRead;
 
@@ -16,14 +14,16 @@ fn main() {
     .setup(|webview, _| {
       let handle1 = webview.handle();
       std::thread::spawn(move || {
-        let resource_dir = tauri::api::platform::resource_dir().expect("failed to get resource dir");
+        let resource_dir =
+          tauri::api::platform::resource_dir().expect("failed to get resource dir");
         let node_package_path = resource_dir.join("resources/packaged-node.js");
         let stdout = std::process::Command::new("node")
-          .args(vec!(node_package_path))
+          .args(vec![node_package_path])
           .stdout(std::process::Stdio::piped())
           .spawn()
           .expect("Failed to spawn packaged node")
-          .stdout.expect("Failed to get packaged node stdout");
+          .stdout
+          .expect("Failed to get packaged node stdout");
 
         let reader = std::io::BufReader::new(stdout);
 

examples/vue/vue-cli-app/src-tauri/Cargo.toml

@@ -23,8 +23,7 @@ icon = [
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../tauri", features = [ "all-api", "edge" ] }
 
 [target."cfg(windows)".build-dependencies]

examples/vue/vue-cli-app/src-tauri/src/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

examples/vue/vue-cli-app/src-tauri/src/main.rs

@@ -5,10 +5,6 @@
 
 mod cmd;
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
 fn main() {
   tauri::AppBuilder::new()
     .invoke_handler(|_webview, arg| {

tauri-api/src/dir.rs

@@ -1,13 +1,12 @@
-use tempfile;
-
 mod utils;
+
 use ignore::Walk;
 use serde::Serialize;
-use std::fs;
-use std::fs::metadata;
+use tempfile::{self, tempdir};
+
 use utils::get_dir_name_from_path;
 
-use tempfile::tempdir;
+use std::fs::{self, metadata};
 
 #[derive(Debug, Serialize)]
 pub struct DiskEntry {
@@ -77,6 +76,7 @@ pub fn with_temp_dir<F: FnOnce(&tempfile::TempDir) -> ()>(callback: F) -> crate:
 #[cfg(test)]
 mod test {
   use super::*;
+  use quickcheck_macros::quickcheck;
   use totems::assert_ok;
 
   // check is dir function by passing in arbitrary strings

tauri-api/src/file.rs

@@ -1,9 +1,10 @@
-use std::fs;
-
 mod extract;
 mod file_move;
 
+use std::fs;
+
 use crate::{Error, ErrorKind};
+
 pub use extract::*;
 pub use file_move::*;
 

tauri-api/src/file/extract.rs

@@ -1,9 +1,8 @@
-use either;
+use either::{self, Either};
 use flate2;
 use tar;
 use zip;
 
-use either::Either;
 use std::fs;
 use std::io;
 use std::path;

tauri-api/src/lib.rs

@@ -3,12 +3,6 @@
   windows_subsystem = "windows"
 )]
 
-#[cfg(test)]
-extern crate quickcheck;
-#[cfg(test)]
-#[macro_use(quickcheck)]
-extern crate quickcheck_macros;
-
 pub mod command;
 pub mod dir;
 pub mod file;

tauri-api/src/rpc.rs

@@ -17,6 +17,7 @@ pub fn format_callback_result(
 #[cfg(test)]
 mod test {
   use crate::rpc::*;
+  use quickcheck_macros::quickcheck;
 
   // check abritrary strings in the format callback function
   #[quickcheck]

tauri-updater/src/lib.rs

@@ -1,6 +1,5 @@
 #[macro_use]
 pub mod macros;
-
 pub mod http;
 pub mod updater;
 

tauri-updater/src/updater.rs

@@ -3,6 +3,7 @@ use std::fs;
 use std::path::PathBuf;
 
 use crate::http;
+
 use tauri_api::file::{Extract, Move};
 
 pub mod github;

tauri/Cargo.toml

@@ -11,8 +11,7 @@ exclude = ["test/fixture/**"]
 
 [dependencies]
 serde_json = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 rand = "0.7"
 web-view = "0.6.0"
 tauri_includedir = "0.5.0"

tauri/build.rs

@@ -1,26 +1,24 @@
 #[cfg(not(feature = "dev-server"))]
-extern crate tauri_includedir_codegen;
-
 pub fn main() {
-  #[cfg(not(feature = "dev-server"))]
-  {
-    println!(
-      "cargo:rerun-if-changed={}",
-      std::env::var("TAURI_DIST_DIR").expect("Unable to read dist directory")
-    );
-    match std::env::var("TAURI_DIST_DIR") {
-      Ok(dist_path) => {
-        let inlined_assets = match std::env::var("TAURI_INLINED_ASSETS") {
-          Ok(assets) => assets.split("|").map(|s| s.to_string()).collect(),
-          Err(_) => Vec::new(),
-        };
-        // include assets
-        tauri_includedir_codegen::start("ASSETS")
-          .dir(dist_path, tauri_includedir_codegen::Compression::None)
-          .build("data.rs", inlined_assets)
-          .expect("failed to build data.rs")
-      }
-      Err(e) => panic!("Build error: Couldn't find ENV: {}", e),
+  println!(
+    "cargo:rerun-if-changed={}",
+    std::env::var("TAURI_DIST_DIR").expect("Unable to read dist directory")
+  );
+  match std::env::var("TAURI_DIST_DIR") {
+    Ok(dist_path) => {
+      let inlined_assets = match std::env::var("TAURI_INLINED_ASSETS") {
+        Ok(assets) => assets.split("|").map(|s| s.to_string()).collect(),
+        Err(_) => Vec::new(),
+      };
+      // include assets
+      tauri_includedir_codegen::start("ASSETS")
+        .dir(dist_path, tauri_includedir_codegen::Compression::None)
+        .build("data.rs", inlined_assets)
+        .expect("failed to build data.rs")
     }
+    Err(e) => panic!("Build error: Couldn't find ENV: {}", e),
   }
 }
+
+#[cfg(feature = "dev-server")]
+pub fn main() {}

tauri/src/config.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 use std::env;
 
 #[derive(PartialEq, Deserialize, Clone, Debug)]

tauri/src/endpoints/cmd.rs

@@ -1,3 +1,5 @@
+use serde::Deserialize;
+
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
 pub enum Cmd {

tauri/src/event.rs

@@ -2,6 +2,7 @@ use std::boxed::Box;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
+use lazy_static::lazy_static;
 use web_view::Handle;
 
 struct EventHandler {

tauri/src/lib.rs

@@ -3,41 +3,31 @@
   windows_subsystem = "windows"
 )]
 
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
-#[macro_use]
-extern crate lazy_static;
-
+#[cfg(not(feature = "dev-server"))]
+pub mod assets;
 pub mod config;
-mod endpoints;
 pub mod event;
-
 #[cfg(feature = "embedded-server")]
 pub mod server;
 
+mod app;
+mod endpoints;
 #[allow(dead_code)]
 mod file_system;
 #[allow(dead_code)]
 mod salt;
-
 #[cfg(feature = "embedded-server")]
 mod tcp;
 
-mod app;
-#[cfg(not(feature = "dev-server"))]
-pub mod assets;
-
 use std::process::Stdio;
 
-use threadpool::ThreadPool;
-
 use error_chain::error_chain;
+use threadpool::ThreadPool;
 
 pub use app::*;
 use web_view::{WebView, Handle};
 
+pub use app::*;
 pub use tauri_api as api;
 
 error_chain! {

tauri/src/salt.rs

@@ -1,4 +1,6 @@
 use std::sync::Mutex;
+
+use lazy_static::lazy_static;
 use uuid::Uuid;
 use web_view::WebView;
 

tauri/src/tcp.rs

@@ -1,7 +1,6 @@
 use std::net::TcpListener;
 
 use rand;
-
 use rand::distributions::{Distribution, Uniform};
 
 pub fn get_available_port() -> Option<u16> {