diff --git a/package.json b/package.json index c732d0866..e7a632289 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "json5": "2.2.3", "leven": "4.0.0", "linguist-languages": "8.0.0", - "meriyah": "6.0.6", + "meriyah": "6.1.0", "micromatch": "4.0.8", "minimist": "1.2.8", "n-readlines": "1.0.1", diff --git a/scripts/build/config.js b/scripts/build/config.js index 6a2e368a2..b0c842a52 100644 --- a/scripts/build/config.js +++ b/scripts/build/config.js @@ -358,14 +358,9 @@ const pluginFiles = [ { input: "src/plugins/meriyah.js", replaceModule: [ - // Use non-minified version so we can replace code easier - { - module: resolveEsmModulePath("meriyah"), - path: getPackageFile("meriyah/dist/meriyah.mjs"), - }, // We don't use value of JSXText { - module: getPackageFile("meriyah/dist/meriyah.mjs"), + module: resolveEsmModulePath("meriyah"), find: "parser.tokenValue = decodeHTMLStrict(raw);", replacement: "parser.tokenValue = raw;", }, diff --git a/src/language-js/parse/meriyah.js b/src/language-js/parse/meriyah.js index 0f45f5b92..fc27bd3a8 100644 --- a/src/language-js/parse/meriyah.js +++ b/src/language-js/parse/meriyah.js @@ -56,19 +56,14 @@ function parseWithOptions(text, sourceType) { } function createParseError(error) { - let { message, loc } = error; + const { description, loc } = error; /* c8 ignore next 3 */ if (!loc) { return error; } - const prefix = `[${[loc.start, loc.end].map(({ line, column }) => [line, column].join(":")).join("-")}]: `; - if (message.startsWith(prefix)) { - message = message.slice(prefix.length); - } - - return createError(message, { + return createError(description, { loc: { start: { line: loc.start.line, diff --git a/yarn.lock b/yarn.lock index f3cd5f65f..b78ce7cf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6537,10 +6537,10 @@ __metadata: languageName: node linkType: hard -"meriyah@npm:6.0.6": - version: 6.0.6 - resolution: "meriyah@npm:6.0.6" - checksum: 10/94fac707185723715557e3fdd738f71c09c342ee1dd35c7dc5a7d6c1a9eda627311018bc472e739b8f159a930906dc96fa6cc54b12d595a93f98a7da183de3af +"meriyah@npm:6.1.0": + version: 6.1.0 + resolution: "meriyah@npm:6.1.0" + checksum: 10/b526ba0898db2a59feb1627976f144036b093e21ac9cfe903069f9eeb5f944f181a226805985a6ad594506a65c5cbfd6d4a13ed6087004f4c49ccc8b2d3de0c5 languageName: node linkType: hard @@ -7382,7 +7382,7 @@ __metadata: leven: "npm:4.0.0" linguist-languages: "npm:8.0.0" magic-string: "npm:0.30.17" - meriyah: "npm:6.0.6" + meriyah: "npm:6.1.0" micromatch: "npm:4.0.8" minimist: "npm:1.2.8" n-readlines: "npm:1.0.1"