Merge branch 'canary' into loose-rsc-error-lint

vercel · Oct 5, 2023 · 18bfc3d · 18bfc3d
2 parents 8262d9e + 35e4539
commit 18bfc3d
Show file tree

Hide file tree

Showing 35 changed files with 797 additions and 621 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -28,13 +28,13 @@
 
 # Tooling & Telemetry
 
-/packages/next/src/build/                                @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
-/packages/next/src/server/lib/router-utils/setup-dev.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
-/packages/next/src/telemetry/                            @timneutkens @ijjk @shuding @padmaia
-/packages/next-swc/                                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.toml                                               @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.lock                                               @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.cargo/config.toml                                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.config/nextest.toml                                    @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/build-turbopack-tests-manifest.js                  @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/turbopack-tests-manifest.json                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/packages/next/src/build/                                        @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
+/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
+/packages/next/src/telemetry/                                    @timneutkens @ijjk @shuding @padmaia
+/packages/next-swc/                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+Cargo.toml                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/test/build-turbopack-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/test/turbopack-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [
 testing = { version = "0.34.1" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231002.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.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-231002.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231002.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.2" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-api/src/app.rs b/packages/next-swc/crates/next-api/src/app.rs
@@ -39,7 +39,7 @@ use turbopack_binding::{
     turbopack::{
         core::{
             asset::{Asset, AssetContent},
-            chunk::{ChunkableModule, ChunkingContext, EvaluatableAssets},
+            chunk::{ChunkableModuleExt, ChunkingContext, EvaluatableAssets},
             file_source::FileSource,
             output::{OutputAsset, OutputAssets},
             virtual_output::VirtualOutputAsset,

diff --git a/packages/next-swc/crates/next-api/src/middleware.rs b/packages/next-swc/crates/next-api/src/middleware.rs
@@ -13,7 +13,7 @@ use turbopack_binding::{
     turbopack::{
         core::{
             asset::AssetContent,
-            chunk::{ChunkableModule, ChunkingContext},
+            chunk::{ChunkableModuleExt, ChunkingContext},
             context::AssetContext,
             module::Module,
             output::{OutputAsset, OutputAssets},

diff --git a/packages/next-swc/crates/next-api/src/pages.rs b/packages/next-swc/crates/next-api/src/pages.rs
@@ -37,7 +37,7 @@ use turbopack_binding::{
         build::BuildChunkingContext,
         core::{
             asset::AssetContent,
-            chunk::{ChunkableModule, ChunkingContext, EvaluatableAssets},
+            chunk::{ChunkableModuleExt, ChunkingContext, EvaluatableAssets},
             context::AssetContext,
             file_source::FileSource,
             issue::{IssueSeverity, OptionIssueSource},

diff --git a/packages/next-swc/crates/next-api/src/server_actions.rs b/packages/next-swc/crates/next-api/src/server_actions.rs
@@ -16,13 +16,18 @@ use turbopack_binding::{
     turbo::tasks_fs::{rope::RopeBuilder, File, FileSystemPath},
     turbopack::{
         core::{
-            asset::AssetContent, chunk::EvaluatableAsset, context::AssetContext, module::Module,
-            output::OutputAsset, reference::primary_referenced_modules,
-            reference_type::ReferenceType, virtual_output::VirtualOutputAsset,
+            asset::AssetContent,
+            chunk::{ChunkItemExt, ChunkableModule, EvaluatableAsset},
+            context::AssetContext,
+            module::Module,
+            output::OutputAsset,
+            reference::primary_referenced_modules,
+            reference_type::ReferenceType,
+            virtual_output::VirtualOutputAsset,
             virtual_source::VirtualSource,
         },
         ecmascript::{
-            chunk::{EcmascriptChunkItemExt, EcmascriptChunkPlaceable, EcmascriptChunkingContext},
+            chunk::{EcmascriptChunkPlaceable, EcmascriptChunkingContext},
             parse::ParseResult,
             EcmascriptModuleAsset,
         },
@@ -72,7 +77,10 @@ pub(crate) async fn create_server_actions_manifest(
         bail!("loader module must be evaluatable");
     };
 
-    let loader_id = loader.as_chunk_item(chunking_context).id().to_string();
+    let loader_id = loader
+        .as_chunk_item(Vc::upcast(chunking_context))
+        .id()
+        .to_string();
     let manifest =
         build_manifest(node_root, pathname, page_name, runtime, actions, loader_id).await?;
     Ok((Some(evaluable), manifest))