Unverified Commit 1d8a6335 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Update to turbopack-230804.2 (#53588)

- vercel/turbo#5671
- vercel/turbo#5675
- vercel/turbo#5676
- vercel/turbo#5662
- vercel/turbo#5663
parent a66aca1e
This diff is collapsed.
...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" } ...@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
testing = { version = "0.33.21" } testing = { version = "0.33.21" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.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-230804.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.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-230804.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.2" }
# General Deps # General Deps
......
...@@ -13,7 +13,7 @@ use turbopack_binding::{ ...@@ -13,7 +13,7 @@ use turbopack_binding::{
turbopack::core::{ turbopack::core::{
diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic}, diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
error::PrettyPrintError, error::PrettyPrintError,
issue::{IssueFilePathExt, PlainIssue, PlainIssueSource, PlainSource}, issue::{IssueDescriptionExt, PlainIssue, PlainIssueSource, PlainSource},
source_pos::SourcePos, source_pos::SourcePos,
}, },
}; };
......
...@@ -35,7 +35,7 @@ use turbopack_binding::{ ...@@ -35,7 +35,7 @@ use turbopack_binding::{
asset::Asset, asset::Asset,
chunk::ChunkingContext, chunk::ChunkingContext,
environment::ServerAddr, environment::ServerAddr,
issue::{IssueFilePathExt, IssueReporter, IssueSeverity}, issue::{IssueDescriptionExt, IssueReporter, IssueSeverity},
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
virtual_fs::VirtualFileSystem, virtual_fs::VirtualFileSystem,
}, },
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -772,7 +772,7 @@ async fn create_app_page_source_for_route( ...@@ -772,7 +772,7 @@ async fn create_app_page_source_for_route(
should_debug("app_source"), should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, format!("Next.js App Page Route {pathname}"))) Ok(source.issue_file_path(app_dir, format!("Next.js App Page Route {pathname}")))
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
...@@ -818,7 +818,7 @@ async fn create_app_not_found_page_source( ...@@ -818,7 +818,7 @@ async fn create_app_not_found_page_source(
should_debug("app_source"), should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, "Next.js App Page Route /404".to_string())) Ok(source.issue_file_path(app_dir, "Next.js App Page Route /404".to_string()))
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
...@@ -866,7 +866,7 @@ async fn create_app_route_source_for_route( ...@@ -866,7 +866,7 @@ async fn create_app_route_source_for_route(
should_debug("app_source"), should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, format!("Next.js App Route {pathname}"))) Ok(source.issue_file_path(app_dir, format!("Next.js App Route {pathname}")))
} }
/// The renderer for pages in app directory /// The renderer for pages in app directory
......
...@@ -13,7 +13,7 @@ use turbopack_binding::{ ...@@ -13,7 +13,7 @@ use turbopack_binding::{
context::AssetContext, context::AssetContext,
file_source::FileSource, file_source::FileSource,
ident::AssetIdent, ident::AssetIdent,
issue::{Issue, IssueExt, IssueFilePathExt, IssueSeverity}, issue::{Issue, IssueDescriptionExt, IssueExt, IssueSeverity},
reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType}, reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType},
resolve::{ resolve::{
find_context_file, find_context_file,
......
...@@ -278,7 +278,7 @@ pub async fn create_page_source( ...@@ -278,7 +278,7 @@ pub async fn create_page_source(
Vc::upcast(NextExactMatcher::new(Vc::cell("_next/404".to_string()))), Vc::upcast(NextExactMatcher::new(Vc::cell("_next/404".to_string()))),
render_data, render_data,
) )
.issue_context(pages_dir, "Next.js pages directory not found".to_string()), .issue_file_path(pages_dir, "Next.js pages directory not found".to_string()),
create_page_source_for_root_directory( create_page_source_for_root_directory(
pages_structure, pages_structure,
project_root, project_root,
...@@ -297,7 +297,7 @@ pub async fn create_page_source( ...@@ -297,7 +297,7 @@ pub async fn create_page_source(
client_root, client_root,
Vc::upcast(fallback_page), Vc::upcast(fallback_page),
)) ))
.issue_context(pages_dir, "Next.js pages directory fallback".to_string()), .issue_file_path(pages_dir, "Next.js pages directory fallback".to_string()),
create_not_found_page_source( create_not_found_page_source(
project_root, project_root,
env, env,
...@@ -315,7 +315,7 @@ pub async fn create_page_source( ...@@ -315,7 +315,7 @@ pub async fn create_page_source(
Vc::upcast(NextFallbackMatcher::new()), Vc::upcast(NextFallbackMatcher::new()),
render_data, render_data,
) )
.issue_context( .issue_file_path(
pages_dir, pages_dir,
"Next.js pages directory not found fallback".to_string(), "Next.js pages directory not found fallback".to_string(),
), ),
...@@ -701,7 +701,7 @@ async fn create_page_source_for_directory( ...@@ -701,7 +701,7 @@ async fn create_page_source_for_directory(
node_root, node_root,
render_data, render_data,
) )
.issue_context( .issue_file_path(
project_path, project_path,
if is_api_path { if is_api_path {
"Next.js page API file" "Next.js page API file"
......
...@@ -19,7 +19,7 @@ use turbopack_binding::{ ...@@ -19,7 +19,7 @@ use turbopack_binding::{
environment::{ServerAddr, ServerInfo}, environment::{ServerAddr, ServerInfo},
file_source::FileSource, file_source::FileSource,
ident::AssetIdent, ident::AssetIdent,
issue::IssueFilePathExt, issue::IssueDescriptionExt,
module::Module, module::Module,
reference_type::{EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType}, reference_type::{EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType},
resolve::{find_context_file, FindContextFileResult}, resolve::{find_context_file, FindContextFileResult},
......
...@@ -1416,11 +1416,11 @@ importers: ...@@ -1416,11 +1416,11 @@ importers:
packages/next-swc/crates/next-core/js: packages/next-swc/crates/next-core/js:
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)'
'@vercel/turbopack-node': '@vercel/turbopack-node':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2'
anser: anser:
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1 version: 2.1.1
...@@ -26060,9 +26060,9 @@ packages: ...@@ -26060,9 +26060,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -26073,8 +26073,8 @@ packages: ...@@ -26073,8 +26073,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
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