@jcoreio/toolchain 5.2.0 → 5.3.1

package/eslintConfig.cjs

@@ -1,8 +1,3 @@
 const getPluginsArraySync = require('./util/getPluginsArraySync.cjs')
 
-module.exports = {
-  extends: [
-    ...getPluginsArraySync('getEslintExtends'),
-    require.resolve('eslint-config-prettier'),
-  ],
-}
+module.exports = [...getPluginsArraySync('getEslintConfigs')]

package/lint-staged.config.cjs

@@ -3,16 +3,16 @@ const getPluginsArraySync = require('./util/getPluginsArraySync.cjs')
 const lintExtList = getPluginsArraySync('lintExtensions')
 
 const lintExts =
-  lintExtList.length === 1
-    ? `*.${lintExtList[0]}`
-    : `*.{${lintExtList.join(',')}}`
+  lintExtList.length === 1 ?
+    `*.${lintExtList[0]}`
+  : `*.{${lintExtList.join(',')}}`
 
 const formatExtList = getPluginsArraySync('formatExtensions')
 
 const formatExts =
-  formatExtList.length === 1
-    ? `*.${formatExtList[0]}`
-    : `*.{${formatExtList.join(',')}}`
+  formatExtList.length === 1 ?
+    `*.${formatExtList[0]}`
+  : `*.{${formatExtList.join(',')}}`
 
 module.exports = {
   [lintExts]: ['tc lint:fix'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.2.0",
+  "version": "5.3.1",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -14,6 +14,12 @@
   },
   "homepage": "https://github.com/jcoreio/toolchains/tree/main/packages/base",
   "dependencies": {
+    "@babel/generator": "^7.27.0",
+    "@babel/parser": "^7.27.0",
+    "@babel/template": "^7.27.0",
+    "@babel/types": "^7.27.0",
+    "@eslint/compat": "^1.2.8",
+    "@eslint/js": "^9.23.0",
     "@jcoreio/eslint-plugin-implicit-dependencies": "^1.1.1",
     "chalk": "^4.0.0",
     "dedent-js": "^1.0.1",
@@ -23,6 +29,7 @@
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "glob": "^11.0.0",
+    "globals": "^16.0.0",
     "js-yaml": "4.1.0",
     "json5": "^2.2.1",
     "lint-staged": "^15.2.2",
@@ -43,13 +50,12 @@
     "packageManager": "pnpm@10.6.5",
     "devDependencies": {
       "eslint": "*",
-      "@jcoreio/eslint-plugin-implicit-dependencies": "*"
+      "globals": "*",
+      "lint-staged": "*",
+      "prettier": "*"
     }
   },
   "bin": {
-    "eslint": "./bin/eslint",
-    "lint-staged": "./bin/lint-staged",
-    "prettier": "./bin/prettier",
     "tc": "./scripts/toolchain.cjs",
     "toolchain": "./scripts/toolchain.cjs"
   },

package/plugins/getConfigFiles.cjs

@@ -1,54 +1,46 @@
 const { name } = require('../package.json')
 const dedent = require('dedent-js')
 const fs = require('../util/projectFs.cjs')
-const JSON5 = require('json5')
 const { isMonorepoSubpackage } = require('../util/findUps.cjs')
 const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
 const initBuildIgnore = require('../util/initBuildIgnore.cjs')
-
-async function getRootEslintConfig() {
-  if (await fs.pathExists('.eslintrc.json')) {
-    return JSON5.parse(await fs.readFile('.eslintrc.json', 'utf8'))
-  }
-  if (await fs.pathExists('.eslintrc')) {
-    return JSON5.parse(await fs.readFile('.eslintrc', 'utf8'))
-  }
-}
+const migrateLegacyEslintConfigs = require('../util/migrateLegacyEslintConfigs.cjs')
+const chalk = require('chalk')
+const { glob } = require('../util/glob.cjs')
 
 module.exports = [
   async function getConfigFiles({ fromVersion }) {
-    const { env, rules } = (await getRootEslintConfig()) || {}
     const files = {
-      ...(isMonorepoSubpackage
-        ? {}
-        : {
-            '.npmrc': dedent`
+      ...(isMonorepoSubpackage ?
+        {}
+      : {
+          '.npmrc': dedent`
               optional=false
             `,
-          }),
-      '.eslintrc.cjs': async (existing) =>
-        existing && fromVersion
-          ? existing
-          : dedent`
-        /* eslint-env node, es2018 */
-        module.exports = {
-          extends: [require.resolve('${name}/eslintConfig.cjs')],${
-            env
-              ? `\nenv: ${JSON.stringify(env, null, 2).replace(
-                  /\n/gm,
-                  '\n  '
-                )},`
-              : ''
-          }${
-            rules
-              ? `\nrules: ${JSON.stringify(rules, null, 2).replace(
-                  /\n/gm,
-                  '\n  '
-                )}`
-              : ''
+        }),
+      'eslint.config.cjs': async (existing) => {
+        if (existing && fromVersion) return existing
+        const configs = {}
+        for (const file of await glob('**/.eslintrc{,.json,.js,.cjs}')) {
+          configs[file] = await fs.readFile(file)
+        }
+        const { migrated, warnings } = await migrateLegacyEslintConfigs(configs)
+        if (warnings.length) {
+          for (const [file, fileWarnings] of Object.entries(warnings)) {
+            // eslint-disable-next-line no-console
+            console.warn(
+              chalk.yellow(
+                dedent`
+                  WARNING: ${file} could not be completely migrated because of the following:
+                    ${fileWarnings.map((w) => `- ${w}`).join('\n  ')} 
+                  
+                `
+              )
+            )
           }
         }
-      `,
+        return migrated
+      },
       'toolchain.config.cjs': async (existing) => {
         if (existing) return existing
         return dedent`
@@ -72,9 +64,8 @@ module.exports = [
       'prettier.config.cjs',
     ]) {
       files[file] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : dedent`
+        existing && fromVersion ? existing : (
+          dedent`
               /* eslint-env node, es2018 */
               const base = require('${name}/${file}')
               module.exports = {
@@ -82,39 +73,38 @@ module.exports = [
               }
         
             `
+        )
     }
-    const tasks = isMonorepoSubpackage
-      ? []
-      : await getPluginsArraySync('vscodeTasks')
-    const launch = isMonorepoSubpackage
-      ? []
-      : await getPluginsArraySync('vscodeLaunch')
+    const tasks =
+      isMonorepoSubpackage ? [] : await getPluginsArraySync('vscodeTasks')
+    const launch =
+      isMonorepoSubpackage ? [] : await getPluginsArraySync('vscodeLaunch')
 
     if (tasks.length) {
       files['.vscode/tasks.json'] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : JSON.stringify(
-              {
-                version: '2.0.0',
-                tasks,
-              },
-              null,
-              2
-            )
+        existing && fromVersion ? existing : (
+          JSON.stringify(
+            {
+              version: '2.0.0',
+              tasks,
+            },
+            null,
+            2
+          )
+        )
     }
     if (launch.length) {
       files['.vscode/launch.json'] = async (existing) =>
-        existing && fromVersion
-          ? existing
-          : JSON.stringify(
-              {
-                version: '0.2.0',
-                configurations: launch,
-              },
-              null,
-              2
-            )
+        existing && fromVersion ? existing : (
+          JSON.stringify(
+            {
+              version: '0.2.0',
+              configurations: launch,
+            },
+            null,
+            2
+          )
+        )
     }
 
     return files

package/plugins/getEslintConfigs.cjs

@@ -0,0 +1,105 @@
+const js = require('@eslint/js')
+const { defineConfig } = require('eslint/config')
+const { includeIgnoreFile } = require('@eslint/compat')
+const { projectDir } = require('../util/findUps.cjs')
+const path = require('path')
+const fs = require('../util/projectFs.cjs')
+const { globSync } = require('../util/glob.cjs')
+
+module.exports = [
+  () => {
+    const gitignores = globSync('**/.gitignore')
+    if (fs.pathExistsSync('.eslintignore')) {
+      gitignores.push('.eslintignore')
+    }
+    return defineConfig([
+      ...gitignores.map((file) =>
+        includeIgnoreFile(path.resolve(projectDir, file))
+      ),
+      js.configs.recommended,
+      {
+        files: ['**/*.{js,cjs,mjs}'],
+        plugins: {
+          '@jcoreio/implicit-dependencies': require('@jcoreio/eslint-plugin-implicit-dependencies'),
+        },
+        rules: {
+          '@jcoreio/implicit-dependencies/no-implicit': [
+            'error',
+            {
+              dev: true,
+              peer: true,
+              optional: true,
+            },
+          ],
+          'arrow-spacing': 'error',
+          'comma-spacing': 'error',
+          'computed-property-spacing': ['error', 'never'],
+          'eol-last': 'error',
+          'jsx-quotes': 'error',
+          'keyword-spacing': 'error',
+          'key-spacing': [
+            'error',
+            {
+              mode: 'strict',
+            },
+          ],
+          'linebreak-style': 'error',
+          'no-console': 'error',
+          'no-unused-vars': [
+            'error',
+            {
+              args: 'none',
+              varsIgnorePattern: 'React',
+            },
+          ],
+          'no-extra-semi': 'error',
+          'no-multi-spaces': 'error',
+          'no-multiple-empty-lines': 'error',
+          'no-trailing-spaces': 'error',
+          'no-unexpected-multiline': 'error',
+          'no-unreachable': 'error',
+          'no-whitespace-before-property': 'error',
+          'object-shorthand': ['error', 'always'],
+          'padded-blocks': ['error', 'never'],
+          semi: ['error', 'never'],
+          'space-before-blocks': ['error', 'always'],
+          'space-before-function-paren': [
+            'error',
+            {
+              anonymous: 'always',
+              named: 'never',
+            },
+          ],
+          'space-in-parens': ['error', 'never'],
+          'space-infix-ops': ['error', { int32Hint: false }],
+          'space-unary-ops': [
+            'error',
+            {
+              words: true,
+              nonwords: false,
+            },
+          ],
+          'rest-spread-spacing': ['error', 'never'],
+        },
+      },
+      {
+        files: ['src/**'],
+        ignores: ['**/__tests__/**'],
+        plugins: {
+          '@jcoreio/implicit-dependencies': require('@jcoreio/eslint-plugin-implicit-dependencies'),
+        },
+        rules: {
+          '@jcoreio/implicit-dependencies/no-implicit': [
+            'error',
+            {
+              dev: false,
+              peer: true,
+              optional: true,
+            },
+          ],
+        },
+      },
+      require('eslint-config-prettier'),
+    ])
+  },
+]

package/prettier.config.cjs

@@ -4,5 +4,6 @@ module.exports = {
   semi: false,
   singleQuote: true,
   trailingComma: 'es5',
+  experimentalTernaries: true,
   overrides: getPluginsArraySync('prettierOverrides'),
 }

package/scripts/create.cjs

@@ -73,27 +73,27 @@ async function create(args = []) {
       message: 'Package keywords:',
       format: (text) => (text || '').split(/\s*,\s*|\s+/g),
     },
-    ...(monorepoPackageJson
-      ? []
-      : [
-          {
-            type: 'text',
-            name: 'organization',
-            initial: (prev, { name }) => {
-              const match = /^@(.*?)\//.exec(name)
-              if (match) return match[1]
-            },
-            message: 'GitHub organization:',
-            validate: required,
+    ...(monorepoPackageJson ?
+      []
+    : [
+        {
+          type: 'text',
+          name: 'organization',
+          initial: (prev, { name }) => {
+            const match = /^@(.*?)\//.exec(name)
+            if (match) return match[1]
           },
-          {
-            type: 'text',
-            name: 'repo',
-            message: 'GitHub repo:',
-            initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
-            validate: required,
-          },
-        ]),
+          message: 'GitHub organization:',
+          validate: required,
+        },
+        {
+          type: 'text',
+          name: 'repo',
+          message: 'GitHub repo:',
+          initial: (prev, { name }) => name.replace(/^@(.*?)\//, ''),
+          validate: required,
+        },
+      ]),
     {
       type: 'select',
       name: 'license',
@@ -140,8 +140,9 @@ async function create(args = []) {
     copyrightHolder,
   } = answers
 
-  const { organization, repo } = monorepoPackageJson
-    ? parseRepositoryUrl(monorepoPackageJson.repository.url)
+  const { organization, repo } =
+    monorepoPackageJson ?
+      parseRepositoryUrl(monorepoPackageJson.repository.url)
     : answers
 
   const cwd = path.resolve(directory)
@@ -150,12 +151,12 @@ async function create(args = []) {
 
   const fs = ChdirFs(cwd)
 
-  const subpackagePath = monorepoProjectDir
-    ? path.relative(monorepoProjectDir, cwd)
-    : undefined
+  const subpackagePath =
+    monorepoProjectDir ? path.relative(monorepoProjectDir, cwd) : undefined
 
-  const branch = subpackagePath
-    ? (
+  const branch =
+    subpackagePath ?
+      (
         await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
           stdio: 'pipe',
           encoding: 'utf8',

package/scripts/init.cjs

@@ -73,11 +73,9 @@ async function init(args = []) {
     '--prefer-offline',
     ...(isMonorepoRoot ? ['-w'] : []),
     isTest ? '../packages/base' : `${name}@^${version}`,
-    ...(isTest
-      ? [...selectedToolchains].map((t) =>
-          t.replace(`${name}-`, '../packages/')
-        )
-      : [...selectedToolchains].map((t) => `${t}@^${version}`)),
+    ...(isTest ?
+      [...selectedToolchains].map((t) => t.replace(`${name}-`, '../packages/'))
+    : [...selectedToolchains].map((t) => `${t}@^${version}`)),
   ])
   await execa('tc', ['migrate'])
   if (isInteractive) {

package/scripts/migrate/migrateEslintConfigs.cjs

@@ -1,26 +1,12 @@
 const { glob } = require('../../util/glob.cjs')
 const Path = require('path')
-const JSON5 = require('json5')
 const fs = require('../../util/projectFs.cjs')
 
 async function migrateEslintConfigs({ fromVersion }) {
-  if (fromVersion) {
-    // only do this migration on init
-    return
-  }
-  for (const file of await glob(Path.join('**', '.eslintrc{,.json}'))) {
-    const content = JSON5.parse(await fs.readFile(file, 'utf8'))
-    if (content.extends) {
-      delete content.extends
-      await fs.writeFile(file, JSON5.stringify(content, null, 2), 'utf8')
-    }
-  }
   for (const file of [
+    ...(await glob(Path.join('**', '.eslintrc{,.json}'))),
     '.eslintrc.js',
-    '.eslintrc.json',
-    '.eslintrc.yaml',
-    '.eslintrc.yml',
-    '.eslintrc',
+    '.eslintrc.cjs',
   ]) {
     const exists = await fs.pathExists(file)
     if (exists) {

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -110,53 +110,55 @@ async function migrateProjectPackageJson({ fromVersion }) {
       packageJson.exports = {
         './package.json': './package.json',
         '.': {
-          ...(packageJson.types
-            ? { types: relativize(packageJson.types) }
-            : {}),
-          ...(outputEsm !== false && packageJson.module
-            ? { import: relativize(packageJson.module) }
-            : {}),
+          ...(packageJson.types ?
+            { types: relativize(packageJson.types) }
+          : {}),
+          ...(outputEsm !== false && packageJson.module ?
+            { import: relativize(packageJson.module) }
+          : {}),
           default: relativize(packageJson.main),
         },
-        ...(dotStar
-          ? {
-              './*': {
-                types: './*.d.ts',
-                ...(outputEsm !== false ? { import: './*.mjs' } : {}),
-                default: './*.js',
-              },
-            }
-          : {}),
+        ...(dotStar ?
+          {
+            './*': {
+              types: './*.d.ts',
+              ...(outputEsm !== false ? { import: './*.mjs' } : {}),
+              default: './*.js',
+            },
+          }
+        : {}),
       }
     }
   }
 
   merge(
     packageJson,
-    fromVersion
-      ? {}
-      : {
-          version: '0.0.0-development',
-          sideEffects: false,
-          scripts: {
-            tc: 'toolchain',
-            toolchain: 'toolchain',
-            test: 'toolchain test',
-            prepublishOnly:
-              'echo This package is meant to be published by semantic-release from the dist build directory. && exit 1',
-          },
+    fromVersion ?
+      {}
+    : {
+        version: '0.0.0-development',
+        sideEffects: false,
+        scripts: {
+          tc: 'toolchain',
+          toolchain: 'toolchain',
+          test: 'toolchain test',
+          prepublishOnly:
+            'echo This package is meant to be published by semantic-release from the dist build directory. && exit 1',
         },
+      },
     pick(toolchainManaged, 'engines', 'packageManager'),
     {
       packageManager:
-        !packageJson.packageManager ||
-        !packageJson.packageManager.startsWith('pnpm@') ||
-        semver.lt(
-          packageJson.packageManager.replace(/^pnpm@/, ''),
-          toolchainManaged.packageManager.replace(/^pnpm@/, '')
-        )
-          ? toolchainManaged.packageManager
-          : packageJson.packageManager,
+        (
+          !packageJson.packageManager ||
+          !packageJson.packageManager.startsWith('pnpm@') ||
+          semver.lt(
+            packageJson.packageManager.replace(/^pnpm@/, ''),
+            toolchainManaged.packageManager.replace(/^pnpm@/, '')
+          )
+        ) ?
+          toolchainManaged.packageManager
+        : packageJson.packageManager,
     },
     pick(packageJson, 'engines')
   )

package/scripts/migrate/migrateRemoveDevDeps.cjs

@@ -1,6 +1,7 @@
 module.exports = [
   '@babel/cli',
   '@babel/core',
+  '@babel/eslint-parser',
   '@babel/plugin-dynamic-import-node',
   '@babel/plugin-external-helpers',
   '@babel/plugin-proposal-class-properties',
@@ -41,6 +42,7 @@ module.exports = [
   '@commitlint/cli',
   '@commitlint/config-conventional',
   '@jcoreio/commitlint-config',
+  '@jcoreio/eslint-plugin-implicit-dependencies',
   '@jedwards1211/commitlint-config',
   '@jedwards1211/eslint-config-flow',
   '@jedwards1211/eslint-config-react',
@@ -52,6 +54,7 @@ module.exports = [
   '@semantic-release/release-notes-generator',
   '@typescript-eslint/eslint-plugin',
   '@typescript-eslint/parser',
+  '@typescript-eslint/typescript-estree',
   'babel-cli',
   'babel-core',
   'babel-eslint',
@@ -97,6 +100,10 @@ module.exports = [
   'cz-conventional-changelog',
   'coveralls',
   'eslint-watch',
+  'eslint-plugin-flowtype',
+  'eslint-plugin-ft-flow',
+  'eslint-plugin-no-only-tests',
+  'eslint-plugin-react',
   'flow-copy-source',
   'flow-watch',
   'husky',

package/scripts/migrate.cjs

@@ -20,9 +20,8 @@ async function migrate(args = []) {
   const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
   const writeMigratedVersion = require('../util/writeMigratedVersion.cjs')
 
-  const fromVersion = packageJson[name]
-    ? packageJson[name].migratedVersion
-    : undefined
+  const fromVersion =
+    packageJson[name] ? packageJson[name].migratedVersion : undefined
   if (!fromVersion && !isMonorepoSubpackage && !findGitDir()) {
     await execa('git', ['init'])
     await installGitHooks.run()

package/scripts/runEslint.cjs

@@ -1,33 +1,7 @@
-const fs = require('../util/projectFs.cjs')
 const execa = require('../util/execa.cjs')
-const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
-
-async function eslintArgs() {
-  return [
-    ...((await fs.pathExists('.eslintignore')) ||
-    !(await fs.pathExists('.gitignore'))
-      ? []
-      : (await fs.readFile('.gitignore', 'utf8'))
-          .split(/\r\n?|\n/gm)
-          .flatMap((pattern) =>
-            !/^#/.test(pattern.trim())
-              ? ['--ignore-pattern', pattern.trim()]
-              : []
-          )),
-    '--ignore-pattern',
-    'flow-typed/',
-    '--ext',
-    getPluginsArraySync('lintExtensions').join(','),
-  ]
-}
 
 async function runEslint(args = []) {
-  await execa('eslint', [...args, ...(await eslintArgs())], {
-    env: {
-      ...process.env,
-      ESLINT_USE_FLAT_CONFIG: 'false',
-    },
-  })
+  await execa('eslint', [...args])
 }
 exports.runEslint = runEslint
 

package/scripts/runPrettier.cjs

@@ -2,11 +2,12 @@ const fs = require('../util/projectFs.cjs')
 const execa = require('../util/execa.cjs')
 
 async function prettierArgs() {
-  return (await fs.pathExists('.prettierignore'))
-    ? ['--ignore-path', '.prettierignore']
-    : (await fs.pathExists('.gitignore'))
-      ? ['--ignore-path', '.gitignore']
-      : []
+  return (
+    (await fs.pathExists('.prettierignore')) ?
+      ['--ignore-path', '.prettierignore']
+    : (await fs.pathExists('.gitignore')) ? ['--ignore-path', '.gitignore']
+    : []
+  )
 }
 
 async function runPrettier(args = []) {