mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 18:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: invalid json import regression (#17612)

Browse Source
This commit is contained in:
Dylan Conway
2025-02-24 01:57:29 -08:00
committed by GitHub
parent b02156e793
commit 47f9bb84e8
12 changed files with 84 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bun.js/bindings/ModuleLoader.cpp
View File

@@ -669,7 +669,7 @@ JSValue fetchCommonJSModule(
// When parsing tsconfig.*.json or jsconfig.*.json, we go through Bun's JSON
// parser instead to support comments and trailing commas.
if (res->result.value.tag == SyntheticModuleType::JSONForObjectLoader) {
WTF::String jsonSource = res->result.value.source_code.toWTFString(BunString::ZeroCopy);
WTF::String jsonSource = res->result.value.source_code.toWTFString(BunString::NonNull);
JSC::JSValue value = JSC::JSONParseWithException(globalObject, jsonSource);
RETURN_IF_EXCEPTION(scope, {});
@@ -859,9 +859,13 @@ static JSValue fetchESMSourceCode(
// When parsing tsconfig.*.json or jsconfig.*.json, we go through Bun's JSON
// parser instead to support comments and trailing commas.
if (res->result.value.tag == SyntheticModuleType::JSONForObjectLoader) {
WTF::String jsonSource = res->result.value.source_code.toWTFString(BunString::ZeroCopy);
WTF::String jsonSource = res->result.value.source_code.toWTFString(BunString::NonNull);
JSC::JSValue value = JSC::JSONParseWithException(globalObject, jsonSource);
RETURN_IF_EXCEPTION(scope, {});
if (scope.exception()) {
auto* exception = scope.exception();
scope.clearException();
return reject(exception);
}
// JSON can become strings, null, numbers, booleans so we must handle "export default 123"
auto function = generateJSValueModuleSourceCode(