Merge branch 'canary' into mischnic/self-references-tests

vercel · Aug 7, 2024 · 7a45e44 · 7a45e44
2 parents a4affd1 + 8cac0f1
commit 7a45e44
Show file tree

Hide file tree

Showing 37 changed files with 1,639 additions and 1,606 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/next-swc/.gitignore b/packages/next-swc/.gitignore
@@ -0,0 +1,2 @@
+# Ignore build artifacts
+native/*
diff --git a/packages/next-swc/native/.gitignore b/packages/next-swc/native/.gitignore
diff --git a/turbopack/crates/turbo-tasks-build/src/lib.rs b/turbopack/crates/turbo-tasks-build/src/lib.rs
@@ -55,7 +55,8 @@ pub fn generate_register() {
     if examples_dir.exists() {
         for item in read_dir(examples_dir).unwrap() {
             let item = item.unwrap();
-            if item.file_type().unwrap().is_file() {
+            let file_type = &item.file_type().unwrap();
+            if file_type.is_file() || file_type.is_symlink() {
                 let name = item.file_name();
                 let name = name.to_string_lossy();
                 if name.ends_with(".rs") {
@@ -68,7 +69,8 @@ pub fn generate_register() {
     if tests_dir.exists() {
         for item in read_dir(tests_dir).unwrap() {
             let item = item.unwrap();
-            if item.file_type().unwrap().is_file() {
+            let file_type = &item.file_type().unwrap();
+            if file_type.is_file() || file_type.is_symlink() {
                 let name = item.file_name();
                 let name = name.to_string_lossy();
                 if name.ends_with(".rs") {
@@ -80,7 +82,7 @@ pub fn generate_register() {
 
     if benches_dir.exists() {
         let bench_mod = benches_dir.join("mod.rs");
-        if bench_mod.is_file() {
+        if bench_mod.is_file() || bench_mod.is_symlink() {
             let name = bench_mod.file_name().unwrap();
             let name = name.to_string_lossy();
             if name.ends_with(".rs") {

diff --git a/turbopack/crates/turbo-tasks-fetch/Cargo.toml b/turbopack/crates/turbo-tasks-fetch/Cargo.toml
@@ -31,6 +31,7 @@ turbopack-core = { workspace = true }
 httpmock = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 turbo-tasks-testing = { workspace = true }
+turbo-tasks-memory = { workspace = true }
 
 [build-dependencies]
 turbo-tasks-build = { workspace = true }
diff --git a/turbopack/crates/turbo-tasks-fetch/tests/test_config.trs b/turbopack/crates/turbo-tasks-fetch/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_memory::MemoryBackend::new(usize::MAX))
diff --git a/turbopack/crates/turbo-tasks-macros-tests/Cargo.toml b/turbopack/crates/turbo-tasks-macros-tests/Cargo.toml
@@ -12,6 +12,7 @@ tokio = { workspace = true }
 trybuild = { version = "1.0.97" }
 turbo-tasks = { workspace = true }
 turbo-tasks-testing = { workspace = true }
+turbo-tasks-memory = { workspace = true }
 
 [build-dependencies]
 turbo-tasks-build = { workspace = true }
diff --git a/turbopack/crates/turbo-tasks-macros-tests/tests/test_config.trs b/turbopack/crates/turbo-tasks-macros-tests/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_memory::MemoryBackend::new(usize::MAX))
diff --git a/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs b/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs b/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/all_in_one.rs