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
e5ae3835
Unverified
Commit
e5ae3835
authored
Nov 08, 2024
by
Janka Uryga
Committed by
GitHub
Nov 08, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: decrypt bound args before generating a cache key (#72463)
parent
b005bdce
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
93 additions
and
160 deletions
+93
-160
server_actions.rs
...s/next-custom-transforms/src/transforms/server_actions.rs
+27
-125
output.js
...ests/fixture/next-font-with-directive/use-cache/output.js
+2
-2
output.js
...ansforms/tests/fixture/server-actions/server/33/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/34/output.js
+4
-4
output.js
...ansforms/tests/fixture/server-actions/server/35/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/36/output.js
+4
-4
output.js
...ansforms/tests/fixture/server-actions/server/37/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/38/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/39/output.js
+1
-2
output.js
...ansforms/tests/fixture/server-actions/server/40/output.js
+1
-2
output.js
...ansforms/tests/fixture/server-actions/server/41/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/42/output.js
+1
-2
output.js
...ansforms/tests/fixture/server-actions/server/43/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/45/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/46/output.js
+3
-3
output.js
...ansforms/tests/fixture/server-actions/server/48/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/49/output.js
+1
-1
output.js
...ansforms/tests/fixture/server-actions/server/50/output.js
+1
-1
encryption.ts
packages/next/src/server/app-render/encryption.ts
+2
-1
use-cache-wrapper.ts
packages/next/src/server/use-cache/use-cache-wrapper.ts
+33
-1
page.tsx
test/e2e/app-dir/use-cache/app/passed-to-client/page.tsx
+4
-3
use-cache.test.ts
test/e2e/app-dir/use-cache/use-cache.test.ts
+1
-1
No files found.
crates/next-custom-transforms/src/transforms/server_actions.rs
View file @
e5ae3835
...
@@ -618,78 +618,23 @@ impl<C: Comments> ServerActions<C> {
...
@@ -618,78 +618,23 @@ impl<C: Comments> ServerActions<C> {
});
});
}
}
// export const $ACTION_myAction = async () => {}
let
mut
new_params
:
Vec
<
Param
>
=
vec!
[];
let
mut
new_params
:
Vec
<
Param
>
=
vec!
[];
let
mut
new_body
:
BlockStmtOrExpr
=
*
arrow
.body
.take
();
// Add the collected closure variables as the first parameters to the
// function. They are unencrypted and passed into this function by the
// cache wrapper.
if
!
ids_from_closure
.is_empty
()
{
if
!
ids_from_closure
.is_empty
()
{
// First argument is the encrypted closure variables
new_params
.push
(
Param
{
span
:
DUMMY_SP
,
decorators
:
vec!
[],
pat
:
Pat
::
Ident
(
IdentName
::
new
(
"$$ACTION_CLOSURE_BOUND"
.into
(),
DUMMY_SP
)
.into
()),
});
// Also prepend the decryption decl into the body.
// var [arg1, arg2, arg3] = await decryptActionBoundArgs(actionId,
// $$ACTION_CLOSURE_BOUND)
let
mut
pats
=
vec!
[];
for
i
in
0
..
ids_from_closure
.len
()
{
for
i
in
0
..
ids_from_closure
.len
()
{
pats
.push
(
Some
(
Pat
::
Ident
(
new_params
.push
(
Param
{
Ident
::
new
(
span
:
DUMMY_SP
,
decorators
:
vec!
[],
pat
:
Ident
::
new
(
format!
(
"$$ACTION_ARG_{i}"
)
.into
(),
format!
(
"$$ACTION_ARG_{i}"
)
.into
(),
DUMMY_SP
,
DUMMY_SP
,
self
.private_ctxt
,
self
.private_ctxt
,
)
)
.into
(),
.into
(),
)));
});
}
let
decryption_decl
=
VarDecl
{
span
:
DUMMY_SP
,
kind
:
VarDeclKind
::
Var
,
declare
:
false
,
decls
:
vec!
[
VarDeclarator
{
span
:
DUMMY_SP
,
name
:
Pat
::
Array
(
ArrayPat
{
span
:
DUMMY_SP
,
elems
:
pats
,
optional
:
false
,
type_ann
:
None
,
}),
init
:
Some
(
Box
::
new
(
Expr
::
Await
(
AwaitExpr
{
span
:
DUMMY_SP
,
arg
:
Box
::
new
(
Expr
::
Call
(
CallExpr
{
span
:
DUMMY_SP
,
callee
:
quote_ident!
(
"decryptActionBoundArgs"
)
.as_callee
(),
args
:
vec!
[
reference_id
.clone
()
.as_arg
(),
quote_ident!
(
"$$ACTION_CLOSURE_BOUND"
)
.as_arg
(),
],
..
Default
::
default
()
})),
}))),
definite
:
Default
::
default
(),
}],
..
Default
::
default
()
};
match
&
mut
new_body
{
BlockStmtOrExpr
::
BlockStmt
(
body
)
=>
{
body
.stmts
.insert
(
0
,
decryption_decl
.into
());
}
BlockStmtOrExpr
::
Expr
(
body_expr
)
=>
{
new_body
=
BlockStmtOrExpr
::
BlockStmt
(
BlockStmt
{
span
:
DUMMY_SP
,
stmts
:
vec!
[
decryption_decl
.into
(),
Stmt
::
Return
(
ReturnStmt
{
span
:
DUMMY_SP
,
arg
:
Some
(
body_expr
.take
()),
}),
],
..
Default
::
default
()
});
}
}
}
}
}
...
@@ -717,7 +662,7 @@ impl<C: Comments> ServerActions<C> {
...
@@ -717,7 +662,7 @@ impl<C: Comments> ServerActions<C> {
ident
:
None
,
ident
:
None
,
function
:
Box
::
new
(
Function
{
function
:
Box
::
new
(
Function
{
params
:
new_params
,
params
:
new_params
,
body
:
match
new_body
{
body
:
match
*
arrow
.body
.take
()
{
BlockStmtOrExpr
::
BlockStmt
(
body
)
=>
Some
(
body
),
BlockStmtOrExpr
::
BlockStmt
(
body
)
=>
Some
(
body
),
BlockStmtOrExpr
::
Expr
(
expr
)
=>
Some
(
BlockStmt
{
BlockStmtOrExpr
::
Expr
(
expr
)
=>
Some
(
BlockStmt
{
span
:
DUMMY_SP
,
span
:
DUMMY_SP
,
...
@@ -737,6 +682,7 @@ impl<C: Comments> ServerActions<C> {
...
@@ -737,6 +682,7 @@ impl<C: Comments> ServerActions<C> {
})),
})),
cache_type
,
cache_type
,
&
reference_id
,
&
reference_id
,
ids_from_closure
.len
(),
)),
)),
definite
:
false
,
definite
:
false
,
}],
}],
...
@@ -825,69 +771,24 @@ impl<C: Comments> ServerActions<C> {
...
@@ -825,69 +771,24 @@ impl<C: Comments> ServerActions<C> {
private_ctxt
:
self
.private_ctxt
,
private_ctxt
:
self
.private_ctxt
,
});
});
// export async function $ACTION_myAction () {}
let
mut
new_params
:
Vec
<
Param
>
=
vec!
[];
let
mut
new_params
:
Vec
<
Param
>
=
vec!
[];
let
mut
new_body
:
Option
<
BlockStmt
>
=
function
.body
.clone
();
// add params from closure collected ids
// Add the collected closure variables as the first parameters to the
// function. They are unencrypted and passed into this function by the
// cache wrapper.
if
!
ids_from_closure
.is_empty
()
{
if
!
ids_from_closure
.is_empty
()
{
// First argument is the encrypted closure variables
new_params
.push
(
Param
{
span
:
DUMMY_SP
,
decorators
:
vec!
[],
pat
:
Pat
::
Ident
(
IdentName
::
new
(
"$$ACTION_CLOSURE_BOUND"
.into
(),
DUMMY_SP
)
.into
()),
});
// Also prepend the decryption decl into the body.
// var [arg1, arg2, arg3] = await decryptActionBoundArgs(actionId,
// $$ACTION_CLOSURE_BOUND)
let
mut
pats
=
vec!
[];
for
i
in
0
..
ids_from_closure
.len
()
{
for
i
in
0
..
ids_from_closure
.len
()
{
pats
.push
(
Some
(
Pat
::
Ident
(
new_params
.push
(
Param
{
Ident
::
new
(
// $$ACTION_ARG_0
format!
(
"$$ACTION_ARG_{i}"
)
.into
(),
DUMMY_SP
,
self
.private_ctxt
,
)
.into
(),
)));
}
let
decryption_decl
=
VarDecl
{
span
:
DUMMY_SP
,
kind
:
VarDeclKind
::
Var
,
decls
:
vec!
[
VarDeclarator
{
span
:
DUMMY_SP
,
span
:
DUMMY_SP
,
name
:
Pat
::
Array
(
ArrayPat
{
decorators
:
vec!
[],
span
:
DUMMY_SP
,
pat
:
Pat
::
Ident
(
elems
:
pats
,
Ident
::
new
(
optional
:
false
,
format!
(
"$$ACTION_ARG_{i}"
)
.into
(),
type_ann
:
None
,
DUMMY_SP
,
}),
self
.private_ctxt
,
init
:
Some
(
Box
::
new
(
Expr
::
Await
(
AwaitExpr
{
)
span
:
DUMMY_SP
,
.into
(),
arg
:
Box
::
new
(
Expr
::
Call
(
CallExpr
{
),
span
:
DUMMY_SP
,
callee
:
quote_ident!
(
"decryptActionBoundArgs"
)
.as_callee
(),
args
:
vec!
[
reference_id
.clone
()
.as_arg
(),
quote_ident!
(
"$$ACTION_CLOSURE_BOUND"
)
.as_arg
(),
],
..
Default
::
default
()
})),
}))),
definite
:
Default
::
default
(),
}],
..
Default
::
default
()
};
if
let
Some
(
body
)
=
&
mut
new_body
{
body
.stmts
.insert
(
0
,
decryption_decl
.into
());
}
else
{
new_body
=
Some
(
BlockStmt
{
span
:
DUMMY_SP
,
stmts
:
vec!
[
decryption_decl
.into
()],
..
Default
::
default
()
});
});
}
}
}
}
...
@@ -911,12 +812,12 @@ impl<C: Comments> ServerActions<C> {
...
@@ -911,12 +812,12 @@ impl<C: Comments> ServerActions<C> {
ident
:
fn_name
.clone
(),
ident
:
fn_name
.clone
(),
function
:
Box
::
new
(
Function
{
function
:
Box
::
new
(
Function
{
params
:
new_params
,
params
:
new_params
,
body
:
new_body
,
..*
function
.take
()
..*
function
.take
()
}),
}),
})),
})),
cache_type
,
cache_type
,
&
reference_id
,
&
reference_id
,
ids_from_closure
.len
(),
)),
)),
definite
:
false
,
definite
:
false
,
}],
}],
...
@@ -2270,8 +2171,8 @@ fn retain_names_from_declared_idents(
...
@@ -2270,8 +2171,8 @@ fn retain_names_from_declared_idents(
*
child_names
=
retained_names
;
*
child_names
=
retained_names
;
}
}
fn
wrap_cache_expr
(
expr
:
Box
<
Expr
>
,
name
:
&
str
,
id
:
&
str
)
->
Box
<
Expr
>
{
fn
wrap_cache_expr
(
expr
:
Box
<
Expr
>
,
name
:
&
str
,
id
:
&
str
,
bound_args_len
:
usize
)
->
Box
<
Expr
>
{
// expr -> $$cache__("name", "id", expr)
// expr -> $$cache__("name", "id",
0,
expr)
Box
::
new
(
Expr
::
Call
(
CallExpr
{
Box
::
new
(
Expr
::
Call
(
CallExpr
{
span
:
DUMMY_SP
,
span
:
DUMMY_SP
,
callee
:
quote_ident!
(
"$$cache__"
)
.as_callee
(),
callee
:
quote_ident!
(
"$$cache__"
)
.as_callee
(),
...
@@ -2284,6 +2185,7 @@ fn wrap_cache_expr(expr: Box<Expr>, name: &str, id: &str) -> Box<Expr> {
...
@@ -2284,6 +2185,7 @@ fn wrap_cache_expr(expr: Box<Expr>, name: &str, id: &str) -> Box<Expr> {
spread
:
None
,
spread
:
None
,
expr
:
Box
::
new
(
id
.into
()),
expr
:
Box
::
new
(
id
.into
()),
},
},
Number
::
from
(
bound_args_len
)
.as_arg
(),
expr
.as_arg
(),
expr
.as_arg
(),
],
],
..
Default
::
default
()
..
Default
::
default
()
...
...
crates/next-custom-transforms/tests/fixture/next-font-with-directive/use-cache/output.js
View file @
e5ae3835
...
@@ -3,11 +3,11 @@ import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc
...
@@ -3,11 +3,11 @@ import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
React
from
'react'
;
import
React
from
'react'
;
import
inter
from
'@next/font/google/target.css?{"path":"app/test.tsx","import":"Inter","arguments":[],"variableName":"inter"}'
;
import
inter
from
'@next/font/google/target.css?{"path":"app/test.tsx","import":"Inter","arguments":[],"variableName":"inter"}'
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"c0dd5bb6fef67f5ab84327f5164ac2c3111a159337"
,
async
function
Cached
({
children
})
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"c0dd5bb6fef67f5ab84327f5164ac2c3111a159337"
,
0
,
async
function
Cached
({
children
})
{
return
<
div
className
=
{
inter
.
className
}
>
{
children
}
<
/div>
;
return
<
div
className
=
{
inter
.
className
}
>
{
children
}
<
/div>
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
"value"
:
"Cached"
,
"value"
:
"Cached"
,
"writable"
:
false
"writable"
:
false
});
});
export
var
Cached
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"c0dd5bb6fef67f5ab84327f5164ac2c3111a159337"
,
null
);
export
var
Cached
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"c0dd5bb6fef67f5ab84327f5164ac2c3111a159337"
,
null
);
\ No newline at end of file
crates/next-custom-transforms/tests/fixture/server-actions/server/33/output.js
View file @
e5ae3835
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
const
v
=
'world'
;
const
v
=
'world'
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
fn
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
fn
()
{
return
'hello, '
+
v
;
return
'hello, '
+
v
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/34/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"8012a8d21b6362b4cc8f5b15560525095bc48dba80":"$$RSC_SERVER_CACHE_3","803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","8069348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2","80951c375b4a6a6e89d67b743ec5808127cfde405d":"$$RSC_SERVER_CACHE_1"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"8012a8d21b6362b4cc8f5b15560525095bc48dba80":"$$RSC_SERVER_CACHE_3","803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","8069348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2","80951c375b4a6a6e89d67b743ec5808127cfde405d":"$$RSC_SERVER_CACHE_1"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
()
{
return
'foo'
;
return
'foo'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
@@ -10,7 +10,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_0, "name", {
...
@@ -10,7 +10,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_0, "name", {
});
});
const
foo
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
null
);
const
foo
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
null
);
export
{
bar
};
export
{
bar
};
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
async
function
bar
()
{
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
0
,
async
function
bar
()
{
return
'bar'
;
return
'bar'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_1
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_1
,
"name"
,
{
...
@@ -22,7 +22,7 @@ var bar = registerServerReference($$RSC_SERVER_CACHE_1, "80951c375b4a6a6e89d67b7
...
@@ -22,7 +22,7 @@ var bar = registerServerReference($$RSC_SERVER_CACHE_1, "80951c375b4a6a6e89d67b7
const
qux
=
async
function
qux
()
{
const
qux
=
async
function
qux
()
{
return
'qux'
;
return
'qux'
;
};
};
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"8069348c79fce073bae2f70f139565a2fda1c74c74"
,
async
function
baz
()
{
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"8069348c79fce073bae2f70f139565a2fda1c74c74"
,
0
,
async
function
baz
()
{
return
qux
()
+
'baz'
;
return
qux
()
+
'baz'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_2
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_2
,
"name"
,
{
...
@@ -30,7 +30,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_2, "name", {
...
@@ -30,7 +30,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_2, "name", {
"writable"
:
false
"writable"
:
false
});
});
const
baz
=
registerServerReference
(
$$RSC_SERVER_CACHE_2
,
"8069348c79fce073bae2f70f139565a2fda1c74c74"
,
null
);
const
baz
=
registerServerReference
(
$$RSC_SERVER_CACHE_2
,
"8069348c79fce073bae2f70f139565a2fda1c74c74"
,
null
);
export
var
$$RSC_SERVER_CACHE_3
=
$$cache__
(
"default"
,
"8012a8d21b6362b4cc8f5b15560525095bc48dba80"
,
async
function
()
{
export
var
$$RSC_SERVER_CACHE_3
=
$$cache__
(
"default"
,
"8012a8d21b6362b4cc8f5b15560525095bc48dba80"
,
0
,
async
function
()
{
return
'quux'
;
return
'quux'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_3
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_3
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/35/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
()
{
return
'data'
;
return
'data'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/36/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"8012a8d21b6362b4cc8f5b15560525095bc48dba80":"$$RSC_SERVER_CACHE_3","803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","80951c375b4a6a6e89d67b743ec5808127cfde405d":"$$RSC_SERVER_CACHE_1","c069348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"8012a8d21b6362b4cc8f5b15560525095bc48dba80":"$$RSC_SERVER_CACHE_3","803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","80951c375b4a6a6e89d67b743ec5808127cfde405d":"$$RSC_SERVER_CACHE_1","c069348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
foo
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
foo
()
{
return
'data A'
;
return
'data A'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
@@ -9,7 +9,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_0, "name", {
...
@@ -9,7 +9,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_0, "name", {
"writable"
:
false
"writable"
:
false
});
});
export
var
foo
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
null
);
export
var
foo
=
registerServerReference
(
$$RSC_SERVER_CACHE_0
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
null
);
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
async
function
bar
()
{
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
0
,
async
function
bar
()
{
return
'data B'
;
return
'data B'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_1
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_1
,
"name"
,
{
...
@@ -17,7 +17,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_1, "name", {
...
@@ -17,7 +17,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_1, "name", {
"writable"
:
false
"writable"
:
false
});
});
export
var
bar
=
registerServerReference
(
$$RSC_SERVER_CACHE_1
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
null
);
export
var
bar
=
registerServerReference
(
$$RSC_SERVER_CACHE_1
,
"80951c375b4a6a6e89d67b743ec5808127cfde405d"
,
null
);
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"c069348c79fce073bae2f70f139565a2fda1c74c74"
,
async
function
Cached
({
children
})
{
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"c069348c79fce073bae2f70f139565a2fda1c74c74"
,
0
,
async
function
Cached
({
children
})
{
return
children
;
return
children
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_2
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_2
,
"name"
,
{
...
@@ -25,7 +25,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_2, "name", {
...
@@ -25,7 +25,7 @@ Object.defineProperty($$RSC_SERVER_CACHE_2, "name", {
"writable"
:
false
"writable"
:
false
});
});
export
default
registerServerReference
(
$$RSC_SERVER_CACHE_2
,
"c069348c79fce073bae2f70f139565a2fda1c74c74"
,
null
);
export
default
registerServerReference
(
$$RSC_SERVER_CACHE_2
,
"c069348c79fce073bae2f70f139565a2fda1c74c74"
,
null
);
export
var
$$RSC_SERVER_CACHE_3
=
$$cache__
(
"default"
,
"8012a8d21b6362b4cc8f5b15560525095bc48dba80"
,
async
function
baz
()
{
export
var
$$RSC_SERVER_CACHE_3
=
$$cache__
(
"default"
,
"8012a8d21b6362b4cc8f5b15560525095bc48dba80"
,
0
,
async
function
baz
()
{
return
'data C'
;
return
'data C'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_3
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_3
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/37/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
fn
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
fn
()
{
return
'foo'
;
return
'foo'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/38/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"x"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
foo
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"x"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
foo
()
{
return
'data'
;
return
'data'
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/39/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
fn
(
$$ACTION_CLOSURE_BOUND
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
2
,
async
function
fn
(
$$ACTION_ARG_0
,
$$ACTION_ARG_1
)
{
var
[
$$ACTION_ARG_0
,
$$ACTION_ARG_1
]
=
await
decryptActionBoundArgs
(
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
$$ACTION_CLOSURE_BOUND
);
console
.
log
(
$$ACTION_ARG_0
);
console
.
log
(
$$ACTION_ARG_0
);
return
{
return
{
foo
:
$$ACTION_ARG_1
foo
:
$$ACTION_ARG_1
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/40/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"401c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","c03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"401c36b06e398c97abe5d5d7ae8c672bfddf4e1b91":"$$RSC_SERVER_ACTION_2","c03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"c03128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
cache
(
$$ACTION_CLOSURE_BOUND
,
e
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"c03128060c414d59f8552e4788b846c0d2b7f74743"
,
2
,
async
function
cache
(
$$ACTION_ARG_0
,
$$ACTION_ARG_1
,
e
)
{
var
[
$$ACTION_ARG_0
,
$$ACTION_ARG_1
]
=
await
decryptActionBoundArgs
(
"c03128060c414d59f8552e4788b846c0d2b7f74743"
,
$$ACTION_CLOSURE_BOUND
);
const
f
=
$$ACTION_ARG_0
+
e
;
const
f
=
$$ACTION_ARG_0
+
e
;
return
[
return
[
f
,
f
,
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/41/output.js
View file @
e5ae3835
...
@@ -8,7 +8,7 @@ export const $$RSC_SERVER_ACTION_0 = async function fn($$ACTION_CLOSURE_BOUND) {
...
@@ -8,7 +8,7 @@ export const $$RSC_SERVER_ACTION_0 = async function fn($$ACTION_CLOSURE_BOUND) {
foo
:
$$ACTION_ARG_1
foo
:
$$ACTION_ARG_1
};
};
};
};
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"c0951c375b4a6a6e89d67b743ec5808127cfde405d"
,
async
function
Component
({
foo
})
{
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"c0951c375b4a6a6e89d67b743ec5808127cfde405d"
,
0
,
async
function
Component
({
foo
})
{
const
a
=
123
;
const
a
=
123
;
var
fn
=
registerServerReference
(
$$RSC_SERVER_ACTION_0
,
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
null
).
bind
(
null
,
encryptActionBoundArgs
(
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
[
var
fn
=
registerServerReference
(
$$RSC_SERVER_ACTION_0
,
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
null
).
bind
(
null
,
encryptActionBoundArgs
(
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
[
a
,
a
,
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/42/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"803128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
(
$$ACTION_CLOSURE_BOUND
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
2
,
async
function
(
$$ACTION_ARG_0
,
$$ACTION_ARG_1
)
{
var
[
$$ACTION_ARG_0
,
$$ACTION_ARG_1
]
=
await
decryptActionBoundArgs
(
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
$$ACTION_CLOSURE_BOUND
);
console
.
log
(
$$ACTION_ARG_0
);
console
.
log
(
$$ACTION_ARG_0
);
return
{
return
{
foo
:
$$ACTION_ARG_1
foo
:
$$ACTION_ARG_1
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/43/output.js
View file @
e5ae3835
...
@@ -7,7 +7,7 @@ export const $$RSC_SERVER_ACTION_0 = async function action($$ACTION_CLOSURE_BOUN
...
@@ -7,7 +7,7 @@ export const $$RSC_SERVER_ACTION_0 = async function action($$ACTION_CLOSURE_BOUN
var
[
$$ACTION_ARG_0
]
=
await
decryptActionBoundArgs
(
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
$$ACTION_CLOSURE_BOUND
);
var
[
$$ACTION_ARG_0
]
=
await
decryptActionBoundArgs
(
"006a88810ecce4a4e8b59d53b8327d7e98bbf251d7"
,
$$ACTION_CLOSURE_BOUND
);
console
.
log
(
secret
,
$$ACTION_ARG_0
);
console
.
log
(
secret
,
$$ACTION_ARG_0
);
};
};
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"e0951c375b4a6a6e89d67b743ec5808127cfde405d"
,
async
function
getCachedRandom
(
x
,
children
)
{
export
var
$$RSC_SERVER_CACHE_1
=
$$cache__
(
"default"
,
"e0951c375b4a6a6e89d67b743ec5808127cfde405d"
,
0
,
async
function
getCachedRandom
(
x
,
children
)
{
return
{
return
{
x
,
x
,
y
:
Math
.
random
(),
y
:
Math
.
random
(),
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/45/output.js
View file @
e5ae3835
...
@@ -7,7 +7,7 @@ function Foo() {
...
@@ -7,7 +7,7 @@ function Foo() {
console
.
log
(
v
);
console
.
log
(
v
);
return
v
;
return
v
;
}
}
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
bar
()
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"803128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
bar
()
{
return
<
Foo
/>
;
return
<
Foo
/>
;
});
});
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
Object
.
defineProperty
(
$$RSC_SERVER_CACHE_0
,
"name"
,
{
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/46/output.js
View file @
e5ae3835
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
/* __next_internal_action_entry_do_not_use__ {"6090b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1","7c9ed0cc47abc4e1c64320cf42b74ae60b58c40f00":"$$RSC_SERVER_ACTION_3","7ea9b2939c1f39073a6bed227fd20233064c8b7869":"$$RSC_SERVER_ACTION_4","e03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","ff471a5eb0be1c31686dd4ba938a80328b80b1615d":"$$RSC_SERVER_CACHE_5","ff69348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"6090b5db271335765a4b0eab01f044b381b5ebd5cd":"$$RSC_SERVER_ACTION_1","7c9ed0cc47abc4e1c64320cf42b74ae60b58c40f00":"$$RSC_SERVER_ACTION_3","7ea9b2939c1f39073a6bed227fd20233064c8b7869":"$$RSC_SERVER_ACTION_4","e03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0","ff471a5eb0be1c31686dd4ba938a80328b80b1615d":"$$RSC_SERVER_CACHE_5","ff69348c79fce073bae2f70f139565a2fda1c74c74":"$$RSC_SERVER_CACHE_2"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"e03128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
f1
(
a
,
b
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"e03128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
f1
(
a
,
b
)
{
return
[
return
[
a
,
a
,
b
b
...
@@ -22,7 +22,7 @@ $$RSC_SERVER_ACTION_1 = async function f2(a, b) {
...
@@ -22,7 +22,7 @@ $$RSC_SERVER_ACTION_1 = async function f2(a, b) {
];
];
};
};
var
f2
=
registerServerReference
(
$$RSC_SERVER_ACTION_1
,
"6090b5db271335765a4b0eab01f044b381b5ebd5cd"
,
null
);
var
f2
=
registerServerReference
(
$$RSC_SERVER_ACTION_1
,
"6090b5db271335765a4b0eab01f044b381b5ebd5cd"
,
null
);
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"ff69348c79fce073bae2f70f139565a2fda1c74c74"
,
// Should be 1 111111 1, which is "ff" in hex.
export
var
$$RSC_SERVER_CACHE_2
=
$$cache__
(
"default"
,
"ff69348c79fce073bae2f70f139565a2fda1c74c74"
,
0
,
// Should be 1 111111 1, which is "ff" in hex.
async
function
f3
(
a
,
b
,
...
rest
)
{
async
function
f3
(
a
,
b
,
...
rest
)
{
return
[
return
[
a
,
a
,
...
@@ -58,7 +58,7 @@ $$RSC_SERVER_ACTION_4 = async function f4(a, b, c, d, e, f) {
...
@@ -58,7 +58,7 @@ $$RSC_SERVER_ACTION_4 = async function f4(a, b, c, d, e, f) {
];
];
};
};
var
f4
=
registerServerReference
(
$$RSC_SERVER_ACTION_4
,
"7ea9b2939c1f39073a6bed227fd20233064c8b7869"
,
null
);
var
f4
=
registerServerReference
(
$$RSC_SERVER_ACTION_4
,
"7ea9b2939c1f39073a6bed227fd20233064c8b7869"
,
null
);
export
var
$$RSC_SERVER_CACHE_5
=
$$cache__
(
"default"
,
"ff471a5eb0be1c31686dd4ba938a80328b80b1615d"
,
// Should be 1 111111 1, which is "ff" in hex.
export
var
$$RSC_SERVER_CACHE_5
=
$$cache__
(
"default"
,
"ff471a5eb0be1c31686dd4ba938a80328b80b1615d"
,
0
,
// Should be 1 111111 1, which is "ff" in hex.
async
function
f5
(
a
,
b
,
c
,
d
,
e
,
f
,
g
)
{
async
function
f5
(
a
,
b
,
c
,
d
,
e
,
f
,
g
)
{
return
[
return
[
a
,
a
,
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/48/output.js
View file @
e5ae3835
...
@@ -24,7 +24,7 @@ export async function action3(a, b) {
...
@@ -24,7 +24,7 @@ export async function action3(a, b) {
{
b
}
{
b
}
<
/div>
;
<
/div>
;
}
}
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"e03128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
cache
(
a
,
b
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"e03128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
cache
(
a
,
b
)
{
return
<
div
>
return
<
div
>
{
a
}
{
a
}
{
b
}
{
b
}
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/49/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"f03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"f03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"f03128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
(
a
,
b
,
c
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"f03128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
(
a
,
b
,
c
)
{
return
<
div
>
return
<
div
>
{
a
}
{
a
}
{
b
}
{
b
}
...
...
crates/next-custom-transforms/tests/fixture/server-actions/server/50/output.js
View file @
e5ae3835
/* __next_internal_action_entry_do_not_use__ {"f03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
/* __next_internal_action_entry_do_not_use__ {"f03128060c414d59f8552e4788b846c0d2b7f74743":"$$RSC_SERVER_CACHE_0"} */
import
{
registerServerReference
}
from
"private-next-rsc-server-reference"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
encryptActionBoundArgs
,
decryptActionBoundArgs
}
from
"private-next-rsc-action-encryption"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
import
{
cache
as
$$cache__
}
from
"private-next-rsc-cache-wrapper"
;
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"f03128060c414d59f8552e4788b846c0d2b7f74743"
,
async
function
(
a
,
b
,
c
)
{
export
var
$$RSC_SERVER_CACHE_0
=
$$cache__
(
"default"
,
"f03128060c414d59f8552e4788b846c0d2b7f74743"
,
0
,
async
function
(
a
,
b
,
c
)
{
return
<
div
>
return
<
div
>
{
a
}
{
a
}
{
b
}
{
b
}
...
...
packages/next/src/server/app-render/encryption.ts
View file @
e5ae3835
...
@@ -16,6 +16,7 @@ import {
...
@@ -16,6 +16,7 @@ import {
getServerModuleMap
,
getServerModuleMap
,
stringToUint8Array
,
stringToUint8Array
,
}
from
'./encryption-utils'
}
from
'./encryption-utils'
import
{
workUnitAsyncStorage
}
from
'./work-unit-async-storage.external'
const
isEdgeRuntime
=
process
.
env
.
NEXT_RUNTIME
===
'edge'
const
isEdgeRuntime
=
process
.
env
.
NEXT_RUNTIME
===
'edge'
...
@@ -56,7 +57,7 @@ async function encodeActionBoundArg(actionId: string, arg: string) {
...
@@ -56,7 +57,7 @@ async function encodeActionBoundArg(actionId: string, arg: string) {
// Get 16 random bytes as iv.
// Get 16 random bytes as iv.
const
randomBytes
=
new
Uint8Array
(
16
)
const
randomBytes
=
new
Uint8Array
(
16
)
crypto
.
getRandomValues
(
randomBytes
)
workUnitAsyncStorage
.
exit
(()
=>
crypto
.
getRandomValues
(
randomBytes
)
)
const
ivValue
=
arrayBufferToString
(
randomBytes
.
buffer
)
const
ivValue
=
arrayBufferToString
(
randomBytes
.
buffer
)
const
encrypted
=
await
encrypt
(
const
encrypted
=
await
encrypt
(
...
...
packages/next/src/server/use-cache/use-cache-wrapper.ts
View file @
e5ae3835
...
@@ -36,6 +36,8 @@ import {
...
@@ -36,6 +36,8 @@ import {
import
DefaultCacheHandler
from
'../lib/cache-handlers/default'
import
DefaultCacheHandler
from
'../lib/cache-handlers/default'
import
type
{
CacheHandler
,
CacheEntry
}
from
'../lib/cache-handlers/types'
import
type
{
CacheHandler
,
CacheEntry
}
from
'../lib/cache-handlers/types'
import
type
{
CacheSignal
}
from
'../app-render/cache-signal'
import
type
{
CacheSignal
}
from
'../app-render/cache-signal'
import
{
decryptActionBoundArgs
}
from
'../app-render/encryption'
import
{
InvariantError
}
from
'../../shared/lib/invariant-error'
const
isEdgeRuntime
=
process
.
env
.
NEXT_RUNTIME
===
'edge'
const
isEdgeRuntime
=
process
.
env
.
NEXT_RUNTIME
===
'edge'
...
@@ -433,7 +435,12 @@ function createTrackedReadableStream(
...
@@ -433,7 +435,12 @@ function createTrackedReadableStream(
})
})
}
}
export
function
cache
(
kind
:
string
,
id
:
string
,
fn
:
any
)
{
export
function
cache
(
kind
:
string
,
id
:
string
,
boundArgsLength
:
number
,
fn
:
any
)
{
if
(
!
process
.
env
.
__NEXT_DYNAMIC_IO
)
{
if
(
!
process
.
env
.
__NEXT_DYNAMIC_IO
)
{
throw
new
Error
(
throw
new
Error
(
'"use cache" is only available with the experimental.dynamicIO config.'
'"use cache" is only available with the experimental.dynamicIO config.'
...
@@ -495,6 +502,31 @@ export function cache(kind: string, id: string, fn: any) {
...
@@ -495,6 +502,31 @@ export function cache(kind: string, id: string, fn: any) {
}
}
}
}
if
(
boundArgsLength
>
0
)
{
if
(
args
.
length
===
0
)
{
throw
new
InvariantError
(
`Expected the "use cache" function
${
JSON
.
stringify
(
fn
.
name
)}
to receive its encrypted bound arguments as the first argument.`
)
}
const
encryptedBoundArgs
=
args
.
shift
()
const
boundArgs
=
await
decryptActionBoundArgs
(
id
,
encryptedBoundArgs
)
if
(
!
Array
.
isArray
(
boundArgs
))
{
throw
new
InvariantError
(
`Expected the bound arguments of "use cache" function
${
JSON
.
stringify
(
fn
.
name
)}
to deserialize into an array, got
${
typeof
boundArgs
}
instead.`
)
}
if
(
boundArgsLength
!==
boundArgs
.
length
)
{
throw
new
InvariantError
(
`Expected the "use cache" function
${
JSON
.
stringify
(
fn
.
name
)}
to receive
${
boundArgsLength
}
bound arguments, got
${
boundArgs
.
length
}
instead.`
)
}
args
.
unshift
(...
boundArgs
)
}
const
temporaryReferences
=
createClientTemporaryReferenceSet
()
const
temporaryReferences
=
createClientTemporaryReferenceSet
()
const
encodedArguments
:
FormData
|
string
=
await
encodeReply
(
const
encodedArguments
:
FormData
|
string
=
await
encodeReply
(
[
buildId
,
id
,
args
],
[
buildId
,
id
,
args
],
...
...
test/e2e/app-dir/use-cache/app/passed-to-client/page.tsx
View file @
e5ae3835
...
@@ -7,19 +7,20 @@ function getRandomValue() {
...
@@ -7,19 +7,20 @@ function getRandomValue() {
}
}
export
default
function
Page
()
{
export
default
function
Page
()
{
const
offset
=
100
return
(
return
(
<
Form
<
Form
foo=
{
async
function
fooNamed
()
{
foo=
{
async
function
fooNamed
()
{
'use cache'
'use cache'
return
getRandomValue
()
return
offset
+
getRandomValue
()
}
}
}
}
bar=
{
async
function
()
{
bar=
{
async
function
()
{
'use cache'
'use cache'
return
getRandomValue
()
return
offset
+
getRandomValue
()
}
}
}
}
baz=
{
async
()
=>
{
baz=
{
async
()
=>
{
'use cache'
'use cache'
return
getRandomValue
()
return
offset
+
getRandomValue
()
}
}
}
}
/>
/>
)
)
...
...
test/e2e/app-dir/use-cache/use-cache.test.ts
View file @
e5ae3835
...
@@ -162,7 +162,7 @@ describe('use-cache', () => {
...
@@ -162,7 +162,7 @@ describe('use-cache', () => {
await
retry
(
async
()
=>
{
await
retry
(
async
()
=>
{
threeRandomValues
=
await
browser
.
elementByCss
(
'p'
).
text
()
threeRandomValues
=
await
browser
.
elementByCss
(
'p'
).
text
()
expect
(
threeRandomValues
).
toMatch
(
/
\d\.\d
+
\d
\.\d
+/
)
expect
(
threeRandomValues
).
toMatch
(
/
100
\.\d
+ 100
\.\d
+ 100
\.\d
+/
)
})
})
await
browser
.
elementById
(
'reset-button'
).
click
()
await
browser
.
elementById
(
'reset-button'
).
click
()
...
...
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