diff --git a/cspell.json b/cspell.json index 6004870cd..17dd347e1 100644 --- a/cspell.json +++ b/cspell.json @@ -35,6 +35,7 @@ "bottlenecked", "Breakell", "Brevik", + "buil", "bunx", "Burgener", "callees", @@ -214,6 +215,7 @@ "Pangsakulyanont", "parentless", "pcss", + "picocolors", "PierzchaƂa", "Pieter", "pnpapi", diff --git a/package.json b/package.json index c8e6b6e5d..2858ca55f 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "@angular/compiler": "18.2.6", - "@babel/code-frame": "7.25.9", - "@babel/parser": "7.25.9", - "@babel/types": "7.25.9", + "@babel/code-frame": "7.26.0", + "@babel/parser": "7.26.1", + "@babel/types": "7.26.0", "@glimmer/syntax": "0.92.3", "@prettier/is-es5-identifier-name": "0.2.0", "@prettier/parse-srcset": "3.1.0", @@ -106,7 +106,7 @@ "yaml-unist-parser": "2.0.1" }, "devDependencies": { - "@babel/generator": "7.25.9", + "@babel/generator": "7.26.0", "@eslint/js": "9.13.0", "@stylistic/eslint-plugin-js": "2.9.0", "@types/eslint__js": "8.42.3", diff --git a/scripts/build/config.js b/scripts/build/config.js index 579d2e1cb..09bcd3a2e 100644 --- a/scripts/build/config.js +++ b/scripts/build/config.js @@ -528,10 +528,53 @@ const nonPluginUniversalFiles = [ umdVariableName: "prettier", replaceModule: [ { - module: require.resolve("@babel/highlight", { - paths: [require.resolve("@babel/code-frame")], - }), - path: path.join(dirname, "./shims/babel-highlight.js"), + module: require.resolve("@babel/code-frame"), + process(text) { + text = text.replaceAll("var picocolors = require('picocolors');", ""); + text = text.replaceAll("var jsTokens = require('js-tokens');", ""); + text = text.replaceAll( + "var helperValidatorIdentifier = require('@babel/helper-validator-identifier');", + "", + ); + + text = text.replaceAll( + /(?<=\n)let tokenize;\n\{\n.*?\n\}(?=\n)/gsu, + "", + ); + + text = text.replaceAll( + /(?<=\n)function highlight\(text\) \{\n.*?\n\}(?=\n)/gsu, + "function highlight(text) {return text}", + ); + + text = text.replaceAll( + /(?<=\n)function getDefs\(enabled\) \{\n.*?\n\}(?=\n)/gsu, + outdent` + function getDefs() { + return new Proxy({}, {get: () => (text) => text}) + } + `, + ); + + text = text.replaceAll( + "const defsOn = builDefs(picocolors.createColors(true));", + "", + ); + text = text.replaceAll( + "const defsOff = builDefs(picocolors.createColors(false));", + "", + ); + + text = text.replaceAll( + "const shouldHighlight = opts.forceColor || isColorSupported() && opts.highlightCode;", + "const shouldHighlight = false;", + ); + + text = text.replaceAll("exports.default = index;", ""); + text = text.replaceAll("exports.highlight = highlight;", ""); + + return text; + }, }, { module: require.resolve("chalk"), diff --git a/tests/format/misc/errors/json/__snapshots__/format.test.js.snap b/tests/format/misc/errors/json/__snapshots__/format.test.js.snap index d9dfa9d32..e272aad3b 100644 --- a/tests/format/misc/errors/json/__snapshots__/format.test.js.snap +++ b/tests/format/misc/errors/json/__snapshots__/format.test.js.snap @@ -280,9 +280,9 @@ exports[`snippet: #11 [json] format 1`] = ` `; exports[`snippet: #11 [json] format 2`] = ` -"Unexpected token. (1:28) +"'CallExpression' is not allowed in JSON. (1:2) > 1 | [import('a', {type:'json'})] - | ^" + | ^^^^^^^^^^^^^^^^^^^^^^^^^^" `; exports[`snippet: #11 [json-stringify] format 1`] = ` @@ -448,9 +448,9 @@ exports[`snippet: #18 [json] format 1`] = ` `; exports[`snippet: #18 [json] format 2`] = ` -"Unexpected token. (1:34) +"'CallExpression' is not allowed in JSON. (1:2) > 1 | [import('a', {reflect: 'module'})] - | ^" + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" `; exports[`snippet: #18 [json-stringify] format 1`] = ` diff --git a/tests/unit/__snapshots__/visitor-keys.js.snap b/tests/unit/__snapshots__/visitor-keys.js.snap index 30c9cd0a7..8eefec8eb 100644 --- a/tests/unit/__snapshots__/visitor-keys.js.snap +++ b/tests/unit/__snapshots__/visitor-keys.js.snap @@ -203,9 +203,11 @@ exports[`visitor keys estree 1`] = ` "id", ], "DeclareExportAllDeclaration": [ + "attributes", "source", ], "DeclareExportDeclaration": [ + "attributes", "declaration", "source", "specifiers", diff --git a/yarn.lock b/yarn.lock index a22172058..8a5f7af95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,13 +38,14 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:7.25.9, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.24.7": - version: 7.25.9 - resolution: "@babel/code-frame@npm:7.25.9" +"@babel/code-frame@npm:7.26.0, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.24.7": + version: 7.26.0 + resolution: "@babel/code-frame@npm:7.26.0" dependencies: - "@babel/highlight": "npm:^7.25.9" + "@babel/helper-validator-identifier": "npm:^7.25.9" + js-tokens: "npm:^4.0.0" picocolors: "npm:^1.0.0" - checksum: 10/96d69a570d0df82daedeb3d26ca508970bb31de83580c36c9605e7e7c0aae307ae17bc42609363016f0bdab12e991cebca3c02bf10765036b136bfe7281aee9a + checksum: 10/41deb0a9ac72d81e46aeab7e587a75e46c7af6a717e10b150a150b332e843807eacb7c856832c84bee2c5015fe31de23e04c18e052c83a1254027c71c0840791 languageName: node linkType: hard @@ -78,15 +79,16 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.25.9, @babel/generator@npm:^7.24.7, @babel/generator@npm:^7.7.2": - version: 7.25.9 - resolution: "@babel/generator@npm:7.25.9" +"@babel/generator@npm:7.26.0, @babel/generator@npm:^7.24.7, @babel/generator@npm:^7.7.2": + version: 7.26.0 + resolution: "@babel/generator@npm:7.26.0" dependencies: - "@babel/types": "npm:^7.25.9" + "@babel/parser": "npm:^7.26.0" + "@babel/types": "npm:^7.26.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^3.0.2" - checksum: 10/eb36706c62ea77a09604077b84fae4e25d103cce58a15926d9d8b62d90c5fa69e35962515c05e78b5a975848ef772406dd79e2d4e83851bf9f7517b197a1b19d + checksum: 10/3528b0b5da7003617771ddfc564bcb4037dde59e8142e3808ae8eb5d45c5dfda74df5eb9e6162ab2c2bc66329c609a44d9fd0ce6d4bc14b89b3deb92c3343c56 languageName: node linkType: hard @@ -213,7 +215,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.25.9": +"@babel/highlight@npm:^7.0.0": version: 7.25.9 resolution: "@babel/highlight@npm:7.25.9" dependencies: @@ -225,14 +227,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:7.25.9, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.7": - version: 7.25.9 - resolution: "@babel/parser@npm:7.25.9" +"@babel/parser@npm:7.26.1, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.26.0": + version: 7.26.1 + resolution: "@babel/parser@npm:7.26.1" dependencies: - "@babel/types": "npm:^7.25.9" + "@babel/types": "npm:^7.26.0" bin: parser: ./bin/babel-parser.js - checksum: 10/702af8c40bb1236e3e3e6187b99e1290bd4bc1500aa53593ea63df8fe99f07ff1efef147b1d58886b264aff0972c4b9440ace442c8db9a6e079f318d46773421 + checksum: 10/87d6248c6a1f962621b4505e24ee89c9869d40640beb231d6befb2d56112a84a654b15980941300617aa3211ca9632cc1644c6d3f72ea3427f220133d11d9c0c languageName: node linkType: hard @@ -419,13 +421,13 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:7.25.9, @babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.3.3": - version: 7.25.9 - resolution: "@babel/types@npm:7.25.9" +"@babel/types@npm:7.26.0, @babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3": + version: 7.26.0 + resolution: "@babel/types@npm:7.26.0" dependencies: "@babel/helper-string-parser": "npm:^7.25.9" "@babel/helper-validator-identifier": "npm:^7.25.9" - checksum: 10/dd0f2874b10048aa230a5633ab440bbee8c3905f254ef26223b5321ddb824b057b9404d24a87556c6a9f7430198fa6311473778d147ed8ed7845428aee2ebc34 + checksum: 10/40780741ecec886ed9edae234b5eb4976968cc70d72b4e5a40d55f83ff2cc457de20f9b0f4fe9d858350e43dab0ea496e7ef62e2b2f08df699481a76df02cd6e languageName: node linkType: hard @@ -7234,10 +7236,10 @@ __metadata: resolution: "prettier@workspace:." dependencies: "@angular/compiler": "npm:18.2.6" - "@babel/code-frame": "npm:7.25.9" - "@babel/generator": "npm:7.25.9" - "@babel/parser": "npm:7.25.9" - "@babel/types": "npm:7.25.9" + "@babel/code-frame": "npm:7.26.0" + "@babel/generator": "npm:7.26.0" + "@babel/parser": "npm:7.26.1" + "@babel/types": "npm:7.26.0" "@eslint/js": "npm:9.13.0" "@glimmer/syntax": "npm:0.92.3" "@prettier/is-es5-identifier-name": "npm:0.2.0"