Merge branch 'canary' into fix-vary-header

vercel · Jul 17, 2023 · 705a775 · 705a775
2 parents eb88544 + dc6c22c
commit 705a775
Show file tree

Hide file tree

Showing 130 changed files with 4,391 additions and 4,245 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
 testing = { version = "0.33.20" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230713.3" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230716.2" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230713.3" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230716.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230713.3" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230716.2" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/core/tests/errors.rs b/packages/next-swc/crates/core/tests/errors.rs
@@ -5,7 +5,9 @@ use next_swc::{
     next_dynamic::next_dynamic,
     next_ssg::next_ssg,
     react_server_components::server_components,
-    server_actions::{self, server_actions},
+    server_actions::{
+        server_actions, {self},
+    },
 };
 use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};
 use turbopack_binding::swc::{

diff --git a/packages/next-swc/crates/core/tests/fixture.rs b/packages/next-swc/crates/core/tests/fixture.rs
@@ -9,7 +9,9 @@ use next_swc::{
     react_remove_properties::remove_properties,
     react_server_components::server_components,
     remove_console::remove_console,
-    server_actions::{self, server_actions},
+    server_actions::{
+        server_actions, {self},
+    },
     shake_exports::{shake_exports, Config as ShakeExportsConfig},
 };
 use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};