diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 538f48ffc..3c3b1206e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -33,7 +33,7 @@ }, { groupName: "flow-parser", - matchPackageNames: ["flow-parser", "hermes-parser"], + matchPackageNames: ["flow-parser", "hermes-parser", "flow-estree"], }, { groupName: "ESLint related dependencies", diff --git a/knip.config.js b/knip.config.js index d014142e5..c54151ade 100644 --- a/knip.config.js +++ b/knip.config.js @@ -30,7 +30,12 @@ const config = { "src/experimental-cli/**", "src/universal/*.browser.js", ], - ignoreDependencies: ["ts-expect", "buffer", "base64-arraybuffer-es6"], + ignoreDependencies: [ + "ts-expect", + "buffer", + "base64-arraybuffer-es6", + "flow-estree", + ], ignoreBinaries: ["test-coverage"], }, website: { diff --git a/package.json b/package.json index 1aafa8b10..ab27eec43 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "fast-json-stable-stringify": "2.1.0", "file-entry-cache": "11.1.3", "find-cache-directory": "6.0.0", - "flow-parser": "0.320.0", + "flow-parser": "0.321.0", "get-east-asian-width": "1.6.0", "get-stdin": "9.0.0", "graphql": "17.0.1", @@ -162,6 +162,7 @@ "eslint-plugin-simple-import-sort": "13.0.0", "eslint-plugin-unicorn": "68.0.0", "esm-utils": "4.4.2", + "flow-estree": "0.321.0", "get-port": "7.2.0", "gfm-test-suite": "0.0.2", "globals": "17.7.0", diff --git a/scripts/build/packages/prettier.js b/scripts/build/packages/prettier.js index 7fe99616c..8df63d2e2 100644 --- a/scripts/build/packages/prettier.js +++ b/scripts/build/packages/prettier.js @@ -258,7 +258,7 @@ const pluginFiles = [ input: "src/plugins/flow.js", replaceModule: [ { - module: getPackageFile("flow-parser/oxidized/FlowParser.js"), + module: getPackageFile("flow-parser/dist/FlowParser.js"), process(text) { text = outdent` const Buffer = globalThis.Buffer ?? require("buffer/").Buffer; @@ -269,7 +269,7 @@ const pluginFiles = [ }, }, { - module: getPackageFile("flow-parser/oxidized/FlowParserWASM.js"), + module: getPackageFile("flow-parser/dist/FlowParserWASM.js"), process(text) { text = outdent` const Buffer = globalThis.Buffer ?? require("buffer/").Buffer; diff --git a/scripts/sync-flow-tests.cjs b/scripts/sync-flow-tests.cjs index 675606239..f2af2c42a 100644 --- a/scripts/sync-flow-tests.cjs +++ b/scripts/sync-flow-tests.cjs @@ -2,7 +2,7 @@ const fs = require("fs"); const path = require("path"); -const { parse: flowParse } = require("flow-parser/oxidized"); +const { parse: flowParse } = require("flow-parser"); const fastGlob = require("fast-glob"); const DEFAULT_SPEC_CONTENT = "runFormatTest(import.meta);\n"; diff --git a/src/language-js/parse/flow.js b/src/language-js/parse/flow.js index f415c12ae..b8e0a8dc6 100644 --- a/src/language-js/parse/flow.js +++ b/src/language-js/parse/flow.js @@ -1,4 +1,4 @@ -import { parse as flowParse } from "flow-parser/oxidized/index.js"; +import { parse as flowParse } from "flow-parser"; import createError from "../../common/parser-create-error.js"; import postprocess from "./postprocess/index.js"; import createParser from "./utilities/create-parser.js"; diff --git a/src/language-js/traverse/visitor-keys.evaluate.js b/src/language-js/traverse/visitor-keys.evaluate.js index d22f3af57..4efd1833e 100644 --- a/src/language-js/traverse/visitor-keys.evaluate.js +++ b/src/language-js/traverse/visitor-keys.evaluate.js @@ -1,7 +1,7 @@ import { VISITOR_KEYS as babelVisitorKeys } from "@babel/types"; import { visitorKeys as tsVisitorKeys } from "@typescript-eslint/visitor-keys"; import { visitorKeys as angularVisitorKeys } from "angular-estree-parser"; -import { FlowVisitorKeys as flowVisitorKeys } from "flow-parser/oxidized/index.js"; +import { FlowVisitorKeys as flowVisitorKeys } from "flow-parser"; import { addVisitorKeys, generateReferenceSharedVisitorKeys, diff --git a/yarn.lock b/yarn.lock index 1402e4b7e..a6c3dfe55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4877,19 +4877,19 @@ __metadata: languageName: node linkType: hard -"flow-estree@npm:0.320.0": - version: 0.320.0 - resolution: "flow-estree@npm:0.320.0" - checksum: 10/e520c3045be7aaf969694190983076c4b5131f42eed0d808d8c08c3afd38ac7f4e3c8f71bbce720babc8dee847c649666fd12edf100bfc1eb6db6b0117470189 +"flow-estree@npm:0.321.0": + version: 0.321.0 + resolution: "flow-estree@npm:0.321.0" + checksum: 10/97495711734f041cfd1e8690ec8ec82e168a607dd170e1575a01fd61a5dc0c1ef45378ed2a662a879fa3c8fcb1604dd030a7a314b37f127cf764b97f64f86763 languageName: node linkType: hard -"flow-parser@npm:0.320.0": - version: 0.320.0 - resolution: "flow-parser@npm:0.320.0" +"flow-parser@npm:0.321.0": + version: 0.321.0 + resolution: "flow-parser@npm:0.321.0" dependencies: - flow-estree: "npm:0.320.0" - checksum: 10/7ad8653fafeee295a5400ee26bf501dc510f056c3b28c5794cff0f0870c05ad60b3ceb9f8de743a24d0969aebfc261627d624e747743553984b50d02ab00d2f8 + flow-estree: "npm:0.321.0" + checksum: 10/e71715d1752a4d393beb647b72538387c9f0c4e1c7902da0f5c3f11dcde986ac6be750a41453551d8e81a1cb59738d95e3a3da22ec82d52caf1c3bd6226cd6c3 languageName: node linkType: hard @@ -7976,7 +7976,8 @@ __metadata: fast-json-stable-stringify: "npm:2.1.0" file-entry-cache: "npm:11.1.3" find-cache-directory: "npm:6.0.0" - flow-parser: "npm:0.320.0" + flow-estree: "npm:0.321.0" + flow-parser: "npm:0.321.0" get-east-asian-width: "npm:1.6.0" get-port: "npm:7.2.0" get-stdin: "npm:9.0.0"