Skip to content

Commit

Permalink
enable @vercel/og support for turbopack
Browse files Browse the repository at this point in the history
  • Loading branch information
ForsakenHarmony committed Aug 11, 2023
1 parent 599cde8 commit 2b71283
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 90 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_and_deploy.yml
Expand Up @@ -10,6 +10,7 @@ env:
TURBO_VERSION: 1.10.9
NODE_MAINTENANCE_VERSION: 16
NODE_LTS_VERSION: 18.16.1
CARGO_PROFILE_RELEASE_LTO: 'true'

jobs:
build:
Expand Down Expand Up @@ -231,6 +232,7 @@ jobs:
options: >-
-e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-e CARGO_INCREMENTAL=${{ env.CARGO_INCREMENTAL }}
-e CARGO_PROFILE_RELEASE_LTO=${{ env.CARGO_PROFILE_RELEASE_LTO }}
-e CARGO_TERM_COLOR=${{ env.CARGO_TERM_COLOR }}
-e RUST_BACKTRACE=${{ env.RUST_BACKTRACE }}
-e CARGO_REGISTRIES_CRATES_IO_PROTOCOL=${{ env.CARGO_REGISTRIES_CRATES_IO_PROTOCOL }}
Expand Down
37 changes: 0 additions & 37 deletions Cargo.lock

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

12 changes: 7 additions & 5 deletions Cargo.toml
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"

members = [
"scripts/send-trace-to-jaeger",
Expand All @@ -22,8 +23,9 @@ opt-level = 2
[profile.dev.package."*"]
debug-assertions = false

[profile.release]
lto = true
# Set the settings for build scripts and proc-macros.
[profile.dev.build-override]
opt-level = 3

[workspace.dependencies]
# Workspace crates
Expand All @@ -44,11 +46,11 @@ swc_core = { version = "0.79.40" }
testing = { version = "0.33.21" }

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

# General Deps

Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
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-230809.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down

0 comments on commit 2b71283

Please sign in to comment.