Skip to content

Commit

Permalink
Merge branch 'canary' into docs/use-selected-layout-segments-docs-typ…
Browse files Browse the repository at this point in the history
…o-removal
  • Loading branch information
leerob committed Aug 30, 2023
2 parents 30154a7 + d02124a commit 437f948
Show file tree
Hide file tree
Showing 31 changed files with 589 additions and 279 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 @@ -46,11 +46,11 @@ swc_core = { version = "0.79.70" }
testing = { version = "0.33.24" }

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

# General Deps

Expand Down

0 comments on commit 437f948

Please sign in to comment.