Unverified Commit 70dde15f authored by vercel-fleet-prod[bot]'s avatar vercel-fleet-prod[bot] Committed by GitHub

Split isolatable use-cache implementations into import fragments

Co-authored-by: 's avatarNiklas Mischkulnig <4586894+mischnic@users.noreply.github.com>
parent 25cfbd6a
......@@ -30,8 +30,8 @@ use swc_core::{
atoms::atom,
common::{FileName, Mark, SyntaxContext, comments::SingleThreadedComments},
ecma::{
ast::Pass,
parser::{EsSyntax, Syntax, TsSyntax},
ast::{Expr, ExprStmt, Lit, ModuleDecl, ModuleItem, Pass, Program, Stmt, fn_pass},
parser::{EsSyntax, Syntax, TsSyntax, parse_file_as_module},
transforms::{
base::resolver,
react::jsx,
......@@ -597,6 +597,102 @@ fn server_actions_fixture(input: PathBuf) {
);
}
// Snapshot the decoded implementation modules too, so the import boundary is
// reviewable without decoding percent-encoded JavaScript and inline source maps.
#[fixture("tests/fixture/server-actions/server-graph/turbopack/**/input.*")]
fn cache_fragment_fixture(input: PathBuf) {
let expected = match input
.parent()
.unwrap()
.file_name()
.unwrap()
.to_str()
.unwrap()
{
"cache-imports" | "cache-file" => 2,
"cache-closure" => 1,
"cache-fallback" => 0,
name => panic!("add fragment expectations for {name}"),
};
test_fixture(
Syntax::Typescript(TsSyntax {
tsx: true,
..Default::default()
}),
&|tr| {
let unresolved_mark = Mark::new();
let cm = tr.cm.clone();
(
resolver(unresolved_mark, Mark::new(), true),
server_actions(
&FileName::Real("/app/item.js".into()),
Some("?test".into()),
server_actions::Config {
is_react_server_layer: true,
is_development: false,
use_cache_enabled: true,
hash_salt: "".into(),
cache_kinds: FxHashSet::from_iter(["x".into()]),
},
tr.comments.as_ref().clone(),
unresolved_mark,
cm.clone(),
Default::default(),
ServerActionsMode::Turbopack,
),
fn_pass(move |program| {
let Program::Module(module) = program else {
unreachable!()
};
let mut fragments = Vec::new();
let mut count = 0;
for item in &module.body {
let ModuleItem::ModuleDecl(ModuleDecl::Import(import)) = item else {
continue;
};
let Some(encoded) = import
.src
.value
.as_str()
.and_then(|url| url.strip_prefix("data:text/javascript,"))
else {
continue;
};
let decoded = urlencoding::decode(encoded).unwrap();
assert!(decoded.contains("__next_internal_action_entry_do_not_use__"));
assert!(decoded.contains("/app/item.js"));
assert!(decoded.contains("?test"));
assert!(decoded.contains("sourceMappingURL=data:application/json;base64,"));
let file = cm.new_source_file(FileName::Anon.into(), decoded.into_owned());
let fragment = parse_file_as_module(
&file,
syntax(),
Default::default(),
None,
&mut Vec::new(),
)
.unwrap();
fragments.push(ModuleItem::Stmt(Stmt::Expr(ExprStmt {
span: Default::default(),
expr: Box::new(Expr::Lit(Lit::Str(format!("fragment {count}").into()))),
})));
fragments.extend(fragment.body);
count += 1;
}
assert_eq!(count, expected);
module.body = fragments;
}),
)
},
&input,
&input.parent().unwrap().join("output-fragments.js"),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
#[fixture("tests/fixture/next-font-with-directive/**/input.js")]
fn next_font_with_directive_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js");
......
import { used } from './values'
import { shadowed } from './unrelated'
export async function outer(value: string) {
const cache = async (shadowed: string) => {
'use cache'
function local(suffix: string) {
return used(value + shadowed + suffix)
}
return <p>{local('!')}</p>
}
return cache('test')
}
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js","?test"] */ "fragment 0";
import { used } from "./values";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { registerServerReference as registerServerReference } from "private-next-rsc-server-reference";
const $$RSC_SERVER_CACHE_0_INNER = async function cache([$$ACTION_ARG_0], shadowed) {
function local(suffix) {
return used($$ACTION_ARG_0 + shadowed + suffix);
}
return <p>{local("!")}</p>;
};
export var $$RSC_SERVER_CACHE_0 = $$reactCache__(function cache() {
return $$cache__("default", "e03128060c414d59f8552e4788b846c0d2b7f74743", 1, $$RSC_SERVER_CACHE_0_INNER, Array.prototype.slice.call(arguments, 0, 2));
});
registerServerReference($$RSC_SERVER_CACHE_0, "e03128060c414d59f8552e4788b846c0d2b7f74743", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_0, "name", {
value: "cache"
});
import { registerServerReference } from "private-next-rsc-server-reference";
import { encryptActionBoundArgs, decryptActionBoundArgs } from "private-next-rsc-action-encryption";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js",""] */ import { used } from './values';
import { shadowed } from './unrelated';
export { $$RSC_SERVER_CACHE_0 };
export async function outer(value: string) {
const cache = $$RSC_SERVER_CACHE_0.bind(null, encryptActionBoundArgs("e03128060c414d59f8552e4788b846c0d2b7f74743", value));
return cache('test');
}
import { $$RSC_SERVER_CACHE_0 as $$RSC_SERVER_CACHE_0 } from "data:text/javascript,%2F%2A%20__next_internal_action_entry_do_not_use__%20%5B%7B%22e03128060c414d59f8552e4788b846c0d2b7f74743%22%3A%7B%22name%22%3A%22%24%24RSC_SERVER_CACHE_0%22%7D%7D%2C%22%2Fapp%2Fitem.js%22%2C%22%22%5D%20%2A%2Fimport%7Bused%7Dfrom%22.%2Fvalues%22%3Bimport%7Bcache%20as%20%24%24cache__%7Dfrom%22private-next-rsc-cache-wrapper%22%3Bimport%7Bcache%20as%20%24%24reactCache__%7Dfrom%22react%22%3Bimport%7BregisterServerReference%20as%20registerServerReference%7Dfrom%22private-next-rsc-server-reference%22%3Bconst%20%24%24RSC_SERVER_CACHE_0_INNER%3Dasync%20function%20cache%28%5B%24%24ACTION_ARG_0%5D%2Cshadowed%29%7Bfunction%20local%28suffix%29%7Breturn%20used%28%24%24ACTION_ARG_0%2Bshadowed%2Bsuffix%29%3B%7Dreturn%3Cp%3E%7Blocal%28%22%21%22%29%7D%3C%2Fp%3E%3B%7D%3Bexport%20var%20%24%24RSC_SERVER_CACHE_0%3D%24%24reactCache__%28function%20cache%28%29%7Breturn%20%24%24cache__%28%22default%22%2C%22e03128060c414d59f8552e4788b846c0d2b7f74743%22%2C1%2C%24%24RSC_SERVER_CACHE_0_INNER%2CArray.prototype.slice.call%28arguments%2C0%2C2%29%29%3B%7D%29%3BregisterServerReference%28%24%24RSC_SERVER_CACHE_0%2C%22e03128060c414d59f8552e4788b846c0d2b7f74743%22%2Cnull%29%3BObject%5B%22defineProperty%22%5D%28%24%24RSC_SERVER_CACHE_0%2C%22name%22%2C%7Bvalue%3A%22cache%22%7D%29%3B%0A%2F%2F%23%20sourceMappingURL%3Ddata%3Aapplication%2Fjson%3Bbase64%2CeyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0LmpzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHVzZWQgfSBmcm9tICcuL3ZhbHVlcydcbmltcG9ydCB7IHNoYWRvd2VkIH0gZnJvbSAnLi91bnJlbGF0ZWQnXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBvdXRlcih2YWx1ZTogc3RyaW5nKSB7XG4gIGNvbnN0IGNhY2hlID0gYXN5bmMgKHNoYWRvd2VkOiBzdHJpbmcpID0%2BIHtcbiAgICAndXNlIGNhY2hlJ1xuICAgIGZ1bmN0aW9uIGxvY2FsKHN1ZmZpeDogc3RyaW5nKSB7XG4gICAgICByZXR1cm4gdXNlZCh2YWx1ZSArIHNoYWRvd2VkICsgc3VmZml4KVxuICAgIH1cbiAgICByZXR1cm4gPHA%2Be2xvY2FsKCchJyl9PC9wPlxuICB9XG4gIHJldHVybiBjYWNoZSgndGVzdCcpXG59XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6ImtKQUFBLE9BQVMsSUFBSSxLQUFRLFdBQVUsNE1BSWYsTUFBQSwyQkFBQSxlQUFSLHVCQUFlLFVBRW5CLFNBQVMsTUFBTSxNQUFjLEVBQzNCLE9BQU8sS0FBSyxlQUFRLFNBQVcsUUFDakMsQ0FDQSxPQUFRLEdBQUcsTUFBTSxPQUFPLEdBQzFCLGFBTmMsb0NBQUEsU0FBUixlQUFRLDRJQUFBIn0%3D";
import { used } from './values'
import { unrelated } from './unrelated'
let shared = 0
function helper() {
return used(shared)
}
export async function state() {
'use cache'
return used(shared++)
}
export async function localHelper() {
'use cache'
return helper()
}
export async function dynamicImport() {
'use cache'
return import('./values')
}
export async function moduleIdentity() {
'use cache'
return import.meta.url
}
export function nonCache() {
return unrelated()
}
/* __next_internal_action_entry_do_not_use__ [{"8012a8d21b6362b4cc8f5b15560525095bc48dba80":{"name":"$$RSC_SERVER_CACHE_3"},"803128060c414d59f8552e4788b846c0d2b7f74743":{"name":"$$RSC_SERVER_CACHE_0"},"8069348c79fce073bae2f70f139565a2fda1c74c74":{"name":"$$RSC_SERVER_CACHE_2"},"80951c375b4a6a6e89d67b743ec5808127cfde405d":{"name":"$$RSC_SERVER_CACHE_1"}},"/app/item.js","?test"] */
import { registerServerReference } from "private-next-rsc-server-reference";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
/* __next_internal_action_entry_do_not_use__ [{"8012a8d21b6362b4cc8f5b15560525095bc48dba80":{"name":"$$RSC_SERVER_CACHE_3"},"803128060c414d59f8552e4788b846c0d2b7f74743":{"name":"$$RSC_SERVER_CACHE_0"},"8069348c79fce073bae2f70f139565a2fda1c74c74":{"name":"$$RSC_SERVER_CACHE_2"},"80951c375b4a6a6e89d67b743ec5808127cfde405d":{"name":"$$RSC_SERVER_CACHE_1"}},"/app/item.js",""] */ import { used } from './values';
import { unrelated } from './unrelated';
let shared = 0;
function helper() {
return used(shared);
}
const $$RSC_SERVER_CACHE_0_INNER = async function state() {
return used(shared++);
};
export var $$RSC_SERVER_CACHE_0 = $$reactCache__(function state() {
return $$cache__("default", "803128060c414d59f8552e4788b846c0d2b7f74743", 0, $$RSC_SERVER_CACHE_0_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_0, "803128060c414d59f8552e4788b846c0d2b7f74743", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_0, "name", {
value: "state"
});
export var state = $$RSC_SERVER_CACHE_0;
const $$RSC_SERVER_CACHE_1_INNER = async function localHelper() {
return helper();
};
export var $$RSC_SERVER_CACHE_1 = $$reactCache__(function localHelper() {
return $$cache__("default", "80951c375b4a6a6e89d67b743ec5808127cfde405d", 0, $$RSC_SERVER_CACHE_1_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_1, "80951c375b4a6a6e89d67b743ec5808127cfde405d", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_1, "name", {
value: "localHelper"
});
export var localHelper = $$RSC_SERVER_CACHE_1;
const $$RSC_SERVER_CACHE_2_INNER = async function dynamicImport() {
return import('./values');
};
export var $$RSC_SERVER_CACHE_2 = $$reactCache__(function dynamicImport() {
return $$cache__("default", "8069348c79fce073bae2f70f139565a2fda1c74c74", 0, $$RSC_SERVER_CACHE_2_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_2, "8069348c79fce073bae2f70f139565a2fda1c74c74", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_2, "name", {
value: "dynamicImport"
});
export var dynamicImport = $$RSC_SERVER_CACHE_2;
const $$RSC_SERVER_CACHE_3_INNER = async function moduleIdentity() {
return import.meta.url;
};
export var $$RSC_SERVER_CACHE_3 = $$reactCache__(function moduleIdentity() {
return $$cache__("default", "8012a8d21b6362b4cc8f5b15560525095bc48dba80", 0, $$RSC_SERVER_CACHE_3_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_3, "8012a8d21b6362b4cc8f5b15560525095bc48dba80", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_3, "name", {
value: "moduleIdentity"
});
export var moduleIdentity = $$RSC_SERVER_CACHE_3;
export function nonCache() {
return unrelated();
}
'use cache'
import { first, second } from './values'
export async function one(value: string): Promise<string> {
return first(value)
}
export default async function two() {
return second()
}
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js","?test"] */ "fragment 0";
import { first } from "./values";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { registerServerReference as registerServerReference } from "private-next-rsc-server-reference";
const $$RSC_SERVER_CACHE_0_INNER = async function one(value) {
return first(value);
};
export var $$RSC_SERVER_CACHE_0 = $$reactCache__(function one() {
return $$cache__("default", "c03128060c414d59f8552e4788b846c0d2b7f74743", 0, $$RSC_SERVER_CACHE_0_INNER, Array.prototype.slice.call(arguments, 0, 1));
});
registerServerReference($$RSC_SERVER_CACHE_0, "c03128060c414d59f8552e4788b846c0d2b7f74743", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_0, "name", {
value: "one"
});
"fragment 1";
import { second } from "./values";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { registerServerReference as registerServerReference } from "private-next-rsc-server-reference";
const $$RSC_SERVER_CACHE_1_INNER = async function two() {
return second();
};
export var $$RSC_SERVER_CACHE_1 = $$reactCache__(function two() {
return $$cache__("default", "80951c375b4a6a6e89d67b743ec5808127cfde405d", 0, $$RSC_SERVER_CACHE_1_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_1, "80951c375b4a6a6e89d67b743ec5808127cfde405d", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_1, "name", {
value: "two"
});
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js",""] */ import { registerServerReference } from "private-next-rsc-server-reference";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { first, second } from './values';
export { $$RSC_SERVER_CACHE_0 };
export var one = $$RSC_SERVER_CACHE_0;
export { $$RSC_SERVER_CACHE_1 };
export default $$RSC_SERVER_CACHE_1;
import { $$RSC_SERVER_CACHE_0 as $$RSC_SERVER_CACHE_0 } from "data:text/javascript,%2F%2A%20__next_internal_action_entry_do_not_use__%20%5B%7B%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%3A%7B%22name%22%3A%22%24%24RSC_SERVER_CACHE_0%22%7D%7D%2C%22%2Fapp%2Fitem.js%22%2C%22%22%5D%20%2A%2Fimport%7Bfirst%7Dfrom%22.%2Fvalues%22%3Bimport%7Bcache%20as%20%24%24cache__%7Dfrom%22private-next-rsc-cache-wrapper%22%3Bimport%7Bcache%20as%20%24%24reactCache__%7Dfrom%22react%22%3Bimport%7BregisterServerReference%20as%20registerServerReference%7Dfrom%22private-next-rsc-server-reference%22%3Bconst%20%24%24RSC_SERVER_CACHE_0_INNER%3Dasync%20function%20one%28value%29%7Breturn%20first%28value%29%3B%7D%3Bexport%20var%20%24%24RSC_SERVER_CACHE_0%3D%24%24reactCache__%28function%20one%28%29%7Breturn%20%24%24cache__%28%22default%22%2C%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%2C0%2C%24%24RSC_SERVER_CACHE_0_INNER%2CArray.prototype.slice.call%28arguments%2C0%2C1%29%29%3B%7D%29%3BregisterServerReference%28%24%24RSC_SERVER_CACHE_0%2C%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%2Cnull%29%3BObject%5B%22defineProperty%22%5D%28%24%24RSC_SERVER_CACHE_0%2C%22name%22%2C%7Bvalue%3A%22one%22%7D%29%3B%0A%2F%2F%23%20sourceMappingURL%3Ddata%3Aapplication%2Fjson%3Bbase64%2CeyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIid1c2UgY2FjaGUnXG5cbmltcG9ydCB7IGZpcnN0LCBzZWNvbmQgfSBmcm9tICcuL3ZhbHVlcydcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIG9uZSh2YWx1ZTogc3RyaW5nKTogUHJvbWlzZTxzdHJpbmc%2BIHtcbiAgcmV0dXJuIGZpcnN0KHZhbHVlKVxufVxuXG5leHBvcnQgZGVmYXVsdCBhc3luYyBmdW5jdGlvbiB0d28oKSB7XG4gIHJldHVybiBzZWNvbmQoKVxufVxuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJrSkFFQSxPQUFTLEtBQUssS0FBZ0IsV0FBVSw0TUFFakMsTUFBQSwyQkFBQSxlQUFlLElBQUksS0FBYSxFQUNyQyxPQUFPLE1BQU0sT0FDZixhQUZPLG9DQUFBLFNBQWUsYUFBZiw0SUFBQSJ9";
import { $$RSC_SERVER_CACHE_1 as $$RSC_SERVER_CACHE_1 } from "data:text/javascript,%2F%2A%20__next_internal_action_entry_do_not_use__%20%5B%7B%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%3A%7B%22name%22%3A%22%24%24RSC_SERVER_CACHE_1%22%7D%7D%2C%22%2Fapp%2Fitem.js%22%2C%22%22%5D%20%2A%2Fimport%7Bsecond%7Dfrom%22.%2Fvalues%22%3Bimport%7Bcache%20as%20%24%24cache__%7Dfrom%22private-next-rsc-cache-wrapper%22%3Bimport%7Bcache%20as%20%24%24reactCache__%7Dfrom%22react%22%3Bimport%7BregisterServerReference%20as%20registerServerReference%7Dfrom%22private-next-rsc-server-reference%22%3Bconst%20%24%24RSC_SERVER_CACHE_1_INNER%3Dasync%20function%20two%28%29%7Breturn%20second%28%29%3B%7D%3Bexport%20var%20%24%24RSC_SERVER_CACHE_1%3D%24%24reactCache__%28function%20two%28%29%7Breturn%20%24%24cache__%28%22default%22%2C%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%2C0%2C%24%24RSC_SERVER_CACHE_1_INNER%2C%5B%5D%29%3B%7D%29%3BregisterServerReference%28%24%24RSC_SERVER_CACHE_1%2C%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%2Cnull%29%3BObject%5B%22defineProperty%22%5D%28%24%24RSC_SERVER_CACHE_1%2C%22name%22%2C%7Bvalue%3A%22two%22%7D%29%3B%0A%2F%2F%23%20sourceMappingURL%3Ddata%3Aapplication%2Fjson%3Bbase64%2CeyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIid1c2UgY2FjaGUnXG5cbmltcG9ydCB7IGZpcnN0LCBzZWNvbmQgfSBmcm9tICcuL3ZhbHVlcydcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIG9uZSh2YWx1ZTogc3RyaW5nKTogUHJvbWlzZTxzdHJpbmc%2BIHtcbiAgcmV0dXJuIGZpcnN0KHZhbHVlKVxufVxuXG5leHBvcnQgZGVmYXVsdCBhc3luYyBmdW5jdGlvbiB0d28oKSB7XG4gIHJldHVybiBzZWNvbmQoKVxufVxuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJrSkFFQSxPQUFnQixNQUFNLEtBQVEsV0FBVSw0TUFNekIsTUFBQSwyQkFBQSxlQUFlLE1BQzVCLE9BQU8sU0FDVCxhQUZlLG9DQUFBLFNBQWUsYUFBZixxR0FBQSJ9";
// An import annotation must not comment out the generated module.
import defaultValue, { used, unused, other } from './values'
import * as namespace from './namespace'
import { unrelated } from './unrelated'
export async function first(value) {
'use cache'
// Keep this comment terminated before the next statement.
const local = value
return used(local) + defaultValue + namespace.value
}
export const second = async () => {
'use cache: x'
return other()
}
export function nonCache() {
return unrelated() + unused
}
// An import annotation must not comment out the generated module.
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js","?test"] */ "fragment 0";
import defaultValue, { used } from "./values";
import * as namespace from "./namespace";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { registerServerReference as registerServerReference } from "private-next-rsc-server-reference";
const $$RSC_SERVER_CACHE_0_INNER = async function first(value) {
const local = value;
return used(local) + defaultValue + namespace.value;
};
export var $$RSC_SERVER_CACHE_0 = $$reactCache__(function first() {
return $$cache__("default", "c03128060c414d59f8552e4788b846c0d2b7f74743", 0, $$RSC_SERVER_CACHE_0_INNER, Array.prototype.slice.call(arguments, 0, 1));
});
registerServerReference($$RSC_SERVER_CACHE_0, "c03128060c414d59f8552e4788b846c0d2b7f74743", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_0, "name", {
value: "first"
});
"fragment 1";
import { other } from "./values";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
import { registerServerReference as registerServerReference } from "private-next-rsc-server-reference";
const $$RSC_SERVER_CACHE_1_INNER = async function second() {
return other();
};
export var $$RSC_SERVER_CACHE_1 = $$reactCache__(function second() {
return $$cache__("x", "80951c375b4a6a6e89d67b743ec5808127cfde405d", 0, $$RSC_SERVER_CACHE_1_INNER, []);
});
registerServerReference($$RSC_SERVER_CACHE_1, "80951c375b4a6a6e89d67b743ec5808127cfde405d", null);
Object["defineProperty"]($$RSC_SERVER_CACHE_1, "name", {
value: "second"
});
import { registerServerReference } from "private-next-rsc-server-reference";
import { cache as $$cache__ } from "private-next-rsc-cache-wrapper";
import { cache as $$reactCache__ } from "react";
// An import annotation must not comment out the generated module.
/* __next_internal_action_entry_do_not_use__ [{},"/app/item.js",""] */ import defaultValue, { used, unused, other } from './values';
import * as namespace from './namespace';
import { unrelated } from './unrelated';
export { $$RSC_SERVER_CACHE_0 };
export var first = $$RSC_SERVER_CACHE_0;
export { $$RSC_SERVER_CACHE_1 };
export const second = $$RSC_SERVER_CACHE_1;
export function nonCache() {
return unrelated() + unused;
}
import { $$RSC_SERVER_CACHE_0 as $$RSC_SERVER_CACHE_0 } from "data:text/javascript,%2F%2A%20__next_internal_action_entry_do_not_use__%20%5B%7B%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%3A%7B%22name%22%3A%22%24%24RSC_SERVER_CACHE_0%22%7D%7D%2C%22%2Fapp%2Fitem.js%22%2C%22%22%5D%20%2A%2F%2F%2F%20An%20import%20annotation%20must%20not%20comment%20out%20the%20generated%20module.%0Aimport%20defaultValue%2C%7Bused%7Dfrom%22.%2Fvalues%22%3Bimport%2Aas%20namespace%20from%22.%2Fnamespace%22%3Bimport%7Bcache%20as%20%24%24cache__%7Dfrom%22private-next-rsc-cache-wrapper%22%3Bimport%7Bcache%20as%20%24%24reactCache__%7Dfrom%22react%22%3Bimport%7BregisterServerReference%20as%20registerServerReference%7Dfrom%22private-next-rsc-server-reference%22%3Bconst%20%24%24RSC_SERVER_CACHE_0_INNER%3Dasync%20function%20first%28value%29%7B%2F%2F%20Keep%20this%20comment%20terminated%20before%20the%20next%20statement.%0Aconst%20local%3Dvalue%3Breturn%20used%28local%29%2BdefaultValue%2Bnamespace.value%3B%7D%3Bexport%20var%20%24%24RSC_SERVER_CACHE_0%3D%24%24reactCache__%28function%20first%28%29%7Breturn%20%24%24cache__%28%22default%22%2C%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%2C0%2C%24%24RSC_SERVER_CACHE_0_INNER%2CArray.prototype.slice.call%28arguments%2C0%2C1%29%29%3B%7D%29%3BregisterServerReference%28%24%24RSC_SERVER_CACHE_0%2C%22c03128060c414d59f8552e4788b846c0d2b7f74743%22%2Cnull%29%3BObject%5B%22defineProperty%22%5D%28%24%24RSC_SERVER_CACHE_0%2C%22name%22%2C%7Bvalue%3A%22first%22%7D%29%3B%0A%2F%2F%23%20sourceMappingURL%3Ddata%3Aapplication%2Fjson%3Bbase64%2CeyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIEFuIGltcG9ydCBhbm5vdGF0aW9uIG11c3Qgbm90IGNvbW1lbnQgb3V0IHRoZSBnZW5lcmF0ZWQgbW9kdWxlLlxuaW1wb3J0IGRlZmF1bHRWYWx1ZSwgeyB1c2VkLCB1bnVzZWQsIG90aGVyIH0gZnJvbSAnLi92YWx1ZXMnXG5pbXBvcnQgKiBhcyBuYW1lc3BhY2UgZnJvbSAnLi9uYW1lc3BhY2UnXG5pbXBvcnQgeyB1bnJlbGF0ZWQgfSBmcm9tICcuL3VucmVsYXRlZCdcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGZpcnN0KHZhbHVlKSB7XG4gICd1c2UgY2FjaGUnXG4gIC8vIEtlZXAgdGhpcyBjb21tZW50IHRlcm1pbmF0ZWQgYmVmb3JlIHRoZSBuZXh0IHN0YXRlbWVudC5cbiAgY29uc3QgbG9jYWwgPSB2YWx1ZVxuICByZXR1cm4gdXNlZChsb2NhbCkgKyBkZWZhdWx0VmFsdWUgKyBuYW1lc3BhY2UudmFsdWVcbn1cblxuZXhwb3J0IGNvbnN0IHNlY29uZCA9IGFzeW5jICgpID0%2BIHtcbiAgJ3VzZSBjYWNoZTogeCdcbiAgcmV0dXJuIG90aGVyKClcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbkNhY2hlKCkge1xuICByZXR1cm4gdW5yZWxhdGVkKCkgKyB1bnVzZWRcbn1cbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoia0pBQUEsa0VBQWtFO0FBQ2xFLE9BQU8sY0FBZ0IsSUFBSSxLQUF1QixXQUFVLEFBQzVELFVBQVksY0FBZSxjQUFhLDRNQUdqQyxNQUFBLDJCQUFBLGVBQWUsTUFBTSxLQUFLLEVBRS9CLDBEQUEwRDtBQUMxRCxNQUFNLE1BQVEsTUFDZCxPQUFPLEtBQUssT0FBUyxhQUFlLFVBQVUsS0FBSyxDQUNyRCxhQUxPLG9DQUFBLFNBQWUsZUFBZiw0SUFBQSJ9";
import { $$RSC_SERVER_CACHE_1 as $$RSC_SERVER_CACHE_1 } from "data:text/javascript,%2F%2A%20__next_internal_action_entry_do_not_use__%20%5B%7B%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%3A%7B%22name%22%3A%22%24%24RSC_SERVER_CACHE_1%22%7D%7D%2C%22%2Fapp%2Fitem.js%22%2C%22%22%5D%20%2A%2F%2F%2F%20An%20import%20annotation%20must%20not%20comment%20out%20the%20generated%20module.%0Aimport%7Bother%7Dfrom%22.%2Fvalues%22%3Bimport%7Bcache%20as%20%24%24cache__%7Dfrom%22private-next-rsc-cache-wrapper%22%3Bimport%7Bcache%20as%20%24%24reactCache__%7Dfrom%22react%22%3Bimport%7BregisterServerReference%20as%20registerServerReference%7Dfrom%22private-next-rsc-server-reference%22%3Bconst%20%24%24RSC_SERVER_CACHE_1_INNER%3Dasync%20function%20second%28%29%7Breturn%20other%28%29%3B%7D%3Bexport%20var%20%24%24RSC_SERVER_CACHE_1%3D%24%24reactCache__%28function%20second%28%29%7Breturn%20%24%24cache__%28%22x%22%2C%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%2C0%2C%24%24RSC_SERVER_CACHE_1_INNER%2C%5B%5D%29%3B%7D%29%3BregisterServerReference%28%24%24RSC_SERVER_CACHE_1%2C%2280951c375b4a6a6e89d67b743ec5808127cfde405d%22%2Cnull%29%3BObject%5B%22defineProperty%22%5D%28%24%24RSC_SERVER_CACHE_1%2C%22name%22%2C%7Bvalue%3A%22second%22%7D%29%3B%0A%2F%2F%23%20sourceMappingURL%3Ddata%3Aapplication%2Fjson%3Bbase64%2CeyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIEFuIGltcG9ydCBhbm5vdGF0aW9uIG11c3Qgbm90IGNvbW1lbnQgb3V0IHRoZSBnZW5lcmF0ZWQgbW9kdWxlLlxuaW1wb3J0IGRlZmF1bHRWYWx1ZSwgeyB1c2VkLCB1bnVzZWQsIG90aGVyIH0gZnJvbSAnLi92YWx1ZXMnXG5pbXBvcnQgKiBhcyBuYW1lc3BhY2UgZnJvbSAnLi9uYW1lc3BhY2UnXG5pbXBvcnQgeyB1bnJlbGF0ZWQgfSBmcm9tICcuL3VucmVsYXRlZCdcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGZpcnN0KHZhbHVlKSB7XG4gICd1c2UgY2FjaGUnXG4gIC8vIEtlZXAgdGhpcyBjb21tZW50IHRlcm1pbmF0ZWQgYmVmb3JlIHRoZSBuZXh0IHN0YXRlbWVudC5cbiAgY29uc3QgbG9jYWwgPSB2YWx1ZVxuICByZXR1cm4gdXNlZChsb2NhbCkgKyBkZWZhdWx0VmFsdWUgKyBuYW1lc3BhY2UudmFsdWVcbn1cblxuZXhwb3J0IGNvbnN0IHNlY29uZCA9IGFzeW5jICgpID0%2BIHtcbiAgJ3VzZSBjYWNoZTogeCdcbiAgcmV0dXJuIG90aGVyKClcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbkNhY2hlKCkge1xuICByZXR1cm4gdW5yZWxhdGVkKCkgKyB1bnVzZWRcbn1cbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoia0pBQUEsa0VBQWtFO0FBQ2xFLE9BQXFDLEtBQUssS0FBUSxXQUFVLDRNQVd0QyxNQUFBLDJCQUFBLGVBQVQsU0FFWCxPQUFPLFFBQ1QsYUFIc0Isb0NBQUEsU0FBVCxnQkFBUywrRkFBQSJ9";
export function first() {
return process.env.CACHE_FRAGMENT_FIRST || 'first'
}
import { first } from './first'
import { second } from './second'
import { unrelated } from './unrelated'
export async function cachedFirst() {
'use cache'
return first()
}
export const cachedSecond = async () => {
'use cache'
return second()
}
let shared = 0
// Shared module state deliberately keeps this implementation in the source module.
export async function cachedShared() {
'use cache'
return `shared-${shared}`
}
export function nonCache() {
shared++
return unrelated()
}
import { cachedFirst, cachedSecond, cachedShared, nonCache } from './logic'
export default async function Page() {
const unrelated = nonCache()
return (
<p>
{await cachedFirst()}:{await cachedSecond()}:{await cachedShared()}:
{unrelated}
</p>
)
}
export function second() {
return process.env.CACHE_FRAGMENT_SECOND ? 'second-set' : 'second'
}
export function unrelated() {
return process.env.CACHE_FRAGMENT_UNRELATED || 'unrelated'
}
......@@ -83,11 +83,39 @@ async function getCodeHashes(
expect(cacheWorkers).toBeGreaterThan(0)
})
it('only discovers imports used by each cache implementation', async () => {
const data = await getCodeHashes(next, ['app/import-fragments/page'])
expect(data).toHaveLength(3)
const dependencies = data.map((entry) => ({
read: entry.runtimeEnvVarsRead.filter((name) =>
name.startsWith('CACHE_FRAGMENT_')
),
existence: entry.runtimeEnvVarsExistence.filter((name) =>
name.startsWith('CACHE_FRAGMENT_')
),
}))
expect(dependencies).toEqual(
expect.arrayContaining([
{ read: ['CACHE_FRAGMENT_FIRST'], existence: [] },
{ read: [], existence: ['CACHE_FRAGMENT_SECOND'] },
// The shared module-scope binding deopts: keep the broader graph.
{
read: ['CACHE_FRAGMENT_FIRST', 'CACHE_FRAGMENT_UNRELATED'],
existence: ['CACHE_FRAGMENT_SECOND'],
},
])
)
const $ = await next.render$('/import-fragments')
expect($('p').text()).toMatch(/^first:second:shared-\d+:unrelated$/)
})
it('lists non-inlined runtime env vars', async () => {
const data = await getCodeHashes(next)
expect(
Object.fromEntries(
data
// Multiple references on this page are checked individually above.
.filter((d) => d.page !== 'app/import-fragments/page')
.filter((d) => d.runtimeEnvVarsRead || d.runtimeEnvVarsExistence)
.map((d) => [
d.page,
......
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