Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,12 @@ serde_bytes = "0.11.15"
serde_path_to_error = "0.1.16"
serde_qs = "0.13.0"
serde_with = "3.12.0"
smallvec = { version = "1.13.1", features = [
smallvec = { version = "1.15.1", features = [
"serde",
"const_generics",
"union",
"const_new",
"impl_bincode",
] }
swc_sourcemap = "9.3.4"
strsim = "0.11.1"
Expand All @@ -484,4 +485,5 @@ inventory = "0.3.21"

[patch.crates-io]
bincode = { git = "https://github.com/bgw/bincode.git", branch = "bgw/patches" }
virtue = { git = "https://github.com/bgw/virtue.git", branch = "bgw/fix-generic-default-parsing" }
mdxjs = { git = "https://github.com/mischnic/mdxjs-rs.git", branch = "swc-core-32" }
1 change: 1 addition & 0 deletions crates/napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ ignored = [

[dependencies]
anyhow = { workspace = true }
bincode = { workspace = true }
console-subscriber = { workspace = true, optional = true }
dhat = { workspace = true, optional = true }
either = { workspace = true }
Expand Down
3 changes: 3 additions & 0 deletions crates/napi/src/next_api/project.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::{borrow::Cow, io::Write, path::PathBuf, sync::Arc, thread, time::Duration};

use anyhow::{Context, Result, anyhow, bail};
use bincode::{Decode, Encode};
use flate2::write::GzEncoder;
use futures_util::TryFutureExt;
use napi::{
Expand Down Expand Up @@ -1529,6 +1530,8 @@ pub fn project_compilation_events_subscribe(
Serialize,
TaskInput,
TraceRawVcs,
Encode,
Decode,
)]
pub struct StackFrame {
pub is_server: bool,
Expand Down
2 changes: 2 additions & 0 deletions crates/next-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ workspace = true

[dependencies]
anyhow = { workspace = true }
bincode = { workspace = true }
byteorder = { workspace = true }
either = { workspace = true }
futures = { workspace = true }
Expand All @@ -26,6 +27,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
swc_core = { workspace = true }
tracing = { workspace = true }
turbo-bincode = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true }
turbo-tasks-hash = { workspace = true }
Expand Down
19 changes: 17 additions & 2 deletions crates/next-api/src/app.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::{Context, Result, bail};
use bincode::{Decode, Encode};
use next_core::{
app_structure::{
AppPageLoaderTree, CollectedRootParams, Entrypoint as AppEntrypoint,
Expand Down Expand Up @@ -1036,13 +1037,27 @@ pub fn app_entry_point_to_route(
#[turbo_tasks::value(transparent)]
struct OutputAssetsWithAvailability((ResolvedVc<OutputAssets>, AvailabilityInfo));

#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TraceRawVcs, NonLocalValue)]
#[derive(
Copy,
Clone,
Serialize,
Deserialize,
PartialEq,
Eq,
Debug,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)]
enum AppPageEndpointType {
Html,
Rsc,
}

#[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TraceRawVcs, NonLocalValue)]
#[derive(
Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TraceRawVcs, NonLocalValue, Encode, Decode,
)]
enum AppEndpointType {
Page {
ty: AppPageEndpointType,
Expand Down
Loading
Loading