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
99de0573
Unverified
Commit
99de0573
authored
Sep 10, 2024
by
Jiachi Liu
Committed by
GitHub
Sep 10, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert server action optimization (#69925)
parent
24647b9a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
48 changed files
with
25 additions
and
987 deletions
+25
-987
flight-client-entry-plugin.ts
...t/src/build/webpack/plugins/flight-client-entry-plugin.ts
+24
-187
config-shared.ts
packages/next/src/server/config-shared.ts
+1
-1
utils.ts
...production/app-dir/actions-tree-shaking/_testing/utils.ts
+0
-79
actions.js
...duction/app-dir/actions-tree-shaking/basic/app/actions.js
+0
-13
page.js
...ion/app-dir/actions-tree-shaking/basic/app/client/page.js
+0
-21
page.js
...ion/app-dir/actions-tree-shaking/basic/app/inline/page.js
+0
-13
layout.js
...oduction/app-dir/actions-tree-shaking/basic/app/layout.js
+0
-7
page.js
...ion/app-dir/actions-tree-shaking/basic/app/server/page.js
+0
-10
basic-edge.test.ts
...ion/app-dir/actions-tree-shaking/basic/basic-edge.test.ts
+0
-3
basic.test.ts
...oduction/app-dir/actions-tree-shaking/basic/basic.test.ts
+0
-33
layout.js
...r/actions-tree-shaking/mixed-module-actions/app/layout.js
+0
-7
actions.js
...king/mixed-module-actions/app/mixed-module/cjs/actions.js
+0
-13
page.js
...shaking/mixed-module-actions/app/mixed-module/cjs/page.js
+0
-13
actions.js
...king/mixed-module-actions/app/mixed-module/esm/actions.js
+0
-13
page.js
...shaking/mixed-module-actions/app/mixed-module/esm/page.js
+0
-13
mixed-module-actions-edge.test.ts
...ng/mixed-module-actions/mixed-module-actions-edge.test.ts
+0
-3
mixed-module-actions.test.ts
...shaking/mixed-module-actions/mixed-module-actions.test.ts
+0
-29
layout.js
...ction/app-dir/actions-tree-shaking/reexport/app/layout.js
+0
-7
actions.js
...ree-shaking/reexport/app/named-reexport/client/actions.js
+0
-13
page.js
...s-tree-shaking/reexport/app/named-reexport/client/page.js
+0
-21
reexport-action.js
...ing/reexport/app/named-reexport/client/reexport-action.js
+0
-5
actions.js
...ree-shaking/reexport/app/named-reexport/server/actions.js
+0
-13
page.js
...s-tree-shaking/reexport/app/named-reexport/server/page.js
+0
-12
reexport-action.js
...ing/reexport/app/named-reexport/server/reexport-action.js
+0
-5
actions.js
...shaking/reexport/app/namespace-reexport/client/actions.js
+0
-13
page.js
...ee-shaking/reexport/app/namespace-reexport/client/page.js
+0
-21
actions.js
...shaking/reexport/app/namespace-reexport/server/actions.js
+0
-13
page.js
...ee-shaking/reexport/app/namespace-reexport/server/page.js
+0
-12
reexport-edge.test.ts
...p-dir/actions-tree-shaking/reexport/reexport-edge.test.ts
+0
-3
reexport.test.ts
...on/app-dir/actions-tree-shaking/reexport/reexport.test.ts
+0
-35
actions.js
...-tree-shaking/shared-module-actions/app/client/actions.js
+0
-13
page.js
...tree-shaking/shared-module-actions/app/client/one/page.js
+0
-22
page.js
...tree-shaking/shared-module-actions/app/client/two/page.js
+0
-22
layout.js
.../actions-tree-shaking/shared-module-actions/app/layout.js
+0
-7
actions.js
...-tree-shaking/shared-module-actions/app/server/actions.js
+0
-13
page.js
...tree-shaking/shared-module-actions/app/server/one/page.js
+0
-13
page.js
...tree-shaking/shared-module-actions/app/server/two/page.js
+0
-13
shared-module-actions-edge.test.ts
.../shared-module-actions/shared-module-actions-edge.test.ts
+0
-3
shared-module-actions.test.ts
...aking/shared-module-actions/shared-module-actions.test.ts
+0
-34
tsconfig.json
.../actions-tree-shaking/shared-module-actions/tsconfig.json
+0
-24
layout.js
...dir/actions-tree-shaking/use-effect-actions/app/layout.js
+0
-7
actions.ts
...ions-tree-shaking/use-effect-actions/app/mixed/actions.ts
+0
-11
my-component.tsx
...ree-shaking/use-effect-actions/app/mixed/my-component.tsx
+0
-9
page.tsx
...ctions-tree-shaking/use-effect-actions/app/mixed/page.tsx
+0
-23
tsconfig.json
...dir/actions-tree-shaking/use-effect-actions/tsconfig.json
+0
-24
use-effect-actions-edge.test.ts
...haking/use-effect-actions/use-effect-actions-edge.test.ts
+0
-3
use-effect-actions.test.ts
...ree-shaking/use-effect-actions/use-effect-actions.test.ts
+0
-25
turbopack-build-tests-manifest.json
test/turbopack-build-tests-manifest.json
+0
-90
No files found.
packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
View file @
99de0573
This diff is collapsed.
Click to expand it.
packages/next/src/server/config-shared.ts
View file @
99de0573
...
@@ -939,7 +939,7 @@ export const defaultConfig: NextConfig = {
...
@@ -939,7 +939,7 @@ export const defaultConfig: NextConfig = {
:
false
,
:
false
,
webpackBuildWorker
:
undefined
,
webpackBuildWorker
:
undefined
,
missingSuspenseWithCSRBailout
:
true
,
missingSuspenseWithCSRBailout
:
true
,
optimizeServerReact
:
fals
e
,
optimizeServerReact
:
tru
e
,
useEarlyImport
:
false
,
useEarlyImport
:
false
,
staleTimes
:
{
staleTimes
:
{
dynamic
:
30
,
dynamic
:
30
,
...
...
test/production/app-dir/actions-tree-shaking/_testing/utils.ts
deleted
100644 → 0
View file @
24647b9a
// @ts-ignore avoid ts errors during manual testing
import
{
type
NextInstance
}
from
'e2e-utils'
async
function
getActionsMappingByRuntime
(
next
:
NextInstance
,
runtime
:
'node'
|
'edge'
)
{
const
manifest
=
JSON
.
parse
(
await
next
.
readFile
(
'.next/server/server-reference-manifest.json'
)
)
return
manifest
[
runtime
]
}
export
function
markLayoutAsEdge
(
next
:
NextInstance
)
{
beforeAll
(
async
()
=>
{
await
next
.
stop
()
const
layoutContent
=
await
next
.
readFile
(
'app/layout.js'
)
await
next
.
patchFile
(
'app/layout.js'
,
layoutContent
+
`\nexport const runtime = 'edge'`
)
await
next
.
start
()
})
}
/*
{
[route path]: { [layer]: Set<workerId> ]
}
*/
type
ActionsMappingOfRuntime
=
{
[
actionId
:
string
]:
{
workers
:
{
[
route
:
string
]:
string
}
layer
:
{
[
route
:
string
]:
string
}
}
}
type
ActionState
=
{
[
route
:
string
]:
{
[
layer
:
string
]:
number
}
}
function
getActionsRoutesState
(
actionsMappingOfRuntime
:
ActionsMappingOfRuntime
):
ActionState
{
const
state
:
ActionState
=
{}
Object
.
keys
(
actionsMappingOfRuntime
).
forEach
((
actionId
)
=>
{
const
action
=
actionsMappingOfRuntime
[
actionId
]
const
routePaths
=
Object
.
keys
(
action
.
workers
)
routePaths
.
forEach
((
routePath
)
=>
{
if
(
!
state
[
routePath
])
{
state
[
routePath
]
=
{}
}
const
layer
=
action
.
layer
[
routePath
]
if
(
!
state
[
routePath
][
layer
])
{
state
[
routePath
][
layer
]
=
0
}
state
[
routePath
][
layer
]
++
})
})
return
state
}
export
async
function
getActionsRoutesStateByRuntime
(
next
:
NextInstance
)
{
const
actionsMappingOfRuntime
=
await
getActionsMappingByRuntime
(
next
,
process
.
env
.
TEST_EDGE
?
'edge'
:
'node'
)
return
getActionsRoutesState
(
actionsMappingOfRuntime
)
}
test/production/app-dir/actions-tree-shaking/basic/app/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
serverComponentAction
()
{
return
'server-action'
}
export
async
function
clientComponentAction
()
{
return
'client-action'
}
export
async
function
unusedExportedAction
()
{
return
'unused-exported-action'
}
test/production/app-dir/actions-tree-shaking/basic/app/client/page.js
deleted
100644 → 0
View file @
24647b9a
'use client'
import
{
useState
}
from
'react'
import
{
clientComponentAction
}
from
'../actions'
export
default
function
Page
()
{
const
[
text
,
setText
]
=
useState
(
'initial'
)
return
(
<
div
>
<
button
id
=
"action-1"
onClick
=
{
async
()
=>
{
setText
(
await
clientComponentAction
())
}}
>
Action
1
<
/button
>
<
span
>
{
text
}
<
/span
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/basic/app/inline/page.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Page
()
{
// Inline Server Action
async
function
inlineServerAction
()
{
'use server'
return
'inline-server-action'
}
return
(
<
form
action
=
{
inlineServerAction
}
>
<
button
type
=
"submit"
>
Submit
<
/button
>
<
/form
>
)
}
test/production/app-dir/actions-tree-shaking/basic/app/layout.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Layout
({
children
})
{
return
(
<
html
>
<
body
>
{
children
}
<
/body
>
<
/html
>
)
}
test/production/app-dir/actions-tree-shaking/basic/app/server/page.js
deleted
100644 → 0
View file @
24647b9a
import
{
serverComponentAction
}
from
'../actions'
export
default
function
Page
()
{
return
(
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
serverComponentAction
}
>
submit
<
/button
>
<
/form
>
)
}
test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts
deleted
100644 → 0
View file @
24647b9a
process
.
env
.
TEST_EDGE
=
'1'
require
(
'./basic.test'
)
test/production/app-dir/actions-tree-shaking/basic/basic.test.ts
deleted
100644 → 0
View file @
24647b9a
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
getActionsRoutesStateByRuntime
,
markLayoutAsEdge
,
}
from
'../_testing/utils'
describe
(
'actions-tree-shaking - basic'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
if
(
process
.
env
.
TEST_EDGE
)
{
markLayoutAsEdge
(
next
)
}
it
(
'should not have the unused action in the manifest'
,
async
()
=>
{
const
actionsRoutesState
=
await
getActionsRoutesStateByRuntime
(
next
)
expect
(
actionsRoutesState
).
toMatchObject
({
// only one server layer action
'app/server/page'
:
{
rsc
:
1
,
},
// only one browser layer action
'app/client/page'
:
{
'action-browser'
:
1
,
},
'app/inline/page'
:
{
rsc
:
1
,
},
})
})
})
test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/layout.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Layout
({
children
})
{
return
(
<
html
>
<
body
>
{
children
}
<
/body
>
<
/html
>
)
}
test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
esmModuleTypeAction
()
{
return
'esm-module-type-action'
}
export
async
function
cjsModuleTypeAction
()
{
return
'cjs-module-type-action'
}
export
async
function
unusedModuleTypeAction1
()
{
return
'unused-module-type-action-1'
}
test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/cjs/page.js
deleted
100644 → 0
View file @
24647b9a
const
{
cjsModuleTypeAction
}
=
require
(
'./actions'
)
export
default
function
Page
()
{
return
(
<
div
>
<
h3
>
One
<
/h3
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
cjsModuleTypeAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
esmModuleTypeAction
()
{
return
'esm-module-type-action'
}
export
async
function
cjsModuleTypeAction
()
{
return
'cjs-module-type-action'
}
export
async
function
unusedModuleTypeAction1
()
{
return
'unused-module-type-action-1'
}
test/production/app-dir/actions-tree-shaking/mixed-module-actions/app/mixed-module/esm/page.js
deleted
100644 → 0
View file @
24647b9a
import
{
esmModuleTypeAction
}
from
'./actions'
export
default
function
Page
()
{
return
(
<
div
>
<
h3
>
One
<
/h3
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
esmModuleTypeAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts
deleted
100644 → 0
View file @
24647b9a
process
.
env
.
TEST_EDGE
=
'1'
require
(
'./mixed-module-actions.test'
)
test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts
deleted
100644 → 0
View file @
24647b9a
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
getActionsRoutesStateByRuntime
,
markLayoutAsEdge
,
}
from
'../_testing/utils'
describe
(
'actions-tree-shaking - mixed-module-actions'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
if
(
process
.
env
.
TEST_EDGE
)
{
markLayoutAsEdge
(
next
)
}
it
(
'should not do tree shake for cjs module when import server actions'
,
async
()
=>
{
const
actionsRoutesState
=
await
getActionsRoutesStateByRuntime
(
next
)
expect
(
actionsRoutesState
).
toMatchObject
({
'app/mixed-module/esm/page'
:
{
rsc
:
1
,
},
// CJS import is not able to tree shake, so it will include all actions
'app/mixed-module/cjs/page'
:
{
rsc
:
3
,
},
})
})
})
test/production/app-dir/actions-tree-shaking/reexport/app/layout.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Layout
({
children
})
{
return
(
<
html
>
<
body
>
{
children
}
<
/body
>
<
/html
>
)
}
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedClientLayerAction
()
{
return
'shared-client-layer-action'
}
export
async
function
unusedClientLayerAction1
()
{
return
'unused-client-layer-action-1'
}
export
async
function
unusedClientLayerAction2
()
{
return
'unused-client-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/page.js
deleted
100644 → 0
View file @
24647b9a
'use client'
import
{
useState
}
from
'react'
import
{
sharedClientLayerAction
}
from
'./reexport-action'
export
default
function
Page
()
{
const
[
text
,
setText
]
=
useState
(
'initial'
)
return
(
<
div
>
<
button
id
=
"action-1"
onClick
=
{
async
()
=>
{
setText
(
await
sharedClientLayerAction
())
}}
>
Action
1
<
/button
>
<
span
>
{
text
}
<
/span
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/client/reexport-action.js
deleted
100644 → 0
View file @
24647b9a
export
{
sharedClientLayerAction
,
unusedClientLayerAction1
,
unusedClientLayerAction2
,
}
from
'./actions'
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedServerLayerAction
()
{
return
'shared-server-layer-action'
}
export
async
function
unusedServerLayerAction1
()
{
return
'unused-server-layer-action-1'
}
export
async
function
unusedServerLayerAction2
()
{
return
'unused-server-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/page.js
deleted
100644 → 0
View file @
24647b9a
import
{
sharedServerLayerAction
}
from
'./reexport-action'
export
default
function
Page
()
{
return
(
<
div
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
sharedServerLayerAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/reexport/app/named-reexport/server/reexport-action.js
deleted
100644 → 0
View file @
24647b9a
export
{
sharedServerLayerAction
,
unusedServerLayerAction1
,
unusedServerLayerAction2
,
}
from
'./actions'
test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedClientLayerAction
()
{
return
'shared-client-layer-action'
}
export
async
function
unusedClientLayerAction1
()
{
return
'unused-client-layer-action-1'
}
export
async
function
unusedClientLayerAction2
()
{
return
'unused-client-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/client/page.js
deleted
100644 → 0
View file @
24647b9a
'use client'
import
{
useState
}
from
'react'
import
*
as
actionMod
from
'./actions'
export
default
function
Page
()
{
const
[
text
,
setText
]
=
useState
(
'initial'
)
return
(
<
div
>
<
button
id
=
"action-1"
onClick
=
{
async
()
=>
{
setText
(
await
actionMod
.
sharedClientLayerAction
())
}}
>
Action
1
<
/button
>
<
span
>
{
text
}
<
/span
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedServerLayerAction
()
{
return
'shared-server-layer-action'
}
export
async
function
unusedServerLayerAction1
()
{
return
'unused-server-layer-action-1'
}
export
async
function
unusedServerLayerAction2
()
{
return
'unused-server-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/reexport/app/namespace-reexport/server/page.js
deleted
100644 → 0
View file @
24647b9a
import
*
as
actionMod
from
'./actions'
export
default
function
Page
()
{
return
(
<
div
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
actionMod
.
sharedServerLayerAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts
deleted
100644 → 0
View file @
24647b9a
process
.
env
.
TEST_EDGE
=
'1'
require
(
'./reexport.test'
)
test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts
deleted
100644 → 0
View file @
24647b9a
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
getActionsRoutesStateByRuntime
,
markLayoutAsEdge
,
}
from
'../_testing/utils'
describe
(
'actions-tree-shaking - reexport'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
if
(
process
.
env
.
TEST_EDGE
)
{
markLayoutAsEdge
(
next
)
}
it
(
'should not have the unused action in the manifest'
,
async
()
=>
{
const
actionsRoutesState
=
await
getActionsRoutesStateByRuntime
(
next
)
expect
(
actionsRoutesState
).
toMatchObject
({
'app/namespace-reexport/server/page'
:
{
rsc
:
1
,
},
'app/namespace-reexport/client/page'
:
{
'action-browser'
:
1
,
},
// We're not able to tree-shake these re-exports here
'app/named-reexport/server/page'
:
{
rsc
:
3
,
},
'app/named-reexport/client/page'
:
{
'action-browser'
:
3
,
},
})
})
})
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedClientLayerAction
()
{
return
'shared-client-layer-action'
}
export
async
function
unusedClientLayerAction1
()
{
return
'unused-client-layer-action-1'
}
export
async
function
unusedClientLayerAction2
()
{
return
'unused-client-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/one/page.js
deleted
100644 → 0
View file @
24647b9a
'use client'
import
{
useState
}
from
'react'
import
{
sharedClientLayerAction
}
from
'../actions'
export
default
function
Page
()
{
const
[
text
,
setText
]
=
useState
(
'initial'
)
return
(
<
div
>
<
h1
>
One
<
/h1
>
<
button
id
=
"action-1"
onClick
=
{
async
()
=>
{
setText
(
await
sharedClientLayerAction
())
}}
>
Action
1
<
/button
>
<
span
>
{
text
}
<
/span
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/client/two/page.js
deleted
100644 → 0
View file @
24647b9a
'use client'
import
{
useState
}
from
'react'
import
{
sharedClientLayerAction
}
from
'../actions'
export
default
function
Page
()
{
const
[
text
,
setText
]
=
useState
(
'initial'
)
return
(
<
div
>
<
h1
>
Two
<
/h1
>
<
button
id
=
"action-1"
onClick
=
{
async
()
=>
{
setText
(
await
sharedClientLayerAction
())
}}
>
Action
1
<
/button
>
<
span
>
{
text
}
<
/span
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/layout.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Layout
({
children
})
{
return
(
<
html
>
<
body
>
{
children
}
<
/body
>
<
/html
>
)
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/actions.js
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
sharedServerLayerAction
()
{
return
'shared-server-layer-action'
}
export
async
function
unusedServerLayerAction1
()
{
return
'unused-server-layer-action-1'
}
export
async
function
unusedServerLayerAction2
()
{
return
'unused-server-layer-action-2'
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/one/page.js
deleted
100644 → 0
View file @
24647b9a
import
{
sharedServerLayerAction
}
from
'../actions'
export
default
function
Page
()
{
return
(
<
div
>
<
h3
>
One
<
/h3
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
sharedServerLayerAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/app/server/two/page.js
deleted
100644 → 0
View file @
24647b9a
import
{
sharedServerLayerAction
}
from
'../actions'
export
default
function
Page
()
{
return
(
<
div
>
<
h3
>
One
<
/h3
>
<
form
>
<
input
type
=
"text"
placeholder
=
"input"
/>
<
button
formAction
=
{
sharedServerLayerAction
}
>
submit
<
/button
>
<
/form
>
<
/div
>
)
}
test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts
deleted
100644 → 0
View file @
24647b9a
process
.
env
.
TEST_EDGE
=
'1'
require
(
'./shared-module-actions.test'
)
test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts
deleted
100644 → 0
View file @
24647b9a
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
getActionsRoutesStateByRuntime
,
markLayoutAsEdge
,
}
from
'../_testing/utils'
describe
(
'actions-tree-shaking - shared-module-actions'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
if
(
process
.
env
.
TEST_EDGE
)
{
markLayoutAsEdge
(
next
)
}
it
(
'should not have the unused action in the manifest'
,
async
()
=>
{
const
actionsRoutesState
=
await
getActionsRoutesStateByRuntime
(
next
)
expect
(
actionsRoutesState
).
toMatchObject
({
'app/server/one/page'
:
{
rsc
:
1
,
},
'app/server/two/page'
:
{
rsc
:
1
,
},
'app/client/one/page'
:
{
'action-browser'
:
1
,
},
'app/client/two/page'
:
{
'action-browser'
:
1
,
},
})
})
})
test/production/app-dir/actions-tree-shaking/shared-module-actions/tsconfig.json
deleted
100644 → 0
View file @
24647b9a
{
"compilerOptions"
:
{
"target"
:
"ES2017"
,
"lib"
:
[
"dom"
,
"dom.iterable"
,
"esnext"
],
"allowJs"
:
true
,
"skipLibCheck"
:
true
,
"strict"
:
false
,
"noEmit"
:
true
,
"incremental"
:
true
,
"module"
:
"esnext"
,
"esModuleInterop"
:
true
,
"moduleResolution"
:
"node"
,
"resolveJsonModule"
:
true
,
"isolatedModules"
:
true
,
"jsx"
:
"preserve"
,
"plugins"
:
[
{
"name"
:
"next"
}
]
},
"include"
:
[
"next-env.d.ts"
,
".next/types/**/*.ts"
,
"**/*.ts"
,
"**/*.tsx"
],
"exclude"
:
[
"node_modules"
]
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/app/layout.js
deleted
100644 → 0
View file @
24647b9a
export
default
function
Layout
({
children
})
{
return
(
<
html
>
<
body
>
{
children
}
<
/body
>
<
/html
>
)
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/actions.ts
deleted
100644 → 0
View file @
24647b9a
'use server'
export
async
function
action1
()
{
return
{
hello
:
'world'
}
}
export
async
function
action2
()
{
return
{
hello
:
'action2'
}
}
export
async
function
action3
()
{
return
{
hello
:
'action3'
}
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/my-component.tsx
deleted
100644 → 0
View file @
24647b9a
import
{
action3
}
from
'./actions'
export
default
function
MyComponent
()
{
// to prevent tree-shaking
if
(
globalThis
.
DO_NOT_TREE_SHAKE
)
{
console
.
log
(
'MyComponent imported action3'
,
action3
)
}
return
<
span
>
i'm MyComponent
</
span
>
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/app/mixed/page.tsx
deleted
100644 → 0
View file @
24647b9a
'use client'
import
React
,
{
useEffect
}
from
'react'
import
{
action1
,
action2
}
from
'./actions'
import
MyComponent
from
'./my-component'
export
default
function
Page
()
{
// to prevent tree-shaking
if
(
globalThis
.
DO_NOT_TREE_SHAKE
)
{
console
.
log
(
'Page imported action2'
,
action2
)
}
// calling action1 fails!!
useEffect
(()
=>
{
if
(
globalThis
.
DO_NOT_TREE_SHAKE
)
{
action1
().
then
((
obj
)
=>
{
console
.
log
(
'action1 returned:'
,
obj
)
})
}
},
[])
return
<
MyComponent
/>
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/tsconfig.json
deleted
100644 → 0
View file @
24647b9a
{
"compilerOptions"
:
{
"target"
:
"ES2017"
,
"lib"
:
[
"dom"
,
"dom.iterable"
,
"esnext"
],
"allowJs"
:
true
,
"skipLibCheck"
:
true
,
"strict"
:
false
,
"noEmit"
:
true
,
"incremental"
:
true
,
"module"
:
"esnext"
,
"esModuleInterop"
:
true
,
"moduleResolution"
:
"node"
,
"resolveJsonModule"
:
true
,
"isolatedModules"
:
true
,
"jsx"
:
"preserve"
,
"plugins"
:
[
{
"name"
:
"next"
}
]
},
"include"
:
[
"next-env.d.ts"
,
".next/types/**/*.ts"
,
"**/*.ts"
,
"**/*.tsx"
],
"exclude"
:
[
"node_modules"
]
}
test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts
deleted
100644 → 0
View file @
24647b9a
process
.
env
.
TEST_EDGE
=
'1'
require
(
'./use-effect-actions.test'
)
test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts
deleted
100644 → 0
View file @
24647b9a
import
{
nextTestSetup
}
from
'e2e-utils'
import
{
getActionsRoutesStateByRuntime
,
markLayoutAsEdge
,
}
from
'../_testing/utils'
describe
(
'actions-tree-shaking - use-effect-actions'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
if
(
process
.
env
.
TEST_EDGE
)
{
markLayoutAsEdge
(
next
)
}
it
(
'should not tree shake the used action under useEffect'
,
async
()
=>
{
const
actionsRoutesState
=
await
getActionsRoutesStateByRuntime
(
next
)
expect
(
actionsRoutesState
).
toMatchObject
({
'app/mixed/page'
:
{
'action-browser'
:
3
,
},
})
})
})
test/turbopack-build-tests-manifest.json
View file @
99de0573
...
@@ -15529,96 +15529,6 @@
...
@@ -15529,96 +15529,6 @@
"pending"
:
[],
"pending"
:
[],
"flakey"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/basic/basic.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - basic should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - mixed-module-actions should not do tree shake for cjs module when import server actions"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/reexport/reexport.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - reexport should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - shared-module-actions should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/basic/basic-edge.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - basic should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/mixed-module-actions/mixed-module-actions-edge.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - mixed-module-actions should not do tree shake for cjs module when import server actions"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/reexport/reexport-edge.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - reexport should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/shared-module-actions/shared-module-actions-edge.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - shared-module-actions should not have the unused action in the manifest"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions-edge.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - use-effect-actions should not tree shake the used action under useEffect"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
},
"test/production/app-dir/actions-tree-shaking/use-effect-actions/use-effect-actions.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"actions-tree-shaking - use-effect-actions should not tree shake the used action under useEffect"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
}
}
},
},
"rules"
:
{
"rules"
:
{
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