Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Turbopack #52986

Merged
merged 4 commits into from
Jul 21, 2023
Merged

update Turbopack #52986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
869cad7
update for API changes
sokra Jul 21, 2023
dcc8983
update turbopack
sokra Jul 21, 2023
e9830b3
fixup to fatal
sokra Jul 21, 2023
8b88835
Merge branch 'canary' into sokra/update-turbopack5
kodiakhq[bot] Jul 21, 2023
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
83 changes: 48 additions & 35 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
testing = { version = "0.33.20" }

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

# General Deps

Expand Down
2 changes: 2 additions & 0 deletions packages/next-swc/crates/next-build/src/next_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ async fn handle_issues<T>(source: Vc<T>, issue_reporter: Vc<Box<dyn IssueReporte
let has_fatal = issue_reporter.report_issues(
TransientInstance::new(issues.clone()),
TransientValue::new(source.node),
// TODO this should be Error, but we need to fix the errors happing first
IssueSeverity::Fatal.cell(),
);

if *has_fatal.await? {
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
View file
Open in desktop
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-230719.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230719.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
1 change: 1 addition & 0 deletions packages/next-swc/crates/next-dev-tests/tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@ impl IssueReporter for TestIssueReporter {
&self,
captured_issues: TransientInstance<ReadRef<CapturedIssues>>,
_source: TransientValue<RawVc>,
_min_failing_severity: Vc<IssueSeverity>,
) -> Result<Vc<bool>> {
let log_options = LogOptions {
current_dir: PathBuf::new(),
Expand Down
Loading