Skip to content

Commit

Permalink
Merge branch 'canary' into fix/image-blur-placeholder
Browse files Browse the repository at this point in the history
  • Loading branch information
arturbien committed Jul 12, 2023
2 parents bd03f45 + 38dafa1 commit 897e15c
Show file tree
Hide file tree
Showing 94 changed files with 4,901 additions and 1,740 deletions.
75 changes: 40 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,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-230711.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230712.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-230711.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230712.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230711.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230712.2" }

# General Deps

Expand Down Expand Up @@ -74,6 +74,7 @@ async-compression = { version = "0.3.13", default-features = false, features = [
"gzip",
"tokio",
] }
async-recursion = "1.0.2"
async-trait = "0.1.64"
atty = "0.2.14"
chrono = "0.4.23"
Expand Down
5 changes: 5 additions & 0 deletions packages/next-swc/crates/next-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ profile = []

[dependencies]
anyhow = { workspace = true }
async-recursion = { workspace = true }
clap = { workspace = true, features = ["derive", "env"], optional = true }
console-subscriber = { workspace = true, optional = true }
dunce = { workspace = true }
Expand All @@ -48,6 +49,10 @@ serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
indoc = { workspace = true }
indexmap = { workspace = true }
mime_guess = "2.0.4"
base64 = "0.21.0"

turbopack-binding = { workspace = true, features = [
"__turbo_tasks",
Expand Down
3 changes: 3 additions & 0 deletions packages/next-swc/crates/next-build/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#![feature(type_alias_impl_trait)]

use turbopack_binding::turbo::{
tasks::{run_once, TransientInstance, TurboTasks},
tasks_memory::MemoryBackend,
};

pub mod build_options;
pub mod manifests;
pub(crate) mod next_app;
pub(crate) mod next_build;
pub(crate) mod next_pages;

Expand Down

0 comments on commit 897e15c

Please sign in to comment.