From 0ff9efd015191dcd5e40979a35343471ed084b5b Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 18 Dec 2023 07:40:07 +0800 Subject: [PATCH] Reduce size of bundled `json5` (#15818) --- scripts/build/config.js | 5 +++++ src/config/prettier-config-explorer/loaders.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/build/config.js b/scripts/build/config.js index b15f21559..dbc22d7dc 100644 --- a/scripts/build/config.js +++ b/scripts/build/config.js @@ -612,6 +612,11 @@ const nodejsFiles = [ }), path: require.resolve("@babel/code-frame"), }, + { + module: getPackageFile("json5/dist/index.mjs"), + find: "export default lib;", + replacement: "export default { parse };", + }, ], addDefaultExport: true, }, diff --git a/src/config/prettier-config-explorer/loaders.js b/src/config/prettier-config-explorer/loaders.js index 6b674bbed..4976d4bcd 100644 --- a/src/config/prettier-config-explorer/loaders.js +++ b/src/config/prettier-config-explorer/loaders.js @@ -2,7 +2,7 @@ import { pathToFileURL } from "node:url"; import parseToml from "@iarna/toml/parse-async.js"; import jsYaml from "js-yaml"; -import parseJson5 from "json5/lib/parse.js"; +import json5 from "json5"; import parseJson from "parse-json"; import readFile from "../../utils/read-file.js"; @@ -50,7 +50,7 @@ const loaders = { async ".json5"(file) { const content = await readFile(file); try { - return parseJson5(content); + return json5.parse(content); } catch (/** @type {any} */ error) { error.message = `JSON5 Error in ${file}:\n${error.message}`; throw error;