@react-native/eslint-plugin-specs 0.72.0 → 0.72.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.72.0",
+  "version": "0.72.2",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "main": "index.js",
   "repository": {
@@ -13,14 +13,14 @@
     "postpack": "node postpack.js"
   },
   "dependencies": {
-    "@babel/core": "^7.14.0",
-    "@babel/eslint-parser": "^7.18.2",
+    "@babel/core": "^7.20.0",
+    "@babel/eslint-parser": "^7.19.0",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/preset-flow": "^7.17.12",
+    "@babel/preset-flow": "^7.18.0",
+    "@react-native/codegen": "*",
     "flow-parser": "^0.185.0",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
-    "react-native-codegen": "*",
     "source-map-support": "0.5.0"
   },
   "license": "MIT"

package/react-native-modules.js

@@ -23,10 +23,11 @@ const ERRORS = {
 
 let RNModuleParser;
 let RNParserUtils;
+let RNFlowParser;
 
 function requireModuleParser() {
-  if (RNModuleParser == null || RNParserUtils == null) {
-    // If using this externally, we leverage react-native-codegen as published form
+  if (RNModuleParser == null || RNParserUtils == null || RNFlowParser == null) {
+    // If using this externally, we leverage @react-native/codegen as published form
     if (!PACKAGE_USAGE) {
       const config = {
         only: [/react-native-codegen\/src\//],
@@ -34,18 +35,20 @@ function requireModuleParser() {
       };
 
       withBabelRegister(config, () => {
-        RNModuleParser = require('react-native-codegen/src/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/src/parsers/utils');
+        RNModuleParser = require('@react-native/codegen/src/parsers/flow/modules');
+        RNParserUtils = require('@react-native/codegen/src/parsers/utils');
+        RNFlowParser = require('@react-native/codegen/src/parsers/flow/parser');
       });
     } else {
       const config = {
-        only: [/react-native-codegen\/lib\//],
+        only: [/@react-native\/codegen\/lib\//],
         plugins: [require('@babel/plugin-transform-flow-strip-types').default],
       };
 
       withBabelRegister(config, () => {
-        RNModuleParser = require('react-native-codegen/lib/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/lib/parsers/utils');
+        RNModuleParser = require('@react-native/codegen/lib/parsers/flow/modules');
+        RNParserUtils = require('@react-native/codegen/lib/parsers/flow/utils');
+        RNFlowParser = require('@react-native/codegen/lib/parsers/flow/parser');
       });
     }
   }
@@ -53,6 +56,7 @@ function requireModuleParser() {
   return {
     buildModuleSchema: RNModuleParser.buildModuleSchema,
     createParserErrorCapturer: RNParserUtils.createParserErrorCapturer,
+    parser: new RNFlowParser.FlowParser(),
   };
 }
 
@@ -127,17 +131,16 @@ function rule(context) {
         });
       }
 
-      const {buildModuleSchema, createParserErrorCapturer} =
+      const {buildModuleSchema, createParserErrorCapturer, parser} =
         requireModuleParser();
-      const flowParser = require('flow-parser');
 
       const [parsingErrors, tryParse] = createParserErrorCapturer();
 
       const sourceCode = context.getSourceCode().getText();
-      const ast = flowParser.parse(sourceCode, {enums: true});
+      const ast = parser.getAst(sourceCode);
 
       tryParse(() => {
-        buildModuleSchema(hasteModuleName, ast, tryParse);
+        buildModuleSchema(hasteModuleName, ast, tryParse, parser);
       });
 
       parsingErrors.forEach(error => {