archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

track processing path for issues (vercel/turbo#205)

Browse source 
allow to attach context at any point

show processing path in output

move cli issue display into separate crate
This commit is contained in:
Tobias Koppers 2022-08-04 23:14:09 +02:00 committed by GitHub
parent 1d4821382b
commit 796f605301
2 changed files with 103 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
packages/next-swc/crates/next-dev/src/lib.rs
View file

@ -4,28 +4,19 @@
use std::{net::IpAddr, sync::Arc};
use anyhow::{anyhow, Context, Result};
use turbo_tasks::{TransientValue, TurboTasks, Value};
use anyhow::{Context, Result};
use turbo_tasks::{TransientValue, TurboTasks};
use turbo_tasks_fs::{DiskFileSystemVc, FileSystemPathVc};
use turbo_tasks_memory::MemoryBackend;
use turbopack::{ecmascript::ModuleAssetVc as EcmascriptModuleAssetVc, ModuleAssetContextVc};
use turbopack_core::{
chunk::{
dev::{DevChunkingContext, DevChunkingContextVc},
ChunkGroupVc, ChunkableAssetVc,
},
context::AssetContextVc,
environment::{BrowserEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment},
source_asset::SourceAssetVc,
};
use turbopack::ecmascript::ModuleAssetVc as EcmascriptModuleAssetVc;
use turbopack_dev_server::{
fs::DevServerFileSystemVc,
html::DevHtmlAsset,
source::{asset_graph::AssetGraphContentSourceVc, router::RouterContentSource},
DevServerListening, DevServerVc,
fs::DevServerFileSystemVc, source::router::RouterContentSource, DevServerListening, DevServerVc,
};
use self::web_entry_source::create_web_entry_source;
mod turbo_tasks_viz;
mod web_entry_source;
pub struct NextDevServerBuilder {
turbo_tasks: Option<Arc<TurboTasks<MemoryBackend>>>,
@ -95,78 +86,25 @@ impl NextDevServerBuilder {
self.project_dir.context("project_dir must be set")?,
);
let fs = disk_fs.into();
let root = FileSystemPathVc::new(fs, "");
let source_asset = SourceAssetVc::new(FileSystemPathVc::new(
let dev_server_fs = DevServerFileSystemVc::new().as_file_system();
let main_source = create_web_entry_source(
FileSystemPathVc::new(fs, ""),
FileSystemPathVc::new(
fs,
&self
.entry_asset_path
.context("entry_asset_path must be set")?,
))
.into();
let context: AssetContextVc = ModuleAssetContextVc::new(
root,
EnvironmentVc::new(
Value::new(ExecutionEnvironment::Browser(
BrowserEnvironment {
dom: true,
web_worker: false,
service_worker: false,
browser_version: 0,
}
.into(),
)),
Value::new(EnvironmentIntention::Client),
),
)
.into();
let module = context.process(source_asset);
let dev_server_fs = DevServerFileSystemVc::new().as_file_system();
let chunking_context: DevChunkingContextVc = DevChunkingContext {
context_path: root,
chunk_root_path: FileSystemPathVc::new(dev_server_fs, "/_next/chunks"),
asset_root_path: FileSystemPathVc::new(dev_server_fs, "/_next/static"),
}
.into();
let entry_asset = if let Some(ecmascript) =
EcmascriptModuleAssetVc::resolve_from(module).await?
{
let chunk = ecmascript.as_evaluated_chunk(chunking_context.into());
let chunk_group = ChunkGroupVc::from_chunk(chunk);
DevHtmlAsset {
path: FileSystemPathVc::new(dev_server_fs, "index.html"),
chunk_group,
}
.into()
} else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? {
let chunk = chunkable.as_chunk(chunking_context.into());
let chunk_group = ChunkGroupVc::from_chunk(chunk);
DevHtmlAsset {
path: FileSystemPathVc::new(dev_server_fs, "index.html"),
chunk_group,
}
.into()
} else {
// TODO convert into a serve-able asset
return Err(anyhow!(
"Entry module is not chunkable, so it can't be used to bootstrap the \
application"
));
};
let root_path = FileSystemPathVc::new(dev_server_fs, "");
let graph = if self.eager_compile {
AssetGraphContentSourceVc::new_eager(root_path, entry_asset)
} else {
AssetGraphContentSourceVc::new_lazy(root_path, entry_asset)
}
.into();
dev_server_fs,
self.eager_compile,
);
let viz = turbo_tasks_viz::TurboTasksSource {
turbo_tasks: turbo_tasks.clone(),
}
.into();
let source = RouterContentSource {
routes: vec![("__turbo_tasks__/".to_string(), viz)],
fallback: graph,
fallback: main_source,
}
.into();

84
packages/next-swc/crates/next-dev/src/web_entry_source.rs Normal file
View file

@ -0,0 +1,84 @@
use anyhow::{anyhow, Result};
use turbo_tasks::Value;
use turbo_tasks_fs::{FileSystemPathVc, FileSystemVc};
use turbopack::ModuleAssetContextVc;
use turbopack_core::{
chunk::{
dev::{DevChunkingContext, DevChunkingContextVc},
ChunkGroupVc, ChunkableAssetVc,
},
context::AssetContextVc,
environment::{BrowserEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment},
source_asset::SourceAssetVc,
};
use turbopack_dev_server::{
html::DevHtmlAsset,
source::{asset_graph::AssetGraphContentSourceVc, ContentSourceVc},
};
use crate::EcmascriptModuleAssetVc;
#[turbo_tasks::function]
pub async fn create_web_entry_source(
root: FileSystemPathVc,
entry_path: FileSystemPathVc,
dev_server_fs: FileSystemVc,
eager_compile: bool,
) -> Result<ContentSourceVc> {
let source_asset = SourceAssetVc::new(entry_path).into();
let context: AssetContextVc = ModuleAssetContextVc::new(
root,
EnvironmentVc::new(
Value::new(ExecutionEnvironment::Browser(
BrowserEnvironment {
dom: true,
web_worker: false,
service_worker: false,
browser_version: 0,
}
.into(),
)),
Value::new(EnvironmentIntention::Client),
),
)
.into();
let module = context.process(source_asset);
let chunking_context: DevChunkingContextVc = DevChunkingContext {
context_path: root,
chunk_root_path: FileSystemPathVc::new(dev_server_fs, "/_next/chunks"),
asset_root_path: FileSystemPathVc::new(dev_server_fs, "/_next/static"),
}
.into();
let entry_asset =
if let Some(ecmascript) = EcmascriptModuleAssetVc::resolve_from(module).await? {
let chunk = ecmascript.as_evaluated_chunk(chunking_context.into());
let chunk_group = ChunkGroupVc::from_chunk(chunk);
DevHtmlAsset {
path: FileSystemPathVc::new(dev_server_fs, "index.html"),
chunk_group,
}
.into()
} else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? {
let chunk = chunkable.as_chunk(chunking_context.into());
let chunk_group = ChunkGroupVc::from_chunk(chunk);
DevHtmlAsset {
path: FileSystemPathVc::new(dev_server_fs, "index.html"),
chunk_group,
}
.into()
} else {
// TODO convert into a serve-able asset
return Err(anyhow!(
"Entry module is not chunkable, so it can't be used to bootstrap the application"
));
};
let root_path = FileSystemPathVc::new(dev_server_fs, "");
let graph = if eager_compile {
AssetGraphContentSourceVc::new_eager(root_path, entry_asset)
} else {
AssetGraphContentSourceVc::new_lazy(root_path, entry_asset)
}
.into();
Ok(graph)
}