Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions actix-web/clerk/backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ clerk-rs = "0.2.3"
openssl-sys = { version = "0.9.9", features = ["vendored"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
4 changes: 2 additions & 2 deletions actix-web/cookie-authentication/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
actix-identity = "0.7.1"
actix-session = { version = "0.9.0", features = ["cookie-session"] }
actix-web = "4.3.1"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions actix-web/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
actix-web = "4.3.1"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.26.0"
6 changes: 3 additions & 3 deletions actix-web/postgres/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ edition = "2021"

[dependencies]
actix-web = "4.3.1"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
serde = "1.0.148"
shuttle-shared-db = { version = "0.56.0", features = ["postgres", "sqlx"] }
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions actix-web/static-files/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2021"
[dependencies]
actix-files = "0.6.2"
actix-web = "4.3.1"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.26.0"
10 changes: 9 additions & 1 deletion actix-web/static-files/assets/index.html
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
<h1>Hello world!</h1>
<!DOCTYPE html>
<html>
<head>
<title>Static Files</title>
</head>
<body>
<p>This is an example of serving static files with Actix Web and Shuttle.</p>
</body>
</html>
4 changes: 2 additions & 2 deletions actix-web/websocket-actorless/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ futures = "0.3"
reqwest = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
shuttle-actix-web = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-actix-web = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
tracing = "0.1"
4 changes: 2 additions & 2 deletions axum/ai-assisted/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
axum = "0.8"
shuttle-axum = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.46"
4 changes: 2 additions & 2 deletions axum/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
axum = "0.8"
shuttle-axum = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
16 changes: 8 additions & 8 deletions axum/htmx-crud/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ version = "0.1.0"
edition = "2021"

[dependencies]
askama = { version = "0.12.1", features = ["with-axum"] }
askama_axum = "0.4.0"
axum = "0.7.4"
serde = { version = "1.0.189", features = ["derive"] }
serde_json = "1.0.107"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
shuttle-shared-db = { version = "0.56.0", features = ["postgres", "sqlx"] }
askama = "0.14"
askama_web = { version = "0.14", features = ["axum-0.8"] }
axum = "0.8"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.28.2"
tokio-stream = { version = "0.1.14", features = ["sync"] }
2 changes: 1 addition & 1 deletion axum/htmx-crud/src/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub fn init_router(db: PgPool) -> Router {
.route("/stream", get(routes::stream))
.route("/styles.css", get(routes::styles))
.route("/todos", get(routes::fetch_todos).post(routes::create_todo))
.route("/todos/:id", delete(routes::delete_todo))
.route("/todos/{id}", delete(routes::delete_todo))
.route("/todos/stream", get(routes::handle_stream))
.with_state(state)
.layer(Extension(tx))
Expand Down
9 changes: 5 additions & 4 deletions axum/htmx-crud/src/templates.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
use crate::models;
use askama::Template;
use askama_web::WebTemplate;

#[derive(Template)]
#[derive(Template, WebTemplate)]
#[template(path = "index.html")]
pub struct HelloTemplate;

#[derive(Template)]
#[derive(Template, WebTemplate)]
#[template(path = "stream.html")]
pub struct StreamTemplate;

#[derive(Template)]
#[derive(Template, WebTemplate)]
#[template(path = "todos.html")]
pub struct Records {
pub todos: Vec<models::Todo>,
}

#[derive(Template)]
#[derive(Template, WebTemplate)]
#[template(path = "todo.html")]
pub struct TodoNewTemplate {
pub todo: models::Todo,
Expand Down
13 changes: 6 additions & 7 deletions axum/jwt-authentication/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.3"
axum-extra = { version = "0.9.1", features = ["typed-header"] }
axum = "0.8"
axum-extra = { version = "0.10", features = ["typed-header"] }
jsonwebtoken = "8.3.0"
once_cell = "1.18.0"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.107"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
tracing-subscriber = "0.3.17"
2 changes: 0 additions & 2 deletions axum/jwt-authentication/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use axum::{
async_trait,
extract::FromRequestParts,
http::{request::Parts, StatusCode},
response::{IntoResponse, Response},
Expand Down Expand Up @@ -95,7 +94,6 @@ impl AuthBody {

// implement FromRequestParts for Claims (the JWT struct)
// FromRequestParts allows us to use Claims without consuming the request
#[async_trait]
impl<S> FromRequestParts<S> for Claims
where
S: Send + Sync,
Expand Down
6 changes: 3 additions & 3 deletions axum/metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.3"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
axum = "0.8"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
10 changes: 5 additions & 5 deletions axum/oauth2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ axum-extra = { version = "0.9.2", features = ["cookie-private"] }
chrono = { version = "0.4.35", features = ["clock"] }
oauth2 = "4.4.1"
reqwest = { version = "0.11.18", features = ["json"] }
serde = { version = "1.0.183", features = ["derive"] }
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
shuttle-shared-db = { version = "0.56.0", features = ["postgres", "sqlx"] }
serde = { version = "1", features = ["derive"] }
shuttle-axum = { version = "0.57.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres", "sqlx"] }
sqlx = { version = "0.8.2", features = ["macros", "chrono"] }
thiserror = "1.0.57"
thiserror = "2"
time = "0.3.25"
tokio = "1.28.2"
tracing = "0.1.37"
16 changes: 8 additions & 8 deletions axum/openai/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ version = "0.1.0"
edition = "2021"

[dependencies]
async-openai = "0.28.0"
async-openai = "0.29"
argon2 = "0.5.3"
axum = "0.7.4"
axum-extra = { version = "0.9.4", features = ["cookie", "cookie-private"] }
axum = "0.8"
axum-extra = { version = "0.10", features = ["cookie", "cookie-private"] }
derive_more = { version = "1.0.0", features = ["full"] }
jsonwebtoken = "9.3.0"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-openai = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-shared-db = { version = "0.56.0", features = ["postgres"] }
serde_json = "1"
shuttle-axum = "0.57.0"
shuttle-openai = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres"] }
sqlx = { version = "0.8.2", features = [
"runtime-tokio-rustls",
"postgres",
Expand Down
1 change: 0 additions & 1 deletion axum/openai/src/endpoints/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ pub struct Claims {
exp: usize,
}

#[axum::async_trait]
impl FromRequestParts<AppState> for Claims {
type Rejection = (StatusCode, String);
async fn from_request_parts(
Expand Down
5 changes: 2 additions & 3 deletions axum/openai/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ async fn main(
get(endpoints::openai::get_conversation_list),
)
.route(
"/api/chat/conversations/:id",
"/api/chat/conversations/{id}",
get(endpoints::openai::fetch_conversation_messages)
.post(endpoints::openai::send_message),
)
.route("/api/chat/create", post(endpoints::openai::create_chat))
.layer(cors)
.nest_service(
"/",
.fallback_service(
ServeDir::new("frontend/dist")
.not_found_service(ServeFile::new("frontend/dist/index.html")),
)
Expand Down
12 changes: 6 additions & 6 deletions axum/postgres/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.3"
serde = { version = "1.0.188", features = ["derive"] }
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
shuttle-shared-db = { version = "0.56.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
axum = "0.8"
serde = { version = "1", features = ["derive"] }
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres", "sqlx"] }
sqlx = "0.8"
tokio = "1.28.2"
2 changes: 1 addition & 1 deletion axum/postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async fn main(#[shuttle_shared_db::Postgres] pool: PgPool) -> shuttle_axum::Shut
let state = MyState { pool };
let router = Router::new()
.route("/todos", post(add))
.route("/todos/:id", get(retrieve))
.route("/todos/{id}", get(retrieve))
.with_state(state);

Ok(router.into())
Expand Down
8 changes: 4 additions & 4 deletions axum/qdrant/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.3"
axum = "0.8"
qdrant-client = "1.10.1"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-qdrant = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-axum = "0.57.0"
shuttle-qdrant = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions axum/static-files/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
axum = "0.8"
shuttle-axum = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
tower-http = { version = "0.6", features = ["fs"] }
6 changes: 3 additions & 3 deletions axum/todo-list/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2024"
[dependencies]
axum = "0.8"
serde = { version = "1", features = ["derive"] }
shuttle-axum = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-shared-db = { version = "0.56.0", features = ["postgres", "sqlx"] }
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-shared-db = { version = "0.57.0", features = ["postgres", "sqlx"] }
sqlx = "0.8"
tokio = "1"
tower-http = { version = "0.6", features = ["fs", "trace"] }
Expand Down
10 changes: 5 additions & 5 deletions axum/turso/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.3"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
shuttle-turso = "0.56.0"
libsql = "0.6.0"
axum = "0.8"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
shuttle-turso = "0.57.0"
libsql = "0.9"
tokio = "1.26.0"
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.99"
4 changes: 2 additions & 2 deletions axum/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ futures = "0.3.28"
reqwest = "0.12"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
shuttle-axum = "0.56.0"
shuttle-runtime = "0.56.0"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1"
tower-http = { version = "0.6", features = ["fs"] }
8 changes: 4 additions & 4 deletions bevy/hello-world/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.4"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
axum = "0.8"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
tower-http = { version = "0.5.0", features = ["fs"] }
tower-http = { version = "0.6", features = ["fs"] }
3 changes: 1 addition & 2 deletions bevy/hello-world/server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ use tower_http::services::{ServeDir, ServeFile};

#[shuttle_runtime::main]
async fn main() -> shuttle_axum::ShuttleAxum {
let router = Router::new().nest_service(
"/",
let router = Router::new().fallback_service(
ServeDir::new("assets").not_found_service(ServeFile::new("assets/index.html")),
);
Ok(router.into())
Expand Down
8 changes: 4 additions & 4 deletions custom-resource/pdo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ edition = "2021"

[dependencies]
async-trait = "0.1.56"
axum = "0.7.3"
axum = "0.8"
serde = { version = "1", features = ["derive"] }
shuttle-service = "0.56.0"
shuttle-axum = { version = "0.56.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.56.0"
shuttle-service = "0.57.0"
shuttle-axum = "0.57.0"
shuttle-runtime = "0.57.0"
tokio = "1.28.2"
2 changes: 1 addition & 1 deletion custom-service/none/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
shuttle-runtime = "0.56.0"
shuttle-runtime = "0.57.0"
tokio = "1"
Loading
Loading