Skip to content

Commit

Permalink
Merge branch 'canary' into nested-components-example-update
Browse files Browse the repository at this point in the history
  • Loading branch information
Shruthireddy04 committed Jul 25, 2024
2 parents 02e924e + ccbcfff commit 97f99ca
Show file tree
Hide file tree
Showing 79 changed files with 1,202 additions and 557 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
Loading

0 comments on commit 97f99ca

Please sign in to comment.