Skip to content

Commit

Permalink
hotfix(turbopack): Update with patch for postcss.config.js path resol…
Browse files Browse the repository at this point in the history
…ution on Windows (#64677)

Not 100% sure I did this process right for a hotfix, but this new tag
should be exactly the same as what's currently in the 14-2-1 branch,
except with this one PR:

* vercel/turbo#7995 <!-- Benjamin Woodruff -
fix(turbopack-node) postcss.config.js path resolution on Windows -->

---

In turbo, I ran

```
git switch --detach turbopack-240411.3
git switch -c bgw/hotfix-turbopack-14-2-1
git cherry-pick e7a5c60a3b899d0c4293589c2844016da82442f7
git push origin HEAD
```

I then ran the GitHub action for the nightly release process for that
new branch:
https://github.com/vercel/turbo/actions/workflows/turbopack-nightly-release.yml
(it seems like this just cuts a tag, I wonder for hotfixes if we should
manually cut the tag so it's named differently)

In the nextpack repository:

```
pnpm next-link turbopack-240417.2
```
  • Loading branch information
bgw committed Apr 17, 2024
1 parent 6462b74 commit a340d9e
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
70 changes: 35 additions & 35 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 @@ -37,11 +37,11 @@ swc_core = { version = "0.90.30", features = [
testing = { version = "0.35.22" }

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

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240411.3",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240417.2",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

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

0 comments on commit a340d9e

Please sign in to comment.