[turbopack] Split IsTransient out of TaskInput trait

crates/next-api/src/next_server_nft.rs

@@ -7,7 +7,7 @@ use next_core::{get_next_package, next_server::get_tracing_compile_time_info};
 use serde_json::{Value, json};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
-    NonLocalValue, ResolvedVc, TaskInput, TryFlatJoinIterExt, TryJoinIterExt, Vc,
+    IsTransient, NonLocalValue, ResolvedVc, TaskInput, TryFlatJoinIterExt, TryJoinIterExt, Vc,
     trace::TraceRawVcs,
 };
 use turbo_tasks_fs::{
@@ -32,7 +32,17 @@ use crate::{
 };
 
 #[derive(
-    PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Hash, TaskInput, Encode, Decode,
+    PartialEq,
+    Eq,
+    TraceRawVcs,
+    NonLocalValue,
+    Debug,
+    Clone,
+    Hash,
+    TaskInput,
+    IsTransient,
+    Encode,
+    Decode,
 )]
 enum ServerNftType {
     Minimal,

crates/next-api/src/operation.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use bincode::{Decode, Encode};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
-    FxIndexMap, NonLocalValue, OperationValue, OperationVc, ResolvedVc, TaskInput, Vc,
+    FxIndexMap, IsTransient, NonLocalValue, OperationValue, OperationVc, ResolvedVc, TaskInput, Vc,
     debug::ValueDebugFormat, take_effects, trace::TraceRawVcs,
 };
 use turbopack_core::issue::CollectibleIssuesExt;
@@ -112,6 +112,7 @@ fn pick_route(entrypoints: OperationVc<Entrypoints>, key: RcStr, route: &Route)
     Debug,
     Clone,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     PartialEq,
     Eq,

crates/next-api/src/pages.rs

@@ -30,8 +30,8 @@ use next_core::{
 use tracing::Instrument;
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    Completion, FxIndexMap, NonLocalValue, ResolvedVc, TaskInput, ValueToString, Vc, fxindexmap,
-    fxindexset, trace::TraceRawVcs,
+    Completion, FxIndexMap, IsTransient, NonLocalValue, ResolvedVc, TaskInput, ValueToString, Vc,
+    fxindexmap, fxindexset, trace::TraceRawVcs,
 };
 use turbo_tasks_fs::{
     self, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
@@ -586,7 +586,18 @@ struct PageEndpoint {
 }
 
 #[derive(
-    Copy, Clone, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    Hash,
+    Debug,
+    TaskInput,
+    IsTransient,
+    TraceRawVcs,
+    NonLocalValue,
+    Encode,
+    Decode,
 )]
 enum PageEndpointType {
     Api,
@@ -598,14 +609,18 @@ enum PageEndpointType {
     SsrOnly,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, Encode, Decode)]
+#[derive(
+    Copy, Clone, PartialEq, Eq, Hash, Debug, TaskInput, IsTransient, TraceRawVcs, Encode, Decode,
+)]
 enum SsrChunkType {
     Page,
     Data,
     Api,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, Encode, Decode)]
