Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

turbopack: Module Trait #52401

Merged
merged 10 commits into from
Jul 10, 2023
Merged

turbopack: Module Trait #52401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7cbe58
add Module trait to all modules
sokra Jul 7, 2023
345ffdb
change some return values to Modules
sokra Jul 7, 2023
41ee58f
link
sokra Jul 9, 2023
bc45345
parse middleware config from correct file
sokra Jul 10, 2023
df5254d
link
sokra Jul 10, 2023
b4e3f3e
fix warning
sokra Jul 10, 2023
6861049
rename ChunkableAsset to ChunkableModule
sokra Jul 10, 2023
24db354
link
sokra Jul 10, 2023
76b775b
update turbopack
sokra Jul 10, 2023
d153bb1
Merge branch 'canary' into sokra/module-trait
kodiakhq[bot] Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 35 additions & 35 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,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-230707.3" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230710.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-230707.3" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230710.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230707.3" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230710.2" }

# General Deps

Expand Down
9 changes: 6 additions & 3 deletions packages/next-swc/crates/next-build/src/next_pages/client_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use turbopack_binding::{
turbopack::{
core::{
asset::AssetVc,
chunk::{ChunkableAsset, ChunkingContext, ChunkingContextVc},
chunk::{ChunkableModule, ChunkingContext, ChunkingContextVc},
context::{AssetContext, AssetContextVc},
reference_type::ReferenceType,
},
Expand Down Expand Up @@ -70,8 +70,11 @@ impl PagesBuildClientContextVc {
let this = self.await?;

let client_asset_page = this.client_asset_context.process(asset, reference_type);
let client_asset_page =
create_page_loader_entry_asset(this.client_asset_context, client_asset_page, pathname);
let client_asset_page = create_page_loader_entry_asset(
this.client_asset_context,
client_asset_page.into(),
pathname,
);

let Some(client_module_asset) =
EcmascriptModuleAssetVc::resolve_from(client_asset_page).await?
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230707.3",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230710.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230710.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
8 changes: 4 additions & 4 deletions packages/next-swc/crates/next-core/src/app_render/next_server_component_transition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use anyhow::{bail, Result};
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc,
turbopack::{
core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc},
core::{compile_time_info::CompileTimeInfoVc, module::ModuleVc},
ecmascript::chunk::EcmascriptChunkPlaceableVc,
turbopack::{
module_options::ModuleOptionsContextVc,
Expand Down Expand Up @@ -55,10 +55,10 @@ impl Transition for NextServerComponentTransition {
#[turbo_tasks::function]
async fn process_module(
&self,
asset: AssetVc,
module: ModuleVc,
_context: ModuleAssetContextVc,
) -> Result<AssetVc> {
let Some(asset) = EcmascriptChunkPlaceableVc::resolve_from(asset).await? else {
) -> Result<ModuleVc> {
let Some(asset) = EcmascriptChunkPlaceableVc::resolve_from(module).await? else {
bail!("Not an ecmascript module");
};

Expand Down