Unverified Commit 70ece6ef authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: emit JSON.parse only for more than 10kb (#83483)

parent ae2e3e25
...@@ -129,9 +129,15 @@ impl EcmascriptChunkItem for JsonChunkItem { ...@@ -129,9 +129,15 @@ impl EcmascriptChunkItem for JsonChunkItem {
let data = content.parse_json().await?; let data = content.parse_json().await?;
match &*data { match &*data {
FileJsonContent::Content(data) => { FileJsonContent::Content(data) => {
let js_str_content = serde_json::to_string(&data.to_string())?; let data_str = data.to_string();
let inner_code = format!("{TURBOPACK_EXPORT_VALUE}(JSON.parse({js_str_content}));"); let inner_code = if data_str.len() > 10_000 {
// Only use JSON.parse if the content is larger than 10kb
// https://v8.dev/blog/cost-of-javascript-2019#json
let js_str_content = serde_json::to_string(&data_str)?;
format!("{TURBOPACK_EXPORT_VALUE}(JSON.parse({js_str_content}));")
} else {
format!("{TURBOPACK_EXPORT_VALUE}({data_str});")
};
Ok(EcmascriptChunkItemContent { Ok(EcmascriptChunkItemContent {
inner_code: inner_code.into(), inner_code: inner_code.into(),
..Default::default() ..Default::default()
......
import pkg from './package.json' import pkg from './package.json'
console.log(pkg.name) console.log(pkg.name)
import huge from './huge.json'
console.log(huge)
import invalid from './invalid.json' import invalid from './invalid.json'
console.log(invalid['this-is']) console.log(invalid['this-is'])
(globalThis.TURBOPACK || (globalThis.TURBOPACK = [])).push([ (globalThis.TURBOPACK || (globalThis.TURBOPACK = [])).push([
"output/ba425_crates_turbopack-tests_tests_snapshot_imports_json_input_index_9993c93c.js", "output/ba425_crates_turbopack-tests_tests_snapshot_imports_json_input_index_dfc4b8ed.js",
{"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_21f93174._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_fc5f1049._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK || (globalThis.TURBOPACK = [])).push(["output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_21f93174._.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/package.json (json)", ((__turbopack_context__) => {
__turbopack_context__.v(JSON.parse("{\"name\":\"json-snapshot\"}"));}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)", (() => {{
throw new Error("An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n\nCaused by:\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n\nDebug info:\n- An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n- Execution of *EcmascriptChunkItemContent::module_factory failed\n- Execution of <JsonChunkItem as EcmascriptChunkItem>::content failed\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n at nested.?\n 1 | {\n 2 | \"nested\": {\n | v\n 3 + \"this-is\": \"invalid\" // lint-staged will remove trailing commas, so here's a comment\n | ^\n 4 | }\n 5 | }");
}}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([]);
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$json$2f$input$2f$package$2e$json__$28$json$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/package.json (json)");
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$json$2f$input$2f$invalid$2e$json__$28$json$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)");
;
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$json$2f$input$2f$package$2e$json__$28$json$29$__["default"].name);
;
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$json$2f$input$2f$invalid$2e$json__$28$json$29$__["default"]['this-is']);
}),
]);
//# sourceMappingURL=turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_21f93174._.js.map
\ No newline at end of file
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
"version": 3, "version": 3,
"sources": [], "sources": [],
"sections": [ "sections": [
{"offset": {"line": 12, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js"],"sourcesContent":["import pkg from './package.json'\nconsole.log(pkg.name)\nimport invalid from './invalid.json'\nconsole.log(invalid['this-is'])\n"],"names":[],"mappings":";AAAA;AAEA;;AADA,QAAQ,GAAG,CAAC,wLAAG,CAAC,IAAI;;AAEpB,QAAQ,GAAG,CAAC,wLAAO,CAAC,UAAU"}}] {"offset": {"line": 15, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js"],"sourcesContent":["import pkg from './package.json'\nconsole.log(pkg.name)\n\nimport huge from './huge.json'\nconsole.log(huge)\n\nimport invalid from './invalid.json'\nconsole.log(invalid['this-is'])\n"],"names":[],"mappings":";AAAA;AAGA;AAGA;;AALA,QAAQ,GAAG,CAAC,wLAAG,CAAC,IAAI;;AAGpB,QAAQ,GAAG,CAAC,qLAAI;;AAGhB,QAAQ,GAAG,CAAC,wLAAO,CAAC,UAAU"}}]
} }
\ No newline at end of file
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