Skip to content

Commit

Permalink
update turbopack and update code for API changes (#53576)
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra authored Aug 4, 2023
1 parent 324814f commit 94709ef
Show file tree
Hide file tree
Showing 20 changed files with 77 additions and 90 deletions.
74 changes: 37 additions & 37 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
testing = { version = "0.33.21" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230803.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
# [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-230803.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230803.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }

# General Deps

Expand Down
6 changes: 3 additions & 3 deletions packages/next-swc/crates/napi/src/next_api/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use turbopack_binding::{
turbopack::core::{
diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
error::PrettyPrintError,
issue::{IssueContextExt, PlainIssue, PlainIssueSource, PlainSource},
issue::{IssueFilePathExt, PlainIssue, PlainIssueSource, PlainSource},
source_pos::SourcePos,
},
};
Expand Down Expand Up @@ -107,7 +107,7 @@ pub async fn get_diagnostics<T>(source: Vc<T>) -> Result<Vec<ReadRef<PlainDiagno
pub struct NapiIssue {
pub severity: String,
pub category: String,
pub context: String,
pub file_path: String,
pub title: String,
pub description: String,
pub detail: String,
Expand All @@ -121,7 +121,7 @@ impl From<&PlainIssue> for NapiIssue {
Self {
description: issue.description.clone(),
category: issue.category.clone(),
context: issue.context.clone(),
file_path: issue.file_path.clone(),
detail: issue.detail.clone(),
documentation_link: issue.documentation_link.clone(),
severity: issue.severity.as_str().to_string(),
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-build/src/next_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use turbopack_binding::{
asset::Asset,
chunk::ChunkingContext,
environment::ServerAddr,
issue::{IssueContextExt, IssueReporter, IssueSeverity},
issue::{IssueFilePathExt, IssueReporter, IssueSeverity},
output::{OutputAsset, OutputAssets},
virtual_fs::VirtualFileSystem,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
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-230803.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230803.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
Loading

0 comments on commit 94709ef

Please sign in to comment.