Unverified Commit 08d32587 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

update turbopack (#54558)

* https://github.com/vercel/turbo/pull/5723 <!-- Alex Kirszenberg - Misc
comments in turbo_tasks -->
* https://github.com/vercel/turbo/pull/5714 <!-- OJ Kwon - test(ci):
update datadog-ci -->
* https://github.com/vercel/turbo/pull/5705 <!-- Justin Ridgewell -
Transformation code necessary to support Server Actions -->
* https://github.com/vercel/turbo/pull/5739 <!-- Justin Ridgewell -
Update rust toolchain -->
* https://github.com/vercel/turbo/pull/5785 <!-- Tobias Koppers - add
evaluatables to chunk list ident -->
* https://github.com/vercel/turbo/pull/5783 <!-- Tobias Koppers -
Tracing improvements -->
* https://github.com/vercel/turbo/pull/5738 <!-- Alex Kirszenberg -
Generic types over Vcs -->
* https://github.com/vercel/turbo/pull/5795 <!-- Leah - fix: snapshot
test path canonicalization -->
* https://github.com/vercel/turbo/pull/5794 <!-- Tobias Koppers - fix
"any" context condition implementation -->
* https://github.com/vercel/turbo/pull/5800 <!-- Tobias Koppers - add
middleware entry type -->
* https://github.com/vercel/turbo/pull/5786 <!-- Tobias Koppers -
perform invalidation directly on writes -->

Closes WEB-1446
parent 6a70ebf2
This diff is collapsed.
...@@ -46,11 +46,11 @@ swc_core = { version = "0.79.70" } ...@@ -46,11 +46,11 @@ swc_core = { version = "0.79.70" }
testing = { version = "0.33.24" } testing = { version = "0.33.24" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230816.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-230816.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230816.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230825.2" }
# General Deps # General Deps
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1", "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -1521,11 +1521,11 @@ importers: ...@@ -1521,11 +1521,11 @@ importers:
packages/next-swc/crates/next-core/js: packages/next-swc/crates/next-core/js:
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2(react-refresh@0.12.0)(webpack@5.86.0)'
'@vercel/turbopack-node': '@vercel/turbopack-node':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2'
anser: anser:
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1 version: 2.1.1
...@@ -27185,9 +27185,9 @@ packages: ...@@ -27185,9 +27185,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230816.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230825.2'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -27198,8 +27198,8 @@ packages: ...@@ -27198,8 +27198,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230816.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230825.2}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
...@@ -460,77 +460,88 @@ describe('next.rs api', () => { ...@@ -460,77 +460,88 @@ describe('next.rs api', () => {
projectUpdateSubscription projectUpdateSubscription
) )
const oldContent = await next.readFile(file) const oldContent = await next.readFile(file)
await next.patchFile(file, content) let ok = false
let foundUpdates: string[] | false = false try {
let foundServerSideChange = false await next.patchFile(file, content)
let done = false let foundUpdates: string[] | false = false
const result2 = await Promise.race( let foundServerSideChange = false
[ let done = false
(async () => { const result2 = await Promise.race(
const merged = raceIterators(subscriptions) [
for await (const item of merged) {
if (done) return
if (item.type === 'partial') {
expect(item.instruction).toEqual({
type: 'ChunkListUpdate',
merged: [
expect.objectContaining({
chunks: expect.toBeObject(),
entries: expect.toBeObject(),
}),
],
})
const updates = Object.keys(
item.instruction.merged[0].entries
)
expect(updates).not.toBeEmpty()
foundUpdates = foundUpdates || []
foundUpdates.push(
...Object.keys(item.instruction.merged[0].entries)
)
}
}
})(),
serverSideSubscription &&
(async () => { (async () => {
for await (const { const merged = raceIterators(subscriptions)
issues, for await (const item of merged) {
diagnostics,
} of serverSideSubscription) {
if (done) return if (done) return
expect(issues).toBeArray() if (item.type === 'partial') {
expect(diagnostics).toBeArray() expect(item.instruction).toEqual({
foundServerSideChange = true type: 'ChunkListUpdate',
merged: [
expect.objectContaining({
chunks: expect.toBeObject(),
entries: expect.toBeObject(),
}),
],
})
const updates = Object.keys(
item.instruction.merged[0].entries
)
expect(updates).not.toBeEmpty()
foundUpdates = foundUpdates || []
foundUpdates.push(
...Object.keys(item.instruction.merged[0].entries)
)
}
} }
})(), })(),
updateComplete.then( serverSideSubscription &&
(u) => new Promise((r) => setTimeout(() => r(u), 1000)) (async () => {
), for await (const {
new Promise((r) => setTimeout(() => r('timeout'), 30000)), issues,
].filter((x) => x) diagnostics,
) } of serverSideSubscription) {
done = true if (done) return
expect(result2).toMatchObject({ expect(issues).toBeArray()
done: false, expect(diagnostics).toBeArray()
value: { foundServerSideChange = true
duration: expect.toBePositive(), }
tasks: expect.toBePositive(), })(),
}, updateComplete.then(
}) (u) => new Promise((r) => setTimeout(() => r(u), 1000))
if (expectedUpdate === false) { ),
expect(foundUpdates).toBe(false) new Promise((r) => setTimeout(() => r('timeout'), 30000)),
} else { ].filter((x) => x)
expect(foundUpdates).toEqual([ )
expect.stringContaining(expectedUpdate), done = true
]) expect(result2).toMatchObject({
done: false,
value: {
duration: expect.toBePositive(),
tasks: expect.toBePositive(),
},
})
if (typeof expectedUpdate === 'boolean') {
expect(foundUpdates).toBe(false)
} else {
expect(
typeof foundUpdates === 'boolean'
? foundUpdates
: Array.from(new Set(foundUpdates))
).toEqual([expect.stringContaining(expectedUpdate)])
}
expect(foundServerSideChange).toBe(expectedServerSideChange)
ok = true
} finally {
try {
const { next: updateComplete2 } = await drainAndGetNext(
projectUpdateSubscription
)
await next.patchFile(file, oldContent)
await updateComplete2
} catch (e) {
if (ok) throw e
}
} }
expect(foundServerSideChange).toBe(expectedServerSideChange)
const { next: updateComplete2 } = await drainAndGetNext(
projectUpdateSubscription
)
await next.patchFile(file, oldContent)
await updateComplete2
}) })
} }
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment