Merge branch 'canary' into kdy1/ts-export-workaround

vercel · Nov 16, 2024 · e2e8286 · e2e8286
2 parents b2a111c + bcabce7
commit e2e8286
Show file tree

Hide file tree

Showing 428 changed files with 3,188 additions and 1,674 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -184,7 +184,8 @@
             "args": "all",
             "argsIgnorePattern": "^_",
             "caughtErrors": "none",
-            "ignoreRestSiblings": true
+            "ignoreRestSiblings": true,
+            "varsIgnorePattern": "^_"
           }
         ]
       }

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,6 +42,7 @@ next-custom-transforms = { path = "crates/next-custom-transforms" }
 auto-hash-map = { path = "turbopack/crates/turbo-tasks-auto-hash-map" }
 swc-ast-explorer = { path = "turbopack/crates/turbopack-swc-ast-explorer" }
 turbo-prehash = { path = "turbopack/crates/turbo-prehash" }
+turbo-rcstr = { path = "turbopack/crates/turbo-rcstr" }
 turbo-tasks-malloc = { path = "turbopack/crates/turbo-tasks-malloc", default-features = false }
 turbo-tasks = { path = "turbopack/crates/turbo-tasks" }
 turbo-tasks-backend = { path = "turbopack/crates/turbo-tasks-backend" }

diff --git a/crates/napi/Cargo.toml b/crates/napi/Cargo.toml
@@ -96,6 +96,7 @@ swc_core = { workspace = true, features = [
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 lightningcss-napi = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
+turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-memory = { workspace = true }
 turbo-tasks-backend = { workspace = true }

diff --git a/crates/napi/src/next_api/project.rs b/crates/napi/src/next_api/project.rs
@@ -23,7 +23,8 @@ use rand::Rng;
 use tokio::{io::AsyncWriteExt, time::Instant};
 use tracing::Instrument;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
-use turbo_tasks::{Completion, RcStr, ReadRef, TransientInstance, UpdateInfo, Vc};
+use turbo_rcstr::RcStr;
+use turbo_tasks::{Completion, ReadRef, TransientInstance, UpdateInfo, Vc};
 use turbo_tasks_fs::{
     util::uri_from_file, DiskFileSystem, FileContent, FileSystem, FileSystemPath,
 };

diff --git a/crates/next-api/Cargo.toml b/crates/next-api/Cargo.toml
@@ -22,6 +22,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 shadow-rs = { workspace = true }
 tracing = { workspace = true }
+turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-env = { workspace = true }
 turbo-tasks-fs = { workspace = true }