Unverified Commit 45576ae7 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: more tests and bugfixes for next.rs api (#53809)

### What?

* adds more HMR test cases
* fixes bugs found

### Why?

### Turbopack changes

* https://github.com/vercel/turbo/pull/5668 <!-- OJ Kwon - ci(test):
temporarily increase test timeout -->
* https://github.com/vercel/turbo/pull/5696 <!-- Tobias Koppers -
Cleanup minify -->
parent 7e165384
This diff is collapsed.
...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" } ...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
testing = { version = "0.33.21" } testing = { version = "0.33.21" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230808.2" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-230808.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230808.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
# General Deps # General Deps
......
...@@ -94,13 +94,11 @@ pub async fn endpoint_write_to_disk( ...@@ -94,13 +94,11 @@ pub async fn endpoint_write_to_disk(
#[napi(ts_return_type = "{ __napiType: \"RootTask\" }")] #[napi(ts_return_type = "{ __napiType: \"RootTask\" }")]
pub fn endpoint_changed_subscribe( pub fn endpoint_changed_subscribe(
#[napi(ts_arg_type = "{ __napiType: \"Endpoint\" }")] endpoint: External< #[napi(ts_arg_type = "{ __napiType: \"Endpoint\" }")] endpoint: External<ExternalEndpoint>,
VcArc<Vc<Box<dyn Endpoint>>>,
>,
func: JsFunction, func: JsFunction,
) -> napi::Result<External<RootTask>> { ) -> napi::Result<External<RootTask>> {
let turbo_tasks = endpoint.turbo_tasks().clone(); let turbo_tasks = endpoint.turbo_tasks().clone();
let endpoint = **endpoint; let endpoint = ***endpoint;
subscribe( subscribe(
turbo_tasks, turbo_tasks,
func, func,
...@@ -108,7 +106,7 @@ pub fn endpoint_changed_subscribe( ...@@ -108,7 +106,7 @@ pub fn endpoint_changed_subscribe(
let changed = endpoint.changed(); let changed = endpoint.changed();
let issues = get_issues(changed).await?; let issues = get_issues(changed).await?;
let diags = get_diagnostics(changed).await?; let diags = get_diagnostics(changed).await?;
changed.await?; changed.strongly_consistent().await?;
Ok((issues, diags)) Ok((issues, diags))
}, },
|ctx| { |ctx| {
......
...@@ -462,6 +462,11 @@ impl AppEndpoint { ...@@ -462,6 +462,11 @@ impl AppEndpoint {
) )
} }
#[turbo_tasks::function]
fn output_assets(self: Vc<Self>) -> Vc<OutputAssets> {
self.output().output_assets()
}
#[turbo_tasks::function] #[turbo_tasks::function]
async fn output(self: Vc<Self>) -> Result<Vc<AppEndpointOutput>> { async fn output(self: Vc<Self>) -> Result<Vc<AppEndpointOutput>> {
let this = self.await?; let this = self.await?;
...@@ -813,7 +818,9 @@ impl Endpoint for AppEndpoint { ...@@ -813,7 +818,9 @@ impl Endpoint for AppEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> {
let output = self.output(); let output = self.output();
let output_assets = output.output_assets(); // Must use self.output_assets() instead of output.output_assets() to make it a
// single operation
let output_assets = self.output_assets();
let this = self.await?; let this = self.await?;
let node_root = this.app_project.project().node_root(); let node_root = this.app_project.project().node_root();
...@@ -823,7 +830,7 @@ impl Endpoint for AppEndpoint { ...@@ -823,7 +830,7 @@ impl Endpoint for AppEndpoint {
let node_root = this.app_project.project().node_root(); let node_root = this.app_project.project().node_root();
this.app_project this.app_project
.project() .project()
.emit_all_output_assets(output_assets) .emit_all_output_assets(Vc::cell(output_assets))
.await?; .await?;
let server_paths = all_server_paths(output_assets, node_root) let server_paths = all_server_paths(output_assets, node_root)
......
...@@ -659,7 +659,7 @@ impl PageEndpoint { ...@@ -659,7 +659,7 @@ impl PageEndpoint {
this.pages_project this.pages_project
.project() .project()
.node_root() .node_root()
.join("server-data".to_string()), .join("server/data".to_string()),
this.pages_project.project().project_path(), this.pages_project.project().project_path(),
this.pages_project.ssr_data_module_context(), this.pages_project.ssr_data_module_context(),
this.pages_project.edge_ssr_data_module_context(), this.pages_project.edge_ssr_data_module_context(),
...@@ -762,6 +762,11 @@ impl PageEndpoint { ...@@ -762,6 +762,11 @@ impl PageEndpoint {
))) )))
} }
#[turbo_tasks::function]
fn output_assets(self: Vc<Self>) -> Vc<OutputAssets> {
self.output().output_assets()
}
#[turbo_tasks::function] #[turbo_tasks::function]
async fn output(self: Vc<Self>) -> Result<Vc<PageEndpointOutput>> { async fn output(self: Vc<Self>) -> Result<Vc<PageEndpointOutput>> {
let this = self.await?; let this = self.await?;
...@@ -809,13 +814,15 @@ impl Endpoint for PageEndpoint { ...@@ -809,13 +814,15 @@ impl Endpoint for PageEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> {
let output = self.output(); let output = self.output();
let output_assets = output.output_assets(); // Must use self.output_assets() instead of output.output_assets() to make it a
// single operation
let output_assets = self.output_assets();
let this = self.await?; let this = self.await?;
this.pages_project this.pages_project
.project() .project()
.emit_all_output_assets(output_assets) .emit_all_output_assets(Vc::cell(output_assets))
.await?; .await?;
let node_root = this.pages_project.project().node_root(); let node_root = this.pages_project.project().node_root();
......
...@@ -47,7 +47,7 @@ use crate::{ ...@@ -47,7 +47,7 @@ use crate::{
entrypoints::Entrypoints, entrypoints::Entrypoints,
pages::PagesProject, pages::PagesProject,
route::{Endpoint, Route}, route::{Endpoint, Route},
versioned_content_map::VersionedContentMap, versioned_content_map::{OutputAssetsOperation, VersionedContentMap},
}; };
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)]
...@@ -498,9 +498,9 @@ impl Project { ...@@ -498,9 +498,9 @@ impl Project {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn emit_all_output_assets( pub async fn emit_all_output_assets(
self: Vc<Self>, self: Vc<Self>,
output_assets: Vc<OutputAssets>, output_assets: Vc<OutputAssetsOperation>,
) -> Result<Vc<Completion>> { ) -> Result<Vc<Completion>> {
let all_output_assets = all_assets_from_entries(output_assets); let all_output_assets = all_assets_from_entries_operation(output_assets);
self.await? self.await?
.versioned_content_map .versioned_content_map
...@@ -508,7 +508,7 @@ impl Project { ...@@ -508,7 +508,7 @@ impl Project {
.await?; .await?;
Ok(emit_assets( Ok(emit_assets(
all_output_assets, *all_output_assets.await?,
self.node_root(), self.node_root(),
self.client_relative_path(), self.client_relative_path(),
self.node_root(), self.node_root(),
...@@ -575,3 +575,18 @@ impl Project { ...@@ -575,3 +575,18 @@ impl Project {
.keys_in_path(self.client_root())) .keys_in_path(self.client_root()))
} }
} }
#[turbo_tasks::function]
async fn all_assets_from_entries_operation_inner(
operation: Vc<OutputAssetsOperation>,
) -> Result<Vc<OutputAssets>> {
let assets = *operation.await?;
Vc::connect(assets);
Ok(all_assets_from_entries(assets))
}
fn all_assets_from_entries_operation(
operation: Vc<OutputAssetsOperation>,
) -> Vc<OutputAssetsOperation> {
Vc::cell(all_assets_from_entries_operation_inner(operation))
}
...@@ -11,7 +11,14 @@ use turbopack_binding::{ ...@@ -11,7 +11,14 @@ use turbopack_binding::{
}, },
}; };
type VersionedContentMapInner = HashMap<Vc<FileSystemPath>, Vc<Box<dyn VersionedContent>>>; /// An unresolved output assets operation. We need to pass an operation here as
/// it's stored for later usage and we want to reconnect this operation when
/// it's received from the map again.
#[turbo_tasks::value(transparent)]
pub struct OutputAssetsOperation(Vc<OutputAssets>);
type VersionedContentMapInner =
HashMap<Vc<FileSystemPath>, (Vc<Box<dyn VersionedContent>>, Vc<OutputAssets>)>;
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct VersionedContentMap { pub struct VersionedContentMap {
...@@ -38,8 +45,12 @@ impl VersionedContentMap { ...@@ -38,8 +45,12 @@ impl VersionedContentMap {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl VersionedContentMap { impl VersionedContentMap {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn insert_output_assets(self: Vc<Self>, assets: Vc<OutputAssets>) -> Result<()> { pub async fn insert_output_assets(
let assets = assets.await?; self: Vc<Self>,
assets_operation: Vc<OutputAssetsOperation>,
) -> Result<()> {
let assets_operation = *assets_operation.await?;
let assets = assets_operation.await?;
let entries: Vec<_> = assets let entries: Vec<_> = assets
.iter() .iter()
.map(|asset| async move { .map(|asset| async move {
...@@ -48,7 +59,7 @@ impl VersionedContentMap { ...@@ -48,7 +59,7 @@ impl VersionedContentMap {
// content. // content.
Ok(( Ok((
asset.ident().path().resolve().await?, asset.ident().path().resolve().await?,
asset.versioned_content(), (asset.versioned_content(), assets_operation),
)) ))
}) })
.try_join() .try_join()
...@@ -62,7 +73,7 @@ impl VersionedContentMap { ...@@ -62,7 +73,7 @@ impl VersionedContentMap {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get(&self, path: Vc<FileSystemPath>) -> Result<Vc<Box<dyn VersionedContent>>> { pub async fn get(&self, path: Vc<FileSystemPath>) -> Result<Vc<Box<dyn VersionedContent>>> {
let content = { let result = {
// NOTE(alexkirsz) This is to avoid Rust marking this method as !Send because a // NOTE(alexkirsz) This is to avoid Rust marking this method as !Send because a
// StateRef to the map is captured across an await boundary below, even though // StateRef to the map is captured across an await boundary below, even though
// it does not look like it would. // it does not look like it would.
...@@ -70,11 +81,12 @@ impl VersionedContentMap { ...@@ -70,11 +81,12 @@ impl VersionedContentMap {
let map = self.map.get(); let map = self.map.get();
map.get(&path).copied() map.get(&path).copied()
}; };
let Some(content) = content else { let Some((content, assets_operation)) = result else {
let path = path.to_string().await?; let path = path.to_string().await?;
bail!("could not find versioned content for path {}", path); bail!("could not find versioned content for path {}", path);
}; };
// NOTE(alexkirsz) This is necessary to mark the task as active again. // NOTE(alexkirsz) This is necessary to mark the task as active again.
Vc::connect(assets_operation);
Vc::connect(content); Vc::connect(content);
Ok(content) Ok(content)
} }
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230808.2", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -4,7 +4,7 @@ use turbo_tasks_fs::FileSystem; ...@@ -4,7 +4,7 @@ use turbo_tasks_fs::FileSystem;
use turbopack_binding::{ use turbopack_binding::{
turbo::{tasks_env::ProcessEnv, tasks_fs::FileSystemPath}, turbo::{tasks_env::ProcessEnv, tasks_fs::FileSystemPath},
turbopack::{ turbopack::{
build::BuildChunkingContext, build::{BuildChunkingContext, MinifyType},
core::{ core::{
compile_time_defines, compile_time_defines,
compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReferences}, compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReferences},
...@@ -601,5 +601,6 @@ pub fn get_server_chunking_context( ...@@ -601,5 +601,6 @@ pub fn get_server_chunking_context(
client_root.join("static/media".to_string()), client_root.join("static/media".to_string()),
environment, environment,
) )
.minify_type(MinifyType::NoMinify)
.build() .build()
} }
...@@ -1419,11 +1419,11 @@ importers: ...@@ -1419,11 +1419,11 @@ importers:
packages/next-swc/crates/next-core/js: packages/next-swc/crates/next-core/js:
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2(react-refresh@0.12.0)(webpack@5.86.0)'
'@vercel/turbopack-node': '@vercel/turbopack-node':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230808.2 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230808.2' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2'
anser: anser:
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1 version: 2.1.1
...@@ -26413,9 +26413,9 @@ packages: ...@@ -26413,9 +26413,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230808.2' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -26426,8 +26426,8 @@ packages: ...@@ -26426,8 +26426,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230808.2': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230808.2} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
...@@ -20,6 +20,10 @@ exports[`next.rs api should allow to write pages Node.js api to disk: diagnostic ...@@ -20,6 +20,10 @@ exports[`next.rs api should allow to write pages Node.js api to disk: diagnostic
exports[`next.rs api should allow to write pages Node.js api to disk: issues 1`] = `Array []`; exports[`next.rs api should allow to write pages Node.js api to disk: issues 1`] = `Array []`;
exports[`next.rs api should allow to write pages Node.js page to disk: data diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write pages Node.js page to disk: data issues 1`] = `Array []`;
exports[`next.rs api should allow to write pages Node.js page to disk: diagnostics 1`] = `Array []`; exports[`next.rs api should allow to write pages Node.js page to disk: diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write pages Node.js page to disk: issues 1`] = `Array []`; exports[`next.rs api should allow to write pages Node.js page to disk: issues 1`] = `Array []`;
...@@ -707,10 +711,18 @@ Import map: No import map entry ...@@ -707,10 +711,18 @@ Import map: No import map entry
] ]
`; `;
exports[`next.rs api should allow to write pages edge page to disk: data diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write pages edge page to disk: data issues 1`] = `Array []`;
exports[`next.rs api should allow to write pages edge page to disk: diagnostics 1`] = `Array []`; exports[`next.rs api should allow to write pages edge page to disk: diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write pages edge page to disk: issues 1`] = `Array []`; exports[`next.rs api should allow to write pages edge page to disk: issues 1`] = `Array []`;
exports[`next.rs api should allow to write root page to disk: data diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write root page to disk: data issues 1`] = `Array []`;
exports[`next.rs api should allow to write root page to disk: diagnostics 1`] = `Array []`; exports[`next.rs api should allow to write root page to disk: diagnostics 1`] = `Array []`;
exports[`next.rs api should allow to write root page to disk: issues 1`] = `Array []`; exports[`next.rs api should allow to write root page to disk: issues 1`] = `Array []`;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment