8.1.0 fixes

Author: Wulf

Cargo.lock

@@ -2,7 +2,7 @@
 
 <a href="https://crates.io/crates/create-rust-app"><img src="https://img.shields.io/crates/v/create-rust-app.svg?style=for-the-badge" height="20" alt="License: MIT OR Apache-2.0" /></a>
 
-Set up a modern rust+react web app by running one command.
+Set up a modern rust+react web app by running one command. [Join us on discord](https://discord.gg/tm6Ey33ZPN).
 
 [create-rust-app.dev](https://create-rust-app.dev)
 
@@ -14,7 +14,7 @@ Set up a modern rust+react web app by running one command.
   - Instructions [here](http://diesel.rs/guides/getting-started#installing-diesel-cli)
 - Stable rust
   - ```rustup install stable``` (nightly is fine too)
-
+    
 # Install
 
 ```sh
@@ -46,6 +46,7 @@ $ create-rust-app <project_name>
   - Rust backend
     - One of the following frameworks: `actix-web`, `poem` or let us know which one you want to use!
     - Database migrations (using diesel.rs)
+      - Generate diesel structs and types by running `cargo dsync` in your project (see codegen section below).
     - Sending mail
     - PostgreSQL, SQLite 3.35+ support
     - ViteJS (blazing fast frontend compile speeds)
@@ -55,7 +56,7 @@ $ create-rust-app <project_name>
     - Automatically route to your single page application(s)
       - Use `create_rust_app::render_single_page_application("/app","your_spa.html")`
   - React frontend (or install your own framework!)
-    - Typescript, with backend type definition generation (via `tsync`)
+    - Typescript, with backend type definition generation (run `cargo tsync` in your project folder; see codegen section below)
     - Routing (via `react-router-dom`)
     - Typed `react-query` hooks generation (`$ cd my_project && create-rust-app`, then select "Generate react-query hooks")
 
@@ -109,6 +110,19 @@ $ create-rust-app <project_name>
 
 
 ### 2. Code-gen to reduce boilerplate
+
+````
+$ cargo dsync
+````
+ 
+* Run this commmand to generate diesel model structs and queries in your `backend/models` folder!
+
+```
+$ cargo tsync
+```
+
+* Run this command to generate typescript types for your rust code marked with `#[tsync::tsync]`. You'll find the output for this command here: `frontend/src/types/rust.d.ts`.
+
 ```
 $ cd my_project && create-rust-app
 ```
@@ -122,8 +136,11 @@ $ cd my_project && create-rust-app
 
 [![Gif](docs/create-rust-app-v2.gif)](https://github.com/Wulf/create-rust-app/blob/main/docs/create-rust-app-v2.mp4)
 
+* This video is a little outdated
+
 # Contributing
 
 Questions and comments are welcome in the issues section! 
 
 If you're experiencing slow compilation time, make sure there isn't any bloat in the template files (look for `node_modules` or typescript / parcel caches and delete them).
+Moreover, you can try using the [mold](https://github.com/rui314/mold) linker which may also improve compilation times.

README.md

@@ -1,7 +1,7 @@
 [package]
 name = "create-rust-app"
 description = "Set up a modern rust+react web app by running one command."
-version = "8.0.2"
+version = "8.1.0"
 edition = "2018"
 authors = ["Haris <[email protected]>"]
 readme = "../README.md"
@@ -41,7 +41,6 @@ aws-config = { optional=true, version="0.8.0" }
 aws-types = { optional=true, version="0.8.0" }
 aws-endpoint = { optional=true, version="0.8.0" }
 aws-sdk-s3 = { optional=true, version="0.8.0" }
-tokio = { optional=true, version = "1", features = ["full"] }
 futures-util = { optional=true, version="0.3.21" }
 http = { optional=true, version="0.2.6" }
 diesel_derives = { optional=true, version="1.4.1" }
@@ -72,6 +71,7 @@ env_logger = { optional=true, version= "0.9.0" }
 
 mime_guess = { optional=true, version="2.0.4" } # backend_poem, plugin_storage
 anyhow = { optional=true, version="1.0.57" } # backend_poem, plugin_auth
+tokio = { optional=true, version = "1", features = ["full"] } # backend_poem, plugin-storage
 
 [features]
 default = ["backend_actix-web", "database_postgres", "plugin_auth", "plugin_container", "plugin_dev", "plugin_graphql", "plugin_storage"]
@@ -80,7 +80,7 @@ plugin_container = []
 plugin_auth = ["anyhow", "argonautica", "jsonwebtoken", "chrono", "tsync"]
 plugin_storage = [ "aws-config", "aws-types", "aws-endpoint", "aws-sdk-s3", "tokio", "futures-util", "http", "diesel_derives", "uuid", "md5", "mime_guess", "base64" ]
 plugin_graphql = []
-backend_poem = ["poem", "anyhow", "mime_guess"]
+backend_poem = ["poem", "anyhow", "mime_guess", "tokio"]
 backend_actix-web = ["actix-web", "actix-http", "actix-files", "actix-multipart", "actix-web-httpauth","derive_more", "futures", "env_logger"]
 database_sqlite = ["diesel/sqlite"]
 database_postgres = ["diesel/postgres"]

create-rust-app/Cargo.toml

@@ -27,4 +27,8 @@ impl Database {
             pool: database_pool,
         }
     }
+
+    pub fn get_connection(&self) -> Connection {
+        self.pool.get().unwrap()
+    }
 }

create-rust-app/src/database.rs renamed to create-rust-app/src/database/mod.rs

@@ -1,4 +1,4 @@
-use http::{StatusCode, Uri};
+use poem::http::{StatusCode, Uri};
 use poem::middleware::{AddData, AddDataEndpoint};
 use poem::web::Data;
 use poem::{handler, Body, EndpointExt, IntoResponse, Response, Route};

create-rust-app/src/util/poem_utils.rs

@@ -1,7 +1,7 @@
 [package]
 name = "create-rust-app_cli"
 description = "Set up a modern rust+react web app by running one command."
-version = "8.0.2"
+version = "8.1.0"
 authors = ["Haris <[email protected]>"]
 edition = "2018"
 readme = "../README.md"
@@ -20,7 +20,7 @@ indoc = "1.0.3"
 rust-embed = "5.9.0"
 structopt = "0.3.22"
 toml = "0.5.8"
-tsync = "1.2.1"
+tsync = "1"
 
 # check cli version
 update-informer = "0.5.0"

create-rust-app_cli/Cargo.toml

@@ -0,0 +1,26 @@
+FROM rust:alpine
+
+RUN apt-get update -y
+RUN apt-get install -y nodejs npm
+
+RUN npm i -g yarn
+RUN cargo install diesel_cli --no-default-features --features
+RUN cargo install tsync
+
+# You can remove the next RUN step if you're not using the Create Rust App 'auth' plugin
+# For the argonautica crate, we need to install LLVM/Clang v3.9 or higher
+RUN apt-get install -y clang llvm-dev libclang-dev
+
+# Since the official rust image doesn't have nightly variants, we're going to install it ourselves
+# This will make the image bigger than it needs to be -- you can try using another image if this is important to you
+RUN rustup update nightly;
+RUN rustup default nightly;
+
+WORKDIR /app
+COPY . .
+
+RUN cargo build --release
+
+EXPOSE 3000
+
+CMD ["cargo", "run", "--release"]

create-rust-app_cli/images/actixweb_postgres.docker

@@ -41,7 +41,7 @@ struct Asset;
 //     version.to_string()
 // }
 fn get_current_cra_lib_version() -> String {
-    "8.0.2".to_string()
+    "8".to_string()
 }
 
 fn add_bins_to_cargo_toml(project_dir: &std::path::PathBuf) -> Result<(), std::io::Error> {
@@ -87,6 +87,10 @@ path = ".cargo/bin/fullstack.rs"
 name = "tsync"
 path = ".cargo/bin/tsync.rs"
 
+[[bin]]
+name = "dsync"
+path = ".cargo/bin/dsync.rs"
+
 [[bin]]
 name = "{project_name}"
 path = "backend/main.rs"
@@ -344,7 +348,9 @@ pub fn create(project_name: &str, creation_options: CreationOptions) -> Result<(
         "chrono",
         r#"chrono = { version = "0.4.19", features = ["serde"] }"#,
     )?;
-    add_dependency(&project_dir, "tsync", r#"tsync = "1.2.1""#)?;
+    // todo: move these deps to the helper crate (./create-rust-app/Cargo.toml) behind feature flags
+    add_dependency(&project_dir, "tsync", r#"tsync = "1""#)?;
+    add_dependency(&project_dir, "dsync", r#"dsync = "0""#)?;
     add_dependency(
         &project_dir,
         "diesel",
@@ -418,6 +424,37 @@ pub fn create(project_name: &str, creation_options: CreationOptions) -> Result<(
         std::fs::write(env_file, contents.clone())?;
     }
 
+    /*
+        Initial code gen (dsync, tsync)
+    */
+    logger::command_msg("cargo dsync");
+
+    let cargo_dsync = std::process::Command::new("cargo")
+        .current_dir(&project_dir)
+        .arg("dsync")
+        .stdout(std::process::Stdio::null())
+        .status()
+        .expect("failed to execute process");
+
+    if !cargo_dsync.success() {
+        logger::error("failed to execute process");
+        std::process::exit(1);
+    }
+
+    logger::command_msg("cargo tsync");
+
+    let cargo_tsync = std::process::Command::new("cargo")
+        .current_dir(&project_dir)
+        .arg("tsync")
+        .stdout(std::process::Stdio::null())
+        .status()
+        .expect("failed to execute process");
+
+    if !cargo_tsync.success() {
+        logger::error("failed to execute process");
+        std::process::exit(1);
+    }
+
     /*
         Finalize; create the initial commit.
     */