Unverified Commit b3a994da authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

update turbopack (#67874)

* https://github.com/vercel/turbo/pull/8767 <!-- Niklas Mischkulnig -
Update Turbopack members in labeler -->
* https://github.com/vercel/turbo/pull/8722 <!-- Niklas Mischkulnig -
Use fs and vm for async chunk loading in Node -->
* https://github.com/vercel/turbo/pull/8758 <!-- Benjamin Woodruff -
Remove unused instant return value from `CaptureFuture` -->
* https://github.com/vercel/turbo/pull/8760 <!-- Benjamin Woodruff -
Delete dead raw_vc_set module -->
* https://github.com/vercel/turbo/pull/8761 <!-- Benjamin Woodruff -
Delete dead keyed_cell module -->
* https://github.com/vercel/turbo/pull/8755 <!-- Donny/강동윤 - feat:
Enable tree shaking in next.js -->
* https://github.com/vercel/turbo/pull/8769 <!-- Benjamin Woodruff -
Rewrite IdFactory and IdFactoryWithReuse -->
* https://github.com/vercel/turbo/pull/8771 <!-- Benjamin Woodruff - Add
u64 ExecutionId type -->
* https://github.com/vercel/turbo/pull/8735 <!-- Tobias Koppers -
turbo-tasks this calls -->
* https://github.com/vercel/turbo/pull/8775 <!-- Tobias Koppers -
improve failsafe_analyse -->
* https://github.com/vercel/turbo/pull/8776 <!-- Tobias Koppers - notify
tasks when collectibles change -->
* https://github.com/vercel/turbo/pull/8778 <!-- Tobias Koppers - fix
collectibles counting -->
* https://github.com/vercel/turbo/pull/8736 <!-- Tobias Koppers -
Refactor task arguments to be a single one -->
* https://github.com/vercel/turbo/pull/8737 <!-- Tobias Koppers - remove
ConcreteTaskInput in favor of the original rust datatypes -->
parent 03778344
This diff is collapsed.
...@@ -38,11 +38,11 @@ swc_core = { version = "0.96.9", features = [ ...@@ -38,11 +38,11 @@ swc_core = { version = "0.96.9", features = [
testing = { version = "0.36.0" } testing = { version = "0.36.0" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240716.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.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-240716.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.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-240716.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.2" }
# General Deps # General Deps
......
...@@ -574,7 +574,9 @@ struct PageEndpoint { ...@@ -574,7 +574,9 @@ struct PageEndpoint {
pages_structure: Vc<PagesStructure>, pages_structure: Vc<PagesStructure>,
} }
#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TaskInput, TraceRawVcs)] #[derive(
Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs,
)]
enum PageEndpointType { enum PageEndpointType {
Api, Api,
Html, Html,
...@@ -582,7 +584,9 @@ enum PageEndpointType { ...@@ -582,7 +584,9 @@ enum PageEndpointType {
SsrOnly, SsrOnly,
} }
#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TaskInput, TraceRawVcs)] #[derive(
Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs,
)]
enum SsrChunkType { enum SsrChunkType {
Page, Page,
Data, Data,
......
...@@ -67,7 +67,7 @@ use crate::{ ...@@ -67,7 +67,7 @@ use crate::{
versioned_content_map::{OutputAssetsOperation, VersionedContentMap}, versioned_content_map::{OutputAssetsOperation, VersionedContentMap},
}; };
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DraftModeOptions { pub struct DraftModeOptions {
pub preview_mode_id: RcStr, pub preview_mode_id: RcStr,
...@@ -75,7 +75,7 @@ pub struct DraftModeOptions { ...@@ -75,7 +75,7 @@ pub struct DraftModeOptions {
pub preview_mode_signing_key: RcStr, pub preview_mode_signing_key: RcStr,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ProjectOptions { pub struct ProjectOptions {
/// A root path from which all files must be nested under. Trying to access /// A root path from which all files must be nested under. Trying to access
...@@ -114,7 +114,7 @@ pub struct ProjectOptions { ...@@ -114,7 +114,7 @@ pub struct ProjectOptions {
pub preview_props: DraftModeOptions, pub preview_props: DraftModeOptions,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PartialProjectOptions { pub struct PartialProjectOptions {
/// A root path from which all files must be nested under. Trying to access /// A root path from which all files must be nested under. Trying to access
...@@ -153,7 +153,7 @@ pub struct PartialProjectOptions { ...@@ -153,7 +153,7 @@ pub struct PartialProjectOptions {
pub preview_props: Option<DraftModeOptions>, pub preview_props: Option<DraftModeOptions>,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DefineEnv { pub struct DefineEnv {
pub client: Vec<(RcStr, RcStr)>, pub client: Vec<(RcStr, RcStr)>,
......
...@@ -100,7 +100,9 @@ pub enum MetadataWithAltItem { ...@@ -100,7 +100,9 @@ pub enum MetadataWithAltItem {
} }
/// A single metadata file. /// A single metadata file.
#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, TaskInput, TraceRawVcs)] #[derive(
Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, TaskInput, TraceRawVcs,
)]
pub enum MetadataItem { pub enum MetadataItem {
Static { path: Vc<FileSystemPath> }, Static { path: Vc<FileSystemPath> },
Dynamic { path: Vc<FileSystemPath> }, Dynamic { path: Vc<FileSystemPath> },
...@@ -472,7 +474,16 @@ impl LoaderTree { ...@@ -472,7 +474,16 @@ impl LoaderTree {
} }
#[derive( #[derive(
Clone, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, Debug, TaskInput, Clone,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
ValueDebugFormat,
Debug,
TaskInput,
)] )]
pub enum Entrypoint { pub enum Entrypoint {
AppPage { AppPage {
......
...@@ -128,7 +128,7 @@ pub fn get_client_compile_time_info( ...@@ -128,7 +128,7 @@ pub fn get_client_compile_time_info(
} }
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord)] #[derive(Debug, Copy, Clone, Hash)]
pub enum ClientContextType { pub enum ClientContextType {
Pages { pages_dir: Vc<FileSystemPath> }, Pages { pages_dir: Vc<FileSystemPath> },
App { app_dir: Vc<FileSystemPath> }, App { app_dir: Vc<FileSystemPath> },
......
...@@ -79,7 +79,7 @@ use crate::{ ...@@ -79,7 +79,7 @@ use crate::{
}; };
#[turbo_tasks::value(serialization = "auto_for_input")] #[turbo_tasks::value(serialization = "auto_for_input")]
#[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord)] #[derive(Debug, Copy, Clone, Hash)]
pub enum ServerContextType { pub enum ServerContextType {
Pages { Pages {
pages_dir: Vc<FileSystemPath>, pages_dir: Vc<FileSystemPath>,
......
...@@ -36,7 +36,7 @@ use crate::{ ...@@ -36,7 +36,7 @@ use crate::{
const NEXT_TEMPLATE_PATH: &str = "dist/esm/build/templates"; const NEXT_TEMPLATE_PATH: &str = "dist/esm/build/templates";
#[derive(Debug, Clone, Copy, PartialEq, Eq, TaskInput)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TaskInput, Serialize, Deserialize)]
pub enum PathType { pub enum PathType {
PagesPage, PagesPage,
PagesApi, PagesApi,
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.27.1", "@vercel/nft": "0.27.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2",
"acorn": "8.11.3", "acorn": "8.11.3",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -1113,8 +1113,8 @@ importers: ...@@ -1113,8 +1113,8 @@ importers:
specifier: 0.27.1 specifier: 0.27.1
version: 0.27.1(encoding@0.1.13) version: 0.27.1(encoding@0.1.13)
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2
version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1 version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2
acorn: acorn:
specifier: 8.11.3 specifier: 8.11.3
version: 8.11.3 version: 8.11.3
...@@ -5230,8 +5230,8 @@ packages: ...@@ -5230,8 +5230,8 @@ packages:
resolution: {integrity: sha512-OTe0KE37F5Y2eTys6eMnfopC+P4qr2ooXUTFyFPTplYSPwowmFk/HLD1FXtbKLjqsIH0SgekcJWad+C5uX4nkg==} resolution: {integrity: sha512-OTe0KE37F5Y2eTys6eMnfopC+P4qr2ooXUTFyFPTplYSPwowmFk/HLD1FXtbKLjqsIH0SgekcJWad+C5uX4nkg==}
engines: {node: '>=16'} engines: {node: '>=16'}
'@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1': '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2}
version: 0.0.0 version: 0.0.0
'@webassemblyjs/ast@1.11.6': '@webassemblyjs/ast@1.11.6':
...@@ -19823,7 +19823,7 @@ snapshots: ...@@ -19823,7 +19823,7 @@ snapshots:
satori: 0.10.9 satori: 0.10.9
yoga-wasm-web: 0.3.3 yoga-wasm-web: 0.3.3
'@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1': '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2':
dependencies: dependencies:
'@types/node': 20.12.3 '@types/node': 20.12.3
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