@jcoreio/toolchain-flow 5.0.2 → 5.1.1

package/eslint.extends.cjs

@@ -1,18 +1,19 @@
 module.exports = {
-  plugins: ['eslint-plugin-flowtype'],
+  parser: '@babel/eslint-parser',
+  plugins: ['ft-flow'],
   rules: {
-    'flowtype/boolean-style': [2, 'boolean'],
-    'flowtype/define-flow-type': 1,
-    'flowtype/delimiter-dangle': [2, 'always-multiline'],
-    'flowtype/no-dupe-keys': 2,
-    'flowtype/no-primitive-constructor-types': 2,
-    'flowtype/require-parameter-type': [
+    'ft-flow/boolean-style': [2, 'boolean'],
+    'ft-flow/define-flow-type': 1,
+    'ft-flow/delimiter-dangle': [2, 'always-multiline'],
+    'ft-flow/no-dupe-keys': 2,
+    'ft-flow/no-primitive-constructor-types': 2,
+    'ft-flow/require-parameter-type': [
       2,
       {
         excludeArrowFunctions: 'expressionsOnly',
       },
     ],
-    'flowtype/require-return-type': [
+    'ft-flow/require-return-type': [
       2,
       'always',
       {
@@ -20,22 +21,22 @@ module.exports = {
         excludeArrowFunctions: 'expressionsOnly',
       },
     ],
-    'flowtype/require-valid-file-annotation': 2,
-    'flowtype/semi': [2, 'never'],
-    'flowtype/space-after-type-colon': [
+    'ft-flow/require-valid-file-annotation': 2,
+    'ft-flow/semi': [2, 'never'],
+    'ft-flow/space-after-type-colon': [
       2,
       'always',
       {
         allowLineBreak: true,
       },
     ],
-    'flowtype/space-before-generic-bracket': [2, 'never'],
-    'flowtype/space-before-type-colon': [2, 'never'],
-    'flowtype/union-intersection-spacing': [2, 'always'],
-    'flowtype/use-flow-type': 1,
+    'ft-flow/space-before-generic-bracket': [2, 'never'],
+    'ft-flow/space-before-type-colon': [2, 'never'],
+    'ft-flow/union-intersection-spacing': [2, 'always'],
+    // 'ft-flow/use-flow-type': 1,
   },
   settings: {
-    flowtype: {
+    'ft-flow': {
       onlyFilesWithFlowAnnotation: true,
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-flow",
-  "version": "5.0.2",
+  "version": "5.1.1",
   "description": "Flow JS build toolchain",
   "repository": {
     "type": "git",
@@ -14,22 +14,23 @@
   },
   "homepage": "https://github.com/jcoreio/toolchains/tree/main/packages/flow",
   "dependencies": {
-    "@babel/core": "^7.16.5",
-    "@babel/plugin-syntax-flow": "^7.14.5",
-    "@babel/plugin-transform-react-jsx": "^7.14.9",
-    "@babel/preset-flow": "^7.16.5",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-syntax-flow": "^7.26.0",
+    "@babel/plugin-transform-react-jsx": "^7.25.9",
+    "@babel/preset-flow": "^7.25.9",
     "dedent-js": "^1.0.1",
-    "eslint": "^8.56.0",
-    "eslint-plugin-flowtype": "^8.0.3",
-    "@jcoreio/toolchain": "5.0.2",
-    "@jcoreio/toolchain-esnext": "5.0.2"
+    "eslint": "^9.17.0",
+    "eslint-plugin-ft-flow": "^3.0.11",
+    "semver": "^7.5.3",
+    "@jcoreio/toolchain": "5.1.1",
+    "@jcoreio/toolchain-esnext": "5.1.1"
   },
   "toolchainManaged": {
     "devDependencies": {
       "@jcoreio/toolchain-esnext": "*",
       "@babel/plugin-syntax-flow": "*",
       "@babel/plugin-transform-react-jsx": "*",
-      "eslint-plugin-flowtype": "*"
+      "eslint-plugin-ft-flow": "*"
     }
   }
 }

package/plugins/getConfigFiles.cjs

@@ -1,11 +1,13 @@
 const dedent = require('dedent-js')
 const fs = require('@jcoreio/toolchain/util/projectFs.cjs')
 const INI = require('@jcoreio/toolchain/util/ini.cjs')
+const semver = require('semver')
 
 const defaultFlowConfig = dedent`
   [ignore]
   <PROJECT_ROOT>/dist/.*
   .*/malformed_package_json/.*
+  .*/node_modules/.*/hermes-.*/.*
 
   [include]
   ./src
@@ -21,12 +23,17 @@ module.exports = [
     let flowconfig
     if (await fs.pathExists('.flowconfig')) {
       flowconfig = await fs.readFile('.flowconfig', 'utf8')
-      if (fromVersion) return { '.flowconfig': flowconfig }
+      if (fromVersion && semver.gte(fromVersion, '5.1.0')) {
+        return { '.flowconfig': flowconfig }
+      }
       const parsed = INI.parse(flowconfig)
       const parsedDefault = INI.parse(defaultFlowConfig)
 
       let changed = false
       for (const key in parsedDefault) {
+        if (fromVersion && key === 'include') {
+          continue
+        }
         if (parsed[key]) {
           for (const item of parsedDefault[key]) {
             if (!parsed[key].includes(item)) {

package/plugins/prettierOverrides.cjs

@@ -0,0 +1,10 @@
+module.exports = [
+  () => [
+    {
+      files: ['*.js', '*.cjs', '*.mjs', '*.jsx'],
+      options: {
+        parser: 'flow',
+      },
+    },
+  ],
+]