+#[derive(
+    Copy, Clone, Debug, PartialEq, Eq, Hash, TaskInput, IsTransient, TraceRawVcs, Encode, Decode,
+)]
 enum EmitManifests {
     /// Don't emit any manifests
     None,

crates/next-api/src/project.rs

@@ -34,9 +34,9 @@ use serde::{Deserialize, Serialize};
 use tracing::{Instrument, field::Empty};
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    Completion, Completions, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ReadRef,
-    ResolvedVc, State, TaskInput, TransientInstance, TryFlatJoinIterExt, TryJoinIterExt, Vc,
-    debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs,
+    Completion, Completions, FxIndexMap, IsTransient, NonLocalValue, OperationValue, OperationVc,
+    ReadRef, ResolvedVc, State, TaskInput, TransientInstance, TryFlatJoinIterExt, TryJoinIterExt,
+    Vc, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs,
 };
 use turbo_tasks_env::{EnvMap, ProcessEnv};
 use turbo_tasks_fs::{
@@ -107,6 +107,7 @@ use crate::{
     Deserialize,
     Clone,
     TaskInput,
+    IsTransient,
     PartialEq,
     Eq,
     Hash,
@@ -131,6 +132,7 @@ pub struct DraftModeOptions {
     Copy,
     Clone,
     TaskInput,
+    IsTransient,
     PartialEq,
     Eq,
     Hash,
@@ -157,6 +159,7 @@ pub struct WatchOptions {
     Deserialize,
     Clone,
     TaskInput,
+    IsTransient,
     PartialEq,
     Eq,
     Hash,
@@ -179,6 +182,7 @@ pub struct DebugBuildPaths {
     Copy,
     Clone,
     TaskInput,
+    IsTransient,
     PartialEq,
     Eq,
     Hash,
@@ -427,6 +431,7 @@ pub struct PartialProjectOptions {
     Deserialize,
     Clone,
     TaskInput,
+    IsTransient,
     PartialEq,
     Eq,
     Hash,

crates/next-core/src/app_structure.rs

@@ -8,8 +8,9 @@ use rustc_hash::FxHashMap;
 use tracing::Instrument;
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, ValueDefault,
-    ValueToStringRef, Vc, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, turbobail,
+    FxIndexMap, FxIndexSet, IsTransient, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt,
+    ValueDefault, ValueToStringRef, Vc, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs,
+    turbobail,
 };
 use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath};
 use turbopack_core::issue::{Issue, IssueExt, IssueSeverity, IssueStage, StyledString};
@@ -85,7 +86,17 @@ pub enum MetadataWithAltItem {
 
 /// A single metadata file.
 #[derive(
-    Clone, Debug, Hash, PartialEq, Eq, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    TaskInput,
+    IsTransient,
+    TraceRawVcs,
+    NonLocalValue,
+    Encode,
+    Decode,
 )]
 pub enum MetadataItem {
     Static { path: FileSystemPath },
@@ -570,6 +581,7 @@ impl ValueDefault for FileSystemPathVec {
     ValueDebugFormat,
     Debug,
     TaskInput,
+    IsTransient,
     NonLocalValue,
     Encode,
     Decode,

crates/next-core/src/mode.rs

@@ -1,12 +1,11 @@
 use turbo_rcstr::{RcStr, rcstr};
-use turbo_tasks::TaskInput;
 use turbopack_ecmascript_runtime::RuntimeType;
 
 use crate::next_shared::webpack_rules::WebpackLoaderBuiltinCondition;
 
 /// The mode in which Next.js is running.
-#[turbo_tasks::value(shared)]
-#[derive(Debug, Copy, Clone, TaskInput, Ord, PartialOrd, Hash)]
+#[turbo_tasks::value(shared, task_input)]
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Hash)]
 pub enum NextMode {
     /// `next dev --turbopack`
     Development,

crates/next-core/src/next_app/mod.rs

@@ -14,7 +14,7 @@ use std::{
 use anyhow::{Result, bail};
 use bincode::{Decode, Encode};
 use turbo_rcstr::RcStr;
-use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
+use turbo_tasks::{IsTransient, NonLocalValue, TaskInput, trace::TraceRawVcs};
 
 pub use crate::next_app::{
     app_client_references_chunks::{ClientReferencesChunks, get_app_client_references_chunks},
@@ -34,6 +34,7 @@ pub use crate::next_app::{
     PartialOrd,
     Ord,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     NonLocalValue,
     Encode,
@@ -139,6 +140,7 @@ impl Display for PageSegment {
     PartialOrd,
     Ord,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     NonLocalValue,
     Encode,
@@ -169,6 +171,7 @@ impl Display for PageType {
     Eq,
     Default,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     NonLocalValue,
     Encode,
@@ -365,6 +368,7 @@ impl PartialOrd for AppPage {
     PartialOrd,
     Ord,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     NonLocalValue,
     Encode,
@@ -417,6 +421,7 @@ impl Display for PathSegment {
     Eq,
     Default,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     NonLocalValue,
     Encode,

crates/next-core/src/next_client/context.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeSet;
 use anyhow::Result;
 use bincode::{Decode, Encode};
 use turbo_rcstr::{RcStr, rcstr};
-use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
+use turbo_tasks::{IsTransient, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
 use turbo_tasks_fs::FileSystemPath;
 use turbopack::module_options::{
     CssOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleRule,
@@ -135,8 +135,8 @@ pub async fn get_client_compile_time_info(
     .await
 }
 
-#[turbo_tasks::value(shared)]
-#[derive(Debug, Clone, Hash, TaskInput)]
+#[turbo_tasks::value(shared, task_input)]
+#[derive(Debug, Clone, Hash)]
 pub enum ClientContextType {
     Pages { pages_dir: FileSystemPath },
     App { app_dir: FileSystemPath },
@@ -454,7 +454,9 @@ pub async fn get_client_module_options_context(
     Ok(module_options_context)
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, Encode, Decode)]
+#[derive(
+    Clone, Debug, PartialEq, Eq, Hash, TaskInput, IsTransient, TraceRawVcs, Encode, Decode,
+)]
 pub struct ClientChunkingContextOptions {
     pub mode: Vc<NextMode>,
     pub root_path: FileSystemPath,

crates/next-core/src/next_config.rs

@@ -8,8 +8,8 @@ use serde_json::Value as JsonValue;
 use turbo_esregex::EsRegex;
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    FxIndexMap, NonLocalValue, OperationValue, ResolvedVc, TaskInput, Vc, debug::ValueDebugFormat,
-    trace::TraceRawVcs,
+    FxIndexMap, IsTransient, NonLocalValue, OperationValue, ResolvedVc, TaskInput, Vc,
+    debug::ValueDebugFormat, trace::TraceRawVcs,
 };
 use turbo_tasks_env::EnvMap;
 use turbo_tasks_fetch::FetchClientConfig;
@@ -358,6 +358,7 @@ pub struct OptionOutputType(Option<OutputType>);
     Ord,
     PartialOrd,
     TaskInput,
+    IsTransient,
     TraceRawVcs,
     Serialize,
     Deserialize,

crates/next-core/src/next_edge/context.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use bincode::{Decode, Encode};
 use turbo_rcstr::{RcStr, rcstr};
-use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
+use turbo_tasks::{IsTransient, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
 use turbo_tasks_fs::FileSystemPath;
 use turbopack_browser::BrowserChunkingContext;
 use turbopack_core::{
@@ -183,7 +183,9 @@ pub async fn get_edge_resolve_options_context(
     .cell())
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, Encode, Decode)]
+#[derive(
+    Clone, Debug, PartialEq, Eq, Hash, TaskInput, IsTransient, TraceRawVcs, Encode, Decode,
+)]
 pub struct EdgeChunkingContextOptions {
     pub mode: Vc<NextMode>,
     pub root_path: FileSystemPath,

crates/next-core/src/next_font/google/options.rs

@@ -3,7 +3,8 @@ use bincode::{Decode, Encode};
 use serde::Deserialize;
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    FxIndexMap, FxIndexSet, NonLocalValue, TaskInput, Vc, fxindexset, trace::TraceRawVcs,
+    FxIndexMap, FxIndexSet, IsTransient, NonLocalValue, TaskInput, Vc, fxindexset,
+    trace::TraceRawVcs,
 };
 
 use super::request::{NextFontRequest, OneOrManyStrings};
@@ -12,8 +13,8 @@ const ALLOWED_DISPLAY_VALUES: &[&str] = &["auto", "block", "swap", "fallback", "
 
 pub(super) type FontData = FxIndexMap<RcStr, FontDataEntry>;
 
-#[turbo_tasks::value]
-#[derive(Clone, Debug, PartialOrd, Ord, Hash, TaskInput)]
+#[turbo_tasks::value(task_input)]
+#[derive(Clone, Debug, PartialOrd, Ord, Hash)]
 pub(super) struct NextFontGoogleOptions {
     /// Name of the requested font from Google. Contains literal spaces.
     pub font_family: RcStr,
@@ -56,6 +57,7 @@ impl NextFontGoogleOptions {
     TraceRawVcs,
     NonLocalValue,
     TaskInput,
+    IsTransient,
     Encode,
     Decode,
 )]