chore(deps): update nextjs monorepo to v15

cuddle-empty/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-empty-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-empty-plan.git"
 
 vars:
   service: "%%name%%"
@@ -12,5 +12,5 @@ please:
     repository: "%%name%%"
     branch: main
   settings:
-    api_url: https://git.kjuulh.io  
+    api_url: https://git.front.kjuulh.io  
 

cuddle-infrastructure/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-infrastructure-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-infrastructure-plan.git"
 
 vars:
   service: "%%name%%"
@@ -13,7 +13,7 @@ vars:
 
 
 deployment:
-  registry: git@git.kjuulh.io:kjuulh/clank-clusters
+  registry: git@git.front.kjuulh.io:kjuulh/clank-clusters
   env:
     prod:
       clusters:

cuddle-leptos/Cargo.toml

@@ -9,11 +9,11 @@ lto = true
 opt-level = 'z'
 
 [workspace.dependencies]
-leptos = { version = "0.8.0", features = ["nightly"] }
+leptos = { version = "0.7.2", features = ["nightly"] }
-leptos_meta = { version = "0.8.0" }
+leptos_meta = { version = "0.7.2" }
-leptos_router = { version = "0.8.0", features = ["nightly"] }
+leptos_router = { version = "0.7.2", features = ["nightly"] }
-leptos_axum = { version = "0.8.0" }
+leptos_axum = { version = "0.7.2" }
-server_fn = { version = "0.8.0", features = [] }
+server_fn = { version = "0.7.2", features = [] }
 
 serde = { version = "1", features = ["derive"] }
 axum = "0.8"

cuddle-leptos/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-rust-leptos-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-leptos-plan.git"
 
 vars:
   service: "%%name%%"

cuddle-leptos/end2end/package-lock.json

@@ -13,12 +13,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz",
-      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
+      "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.57.0"
+        "playwright": "1.49.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -42,12 +42,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
-      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.57.0"
+        "playwright-core": "1.49.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
-      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
@@ -74,12 +74,12 @@
   },
   "dependencies": {
     "@playwright/test": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz",
-      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
+      "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==",
       "dev": true,
       "requires": {
-        "playwright": "1.57.0"
+        "playwright": "1.49.1"
       }
     },
     "fsevents": {
@@ -90,19 +90,19 @@
       "optional": true
     },
     "playwright": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
-      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
       "dev": true,
       "requires": {
         "fsevents": "2.3.2",
-        "playwright-core": "1.57.0"
+        "playwright-core": "1.49.1"
       }
     },
     "playwright-core": {
-      "version": "1.57.0",
+      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
-      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
       "dev": true
     }
   }

cuddle-node-service/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-node-service-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-node-service-plan.git"
 
 vars:
   service: "%%name%%"
@@ -13,7 +13,7 @@ vars:
 
 
 deployment:
-  registry: git@git.kjuulh.io:kjuulh/clank-clusters
+  registry: git@git.front.kjuulh.io:kjuulh/clank-clusters
   env:
     prod:
       clusters:

cuddle-node-service/package.json

@@ -9,19 +9,19 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "react": "^19.0.0",
+    "react": "^18",
-    "react-dom": "^19.0.0",
+    "react-dom": "^18",
-    "next": "16.0.7"
+    "next": "15.1.4"
   },
   "devDependencies": {
     "typescript": "^5",
-    "@types/node": "^22.0.0",
+    "@types/node": "^20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^18",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^18",
     "autoprefixer": "^10.0.1",
     "postcss": "^8",
     "tailwindcss": "^3.3.0",
     "eslint": "^8",
-    "eslint-config-next": "16.0.7"
+    "eslint-config-next": "15.1.4"
   }
 }

cuddle-node-service/yarn.lock

@@ -474,7 +474,9 @@ ast-types-flow@^0.0.8:
   integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
 autoprefixer@^10.0.1:
-  version "10.4.21"
+  version "10.4.19"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f"
+  integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==
   dependencies:
     browserslist "^4.23.0"
     caniuse-lite "^1.0.30001599"
@@ -2104,7 +2106,9 @@ postcss@8.4.31:
     source-map-js "^1.0.2"
 
 postcss@^8, postcss@^8.4.23:
-  version "8.5.6"
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.0"
@@ -2622,7 +2626,9 @@ typed-array-length@^1.0.6:
     possible-typed-array-names "^1.0.0"
 
 typescript@^5:
-  version "5.8.3"
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.4.tgz#eb2471e7b0a5f1377523700a21669dce30c2d952"
+  integrity sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

cuddle-rust-cli/crates/%%name%%/Cargo.toml

@@ -14,6 +14,6 @@ dotenv.workspace = true
 axum.workspace = true
 
 serde = { version = "1.0.197", features = ["derive"] }
-sqlx = { version = "0.8.0", features = ["runtime-tokio", "tls-rustls", "postgres", "uuid", "time"] }
+sqlx = { version = "0.7.3", features = ["runtime-tokio", "tls-rustls", "postgres", "uuid", "time"] }
 uuid = { version = "1.7.0", features = ["v4"] }
-tower-http = { version = "0.6.0", features = ["cors", "trace"] }
+tower-http = { version = "0.5.2", features = ["cors", "trace"] }

cuddle-rust-cli/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-rust-cli-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-cli-plan.git"
 
 vars:
   service: "%%name%%"
@@ -12,6 +12,6 @@ please:
     repository: "%%name%%"
     branch: "main"
   settings:
-    api_url: "https://git.kjuulh.io"
+    api_url: "https://git.front.kjuulh.io"
   actions:
     rust:

cuddle-rust-lib/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-rust-lib-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-lib-plan.git"
 
 vars:
   service: "%%name%%"
@@ -12,6 +12,6 @@ please:
     repository: "%%name%%"
     branch: main
   settings:
-    api_url: "https://git.kjuulh.io"
+    api_url: "https://git.front.kjuulh.io"
   actions:
     rust:

cuddle-rust-service/Cargo.toml

@@ -8,11 +8,7 @@ resolver = "2"
 anyhow = { version = "1" }
 tokio = { version = "1", features = ["full"] }
 tracing = { version = "0.1", features = ["log"] }
-tracing-subscriber = { version = "0.3" }
+tracing-subscriber = { version = "0.3.18" }
 clap = { version = "4", features = ["derive", "env"] }
 dotenv = { version = "0.15" }
-axum = { version = "0.8" }
+axum = { version = "0.7" }
-serde = { version = "1", features = ["derive"] }
-uuid = { version = "1", features = ["v4"] }
-tower-http = { version = "0.6", features = ["cors", "trace"] }
-notmad = "0.8"

cuddle-rust-service/crates/%%name%%/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "%%name%%"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 anyhow.workspace = true
@@ -11,7 +11,7 @@ tracing-subscriber.workspace = true
 clap.workspace = true
 dotenv.workspace = true
 axum.workspace = true
-serde.workspace = true
+
-uuid.workspace = true
+serde = { version = "1.0.197", features = ["derive"] }
-tower-http.workspace = true
+uuid = { version = "1.7.0", features = ["v4"] }
-notmad.workspace = true
+tower-http = { version = "0.5.2", features = ["cors", "trace"] }

cuddle-rust-service/crates/%%name%%/src/main.rs

@@ -1,36 +1,40 @@
-mod state {
+use std::{net::SocketAddr, ops::Deref, sync::Arc};
-    #[derive(Clone)]
-    pub struct State {}
 
-    impl State {
+use anyhow::Context;
-        pub async fn new() -> anyhow::Result<Self> {
+use axum::extract::MatchedPath;
-            Ok(Self {})
+use axum::http::Request;
-        }
+use axum::Router;
-    }
+use axum::routing::get;
+use clap::{Parser, Subcommand};
+use tower_http::trace::TraceLayer;
+
+#[derive(Parser)]
+#[command(author, version, about, long_about = None, subcommand_required = true)]
+struct Command {
+    #[command(subcommand)]
+    command: Option<Commands>,
 }
-pub use state::*;
 
-pub mod cli {
+#[derive(Subcommand)]
-    use clap::{Parser, Subcommand};
+enum Commands {
-
+    Serve {
-    use crate::{State, cli::serve::ServeCommand};
-
-    mod serve {
-        use std::net::SocketAddr;
-
-        use axum::{Router, extract::MatchedPath, http::Request, routing::get};
-        use tower_http::trace::TraceLayer;
-
-        use crate::State;
-
-        #[derive(clap::Parser)]
-        pub struct ServeCommand {
         #[arg(env = "SERVICE_HOST", long, default_value = "127.0.0.1:3000")]
         host: SocketAddr,
-        }
+    },
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    dotenv::dotenv().ok();
+    tracing_subscriber::fmt::init();
+
+    let cli = Command::parse();
+
+    if let Some(Commands::Serve { host }) = cli.command {
+        tracing::info!("Starting service");
+
+        let state = SharedState(Arc::new(State::new().await?));
 
-        impl ServeCommand {
-            pub async fn execute(&self, state: &State) -> anyhow::Result<()> {
         let app = Router::new()
             .route("/", get(root))
             .with_state(state.clone())
@@ -52,50 +56,36 @@ pub mod cli {
                 }), // ...
             );
 
-                tracing::info!("listening on {}", self.host);
+        tracing::info!("listening on {}", host);
-                let listener = tokio::net::TcpListener::bind(self.host).await.unwrap();
+        let listener = tokio::net::TcpListener::bind(host).await.unwrap();
         axum::serve(listener, app.into_make_service())
             .await
             .unwrap();
-
-                Ok(())
     }
-        }
-
-        async fn root() -> &'static str {
-            "Hello, nostore!"
-        }
-    }
-
-    #[derive(Parser)]
-    #[command(author, version, about, long_about = None, subcommand_required = true)]
-    struct Command {
-        #[command(subcommand)]
-        command: Option<Commands>,
-    }
-
-    #[derive(Subcommand)]
-    enum Commands {
-        Serve(ServeCommand),
-    }
-
-    pub async fn execute() -> anyhow::Result<()> {
-        let cli = Command::parse();
-
-        let state = State::new().await?;
-
-        match cli.command.expect("a subcommand") {
-            Commands::Serve(cmd) => cmd.execute(&state).await,
-        }
-    }
-}
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    dotenv::dotenv().ok();
-    tracing_subscriber::fmt::init();
-
-    cli::execute().await?;
 
     Ok(())
 }
+
+async fn root() -> &'static str {
+    "Hello, %%name%%!"
+}
+
+#[derive(Clone)]
+pub struct SharedState(Arc<State>);
+
+impl Deref for SharedState {
+    type Target = Arc<State>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+pub struct State {}
+
+impl State {
+    pub async fn new() -> anyhow::Result<Self> {
+        Ok(Self {})
+    }
+}
+

cuddle-rust-service/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-rust-service-plan.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-service-plan.git"
 
 vars:
   service: "%%name%%"

empty/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
 
 vars:
   service: "%%name%%"

rust-cli/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
 
 vars:
   service: "%%name%%"
@@ -12,4 +12,4 @@ please:
     repository: "%%name%%"
     branch: "main"
   settings:
-    api_url: "https://git.kjuulh.io"
+    api_url: "https://git.front.kjuulh.io"

rust-lib/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
 
 vars:
   service: "%%name%%"
@@ -12,4 +12,4 @@ please:
     repository: "%%name%%"
     branch: main
   settings:
-    api_url: "https://git.kjuulh.io"
+    api_url: "https://git.front.kjuulh.io"

rust-service/cuddle.yaml

@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
+# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
 
-base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
+base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
 
 vars:
   service: "%%name%%"