Skip to content

Commit

Permalink
update turbopack (#68129)
Browse files Browse the repository at this point in the history
* vercel/turborepo#8812 <!-- Benjamin Woodruff -
Simplify some of the syntax used with VcRead<T> -->
* vercel/turborepo#8823 <!-- hrmny -
feat(turbopack): support analysing string concatenation -->
* vercel/turborepo#8828 <!-- Tobias Koppers - change
from failsafe_analyse to failsafe_parse -->
* vercel/turborepo#8831 <!-- Alexander Lyon - make
sure that all the taiki-e/install-action calls use our env -->
* vercel/turborepo#8819 <!-- Tobias Koppers -
Refactor cell reading to handle removed cells -->
* vercel/turborepo#8038 <!-- Alexander Lyon - add
tags to turbo tasks -->
* vercel/turborepo#8807 <!-- Tobias Koppers - box
Scheduled task state to save memory -->
* vercel/turborepo#8170 <!-- Tobias Koppers - Drop
excessive cells after task reexecution -->
  • Loading branch information
sokra authored Jul 25, 2024
1 parent b80ced3 commit 6af8da5
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 49 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 @@ -38,11 +38,11 @@ swc_core = { version = "0.96.9", features = [
testing = { version = "0.36.0" }

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

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion crates/next-api/src/dynamic_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ async fn build_dynamic_imports_map_for_module(

// https://github.com/vercel/next.js/pull/56389#discussion_r1349336374
// don't emit specific error as we expect there's a parse error already reported
let ParseResult::Ok { program, .. } = &*ecmascript_asset.parse().await? else {
let ParseResult::Ok { program, .. } = &*ecmascript_asset.failsafe_parse().await? else {
return Ok(Vc::cell(None));
};

Expand Down
2 changes: 1 addition & 1 deletion crates/next-api/src/server_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ async fn parse_actions(module: Vc<Box<dyn Module>>) -> Result<Vc<OptionActionMap
};
let ParseResult::Ok {
comments, program, ..
} = &*ecmascript_asset.parse().await?
} = &*ecmascript_asset.failsafe_parse().await?
else {
// The file might be be parse-able, but this is reported separately.
return Ok(OptionActionMap::none());
Expand Down
2 changes: 1 addition & 1 deletion crates/next-core/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ pub async fn parse_config_from_source(module: Vc<Box<dyn Module>>) -> Result<Vc<
globals,
eval_context,
..
} = &*ecmascript_asset.parse().await?
} = &*ecmascript_asset.failsafe_parse().await?
{
for item in &module_ast.body {
if let Some(decl) = item
Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.27.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2",
"acorn": "8.11.3",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
Loading

0 comments on commit 6af8da5

Please sign in to comment.