Merge branch 'main' into dependabot/cargo/cargo-bfefde4886

khulnasoft · Feb 4, 2025 · c4a2089 · c4a2089
2 parents c855b54 + 2aeb6c5
commit c4a2089
Show file tree

Hide file tree

Showing 33 changed files with 5,215 additions and 1,979 deletions.
diff --git a/.github/workflows/turborepo-top-issues.yml b/.github/workflows/turborepo-top-issues.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   run:
-    # if: github.repository_owner == 'vercel'
+    # if: github.repository_owner == 'khulnasoft'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/crates/turborepo-lib/build.rs b/crates/turborepo-lib/build.rs
@@ -1,29 +1,21 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let tonic_build_result = tonic_build::configure()
-        .build_server(true)
-        .file_descriptor_set_path("src/daemon/file_descriptor_set.bin")
-        .compile(
-            &["./src/daemon/proto/turbod.proto"],
-            &["./src/daemon/proto"],
-        );
+    tonic_build::configure()
+        .protoc_arg("--experimental_allow_proto3_optional")
+        .compile(&["src/daemon/proto/turbod.proto"], &["src/daemon/proto"])?;
+
     let capnpc_result = capnpc::CompilerCommand::new()
         .file("./src/hash/proto.capnp")
         .default_parent_module(vec!["hash".to_string()])
         .run();
 
     let invocation = std::env::var("RUSTC_WRAPPER").unwrap_or_default();
     if invocation.ends_with("rust-analyzer") {
-        if tonic_build_result.is_err() {
-            println!("cargo:warning=tonic_build failed, but continuing with rust-analyzer");
-        }
-
         if capnpc_result.is_err() {
             println!("cargo:warning=capnpc failed, but continuing with rust-analyzer");
         }
 
         return Ok(());
     } else {
-        tonic_build_result.expect("tonic_build command");
         capnpc_result.expect("schema compiler command");
     }
 

diff --git a/examples/with-changesets/apps/docs/package.json b/examples/with-changesets/apps/docs/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@acme/core": "workspace:*",
     "@acme/utils": "workspace:*",
-    "next": "^14.1.1",
+    "next": "^14.2.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },