Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
6f1418a2
Commit
6f1418a2
authored
Jun 11, 2024
by
Zack Tanner
Committed by
Janka Uryga
Sep 02, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix esm property def in flight loader" (#66727)
This is causing unexpected errors. Reverts vercel/next.js#66286
parent
6b410717
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
15 deletions
+14
-15
index.ts
...ext/src/build/webpack/loaders/next-flight-loader/index.ts
+7
-10
loadable.tsx
packages/next/src/shared/lib/lazy-dynamic/loadable.tsx
+1
-1
app-routes-client-component.test.ts
...utes-client-component/app-routes-client-component.test.ts
+5
-3
page.js
test/e2e/app-dir/dynamic/app/dynamic/named-export/page.js
+1
-1
No files found.
packages/next/src/build/webpack/loaders/next-flight-loader/index.ts
View file @
6f1418a2
...
@@ -97,24 +97,21 @@ export default function transformSource(
...
@@ -97,24 +97,21 @@ export default function transformSource(
return
return
}
}
// `proxy` is the module proxy that we treat the module as a client boundary.
// For ESM, we access the property of the module proxy directly for each export.
// This is bit hacky that treating using a CJS like module proxy for ESM's exports,
// but this will avoid creating nested proxies for each export. It will be improved in the future.
let
esmSource
=
`\
let
esmSource
=
`\
import { createProxy } from "
${
MODULE_PROXY_PATH
}
"
import { createProxy } from "
${
MODULE_PROXY_PATH
}
"
const proxy = createProxy(String.raw\`
${
resourceKey
}
\`)
`
`
let
cnt
=
0
let
cnt
=
0
for
(
const
ref
of
clientRefs
)
{
for
(
const
ref
of
clientRefs
)
{
if
(
ref
===
''
)
{
if
(
ref
===
''
)
{
esmSource
+=
`
exports[''] = proxy['']\n
`
esmSource
+=
`
\nexports[''] = createProxy(String.raw\`
${
resourceKey
}
#\`);
`
}
else
if
(
ref
===
'default'
)
{
}
else
if
(
ref
===
'default'
)
{
esmSource
+=
`export default createProxy(String.raw\`
${
resourceKey
}
#default\`);\n`
esmSource
+=
`\
export default createProxy(String.raw\`
${
resourceKey
}
#default\`);
`
}
else
{
}
else
{
esmSource
+=
`const e
${
cnt
}
= proxy["
${
ref
}
"];\n`
esmSource
+=
`
esmSource
+=
`export { e
${
cnt
++
}
as
${
ref
}
};\n`
const e
${
cnt
}
= createProxy(String.raw\`
${
resourceKey
}
#
${
ref
}
\`);
export { e
${
cnt
++
}
as
${
ref
}
};`
}
}
}
}
...
...
packages/next/src/shared/lib/lazy-dynamic/loadable.tsx
View file @
6f1418a2
...
@@ -15,7 +15,7 @@ function convertModule<P>(
...
@@ -15,7 +15,7 @@ function convertModule<P>(
// Cases:
// Cases:
// mod: { default: Component }
// mod: { default: Component }
// mod: Component
// mod: Component
// mod: { default: proxy(Component) }
// mod: {
$$typeof,
default: proxy(Component) }
// mod: proxy(Component)
// mod: proxy(Component)
const
hasDefault
=
mod
&&
'default'
in
mod
const
hasDefault
=
mod
&&
'default'
in
mod
return
{
return
{
...
...
test/e2e/app-dir/app-routes-client-component/app-routes-client-component.test.ts
View file @
6f1418a2
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
FileRef
,
nextTestSetup
}
from
'e2e-utils'
import
path
from
'path'
describe
(
'referencing a client component in an app route'
,
()
=>
{
describe
(
'referencing a client component in an app route'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
files
:
new
FileRef
(
path
.
join
(
__dirname
))
,
})
})
it
(
'responds without error'
,
async
()
=>
{
it
(
'responds without error'
,
async
()
=>
{
expect
(
JSON
.
parse
(
await
next
.
render
(
'/runtime'
))).
toEqual
({
expect
(
JSON
.
parse
(
await
next
.
render
(
'/runtime'
))).
toEqual
({
clientComponent
:
'function'
,
// Turbopack's proxy components are functions
clientComponent
:
process
.
env
.
TURBOPACK
?
'function'
:
'object'
,
})
})
})
})
})
})
test/e2e/app-dir/dynamic/app/dynamic/named-export/page.js
View file @
6f1418a2
...
@@ -2,7 +2,7 @@ import dynamic from 'next/dynamic'
...
@@ -2,7 +2,7 @@ import dynamic from 'next/dynamic'
const
Button
=
dynamic
(()
=>
const
Button
=
dynamic
(()
=>
import
(
'./client'
).
then
((
mod
)
=>
{
import
(
'./client'
).
then
((
mod
)
=>
{
return
{
default
:
mod
.
Button
}
return
mod
.
Button
})
})
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment