Skip to content

Commit ba2a4a7

Browse files
committed
also patch resolveServerReference in browser react
1 parent 6800560 commit ba2a4a7

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'" in the React Server Manifest. This is probably a bug in the React Server Components bundler.'
4949
);
5050
}
51-
return [resolvedModuleData.id, resolvedModuleData.chunks, name];
51+
return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];
5252
}
5353
function requireAsyncModule(id) {
5454
var promise = __turbopack_require__(id);

packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function resolveServerReference(bundlerConfig, id) {
4848
'" in the React Server Manifest. This is probably a bug in the React Server Components bundler.'
4949
);
5050
}
51-
return [resolvedModuleData.id, resolvedModuleData.chunks, name];
51+
return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];
5252
}
5353
function requireAsyncModule(id) {
5454
var promise = __turbopack_require__(id);

packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'" in the React Server Manifest. This is probably a bug in the React Server Components bundler.'
4949
);
5050
}
51-
return [resolvedModuleData.id, resolvedModuleData.chunks, name];
51+
return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];
5252
}
5353
function requireAsyncModule(id) {
5454
var promise = __turbopack_require__(id);

packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function resolveServerReference(bundlerConfig, id) {
4848
'" in the React Server Manifest. This is probably a bug in the React Server Components bundler.'
4949
);
5050
}
51-
return [resolvedModuleData.id, resolvedModuleData.chunks, name];
51+
return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];
5252
}
5353
function requireAsyncModule(id) {
5454
var promise = __turbopack_require__(id);

packages/next/taskfile.js

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,9 +1811,8 @@ export async function copy_vendor_react(task_) {
18111811
// indirection
18121812

18131813
if (
1814-
(file.base.startsWith('react-server-dom-turbopack-client') ||
1815-
file.base.startsWith('react-server-dom-turbopack-server')) &&
1816-
!file.base.includes('.browser.')
1814+
file.base.startsWith('react-server-dom-turbopack-client') ||
1815+
file.base.startsWith('react-server-dom-turbopack-server')
18171816
) {
18181817
let source = file.data.toString()
18191818

@@ -1825,24 +1824,28 @@ export async function copy_vendor_react(task_) {
18251824
)
18261825
}
18271826

1828-
const filepath = file.dir + '/' + file.base
1829-
const ast = parseFile(source, { sourceFileName: filepath })
1827+
if (!file.base.includes('.browser.')) {
1828+
const filepath = file.dir + '/' + file.base
1829+
const ast = parseFile(source, { sourceFileName: filepath })
1830+
1831+
replaceIdentifiersInAst(
1832+
ast,
1833+
new Map([
1834+
[
1835+
'__turbopack_load_by_url__',
1836+
parseExpression('globalThis.__next_chunk_load__'),
1837+
],
1838+
[
1839+
'__turbopack_require__',
1840+
parseExpression('globalThis.__next_require__'),
1841+
],
1842+
])
1843+
)
18301844

1831-
replaceIdentifiersInAst(
1832-
ast,
1833-
new Map([
1834-
[
1835-
'__turbopack_load_by_url__',
1836-
parseExpression('globalThis.__next_chunk_load__'),
1837-
],
1838-
[
1839-
'__turbopack_require__',
1840-
parseExpression('globalThis.__next_require__'),
1841-
],
1842-
])
1843-
)
1845+
source = recast.print(ast).code
1846+
}
18441847

1845-
file.data = recast.print(ast).code
1848+
file.data = source
18461849
} else if (file.base === 'package.json') {
18471850
file.data = overridePackageName(file.data)
18481851
}

0 commit comments

Comments
 (0)