@jcoreio/toolchain 5.0.1 → 5.1.0

package/githooks/runHook.cjs

@@ -13,6 +13,7 @@ module.exports = async function runHook(hookName) {
     let hooks
     try {
       hooks = require(Path.join(projDir, 'githooks.cjs'))
+      // eslint-disable-next-line no-unused-vars
     } catch (error) {
       hooks = require('../githooks.cjs')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -17,8 +17,8 @@
     "@jcoreio/eslint-plugin-implicit-dependencies": "^1.1.1",
     "chalk": "^4.0.0",
     "dedent-js": "^1.0.1",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint": "^9.17.0",
+    "eslint-config-prettier": "^9.1.0",
     "execa": "^5.0.0",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -27,7 +27,7 @@
     "lint-staged": "^15.2.2",
     "minimatch": "^10.0.1",
     "open": "^8.4.0",
-    "prettier": "^2.5.1",
+    "prettier": "^3.4.2",
     "prompts": "^2.4.2",
     "resolve-bin": "^1.0.0",
     "semver": "^7.5.3",

package/plugins/getConfigFiles.cjs

@@ -33,20 +33,20 @@ module.exports = [
         /* 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  '
-                  )}`
-                : ''
-            }
+            env
+              ? `\nenv: ${JSON.stringify(env, null, 2).replace(
+                  /\n/gm,
+                  '\n  '
+                )},`
+              : ''
+          }${
+            rules
+              ? `\nrules: ${JSON.stringify(rules, null, 2).replace(
+                  /\n/gm,
+                  '\n  '
+                )}`
+              : ''
+          }
         }
       `,
       'toolchain.config.cjs': async (existing) => {

package/prettier.config.cjs

@@ -1,5 +1,8 @@
+const getPluginsArraySync = require('./util/getPluginsArraySync.cjs')
+
 module.exports = {
   semi: false,
   singleQuote: true,
   trailingComma: 'es5',
+  overrides: getPluginsArraySync('prettierOverrides'),
 }

package/scripts/create.cjs

@@ -34,6 +34,7 @@ async function create(args = []) {
           encoding: 'utf8',
         })
       ).stdout.trim()
+      // eslint-disable-next-line no-unused-vars
     } catch (error) {
       // ignore
     }

package/scripts/install-git-hooks.cjs

@@ -20,9 +20,9 @@ async function installGitHooks() {
   } else {
     // chmod in case pnpm doesn't preserve mode of hooks scripts
     await Promise.all(
-      (
-        await fs.readdir(githooksDir)
-      ).map((hook) => fs.chmod(Path.join(githooksDir, hook), 0o755))
+      (await fs.readdir(githooksDir)).map((hook) =>
+        fs.chmod(Path.join(githooksDir, hook), 0o755)
+      )
     )
     await execa('git', [
       'config',

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -175,6 +175,7 @@ async function migrateProjectPackageJson({ fromVersion }) {
           ) {
             pkgSection[dep] = versionRange
           }
+          // eslint-disable-next-line no-unused-vars
         } catch (error) {
           // ignore; package.json probably has a version like workspace:* etc
         }

package/scripts/runEslint.cjs

@@ -5,10 +5,10 @@ const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
 async function eslintArgs() {
   return [
     ...((await fs.pathExists('.eslintignore'))
-      ? ['--ignore-path', '.eslintignore']
+      ? ['--ignore-pattern', '.eslintignore']
       : (await fs.pathExists('.gitignore'))
-      ? ['--ignore-path', '.gitignore']
-      : []),
+        ? ['--ignore-pattern', '.gitignore']
+        : []),
     '--ignore-pattern',
     'flow-typed/',
     '--ext',
@@ -17,7 +17,12 @@ async function eslintArgs() {
 }
 
 async function runEslint(args = []) {
-  await execa('eslint', [...args, ...(await eslintArgs())])
+  await execa('eslint', [...args, ...(await eslintArgs())], {
+    env: {
+      ...process.env,
+      ESLINT_USE_FLAT_CONFIG: 'false',
+    },
+  })
 }
 exports.runEslint = runEslint
 

package/scripts/runPrettier.cjs

@@ -5,8 +5,8 @@ async function prettierArgs() {
   return (await fs.pathExists('.prettierignore'))
     ? ['--ignore-path', '.prettierignore']
     : (await fs.pathExists('.gitignore'))
-    ? ['--ignore-path', '.gitignore']
-    : []
+      ? ['--ignore-path', '.gitignore']
+      : []
 }
 
 async function runPrettier(args = []) {

package/scripts/toolchain.cjs

@@ -50,11 +50,11 @@ const scripts = toolchainConfig
                 description: script,
               }
             : !script || typeof script === 'string'
-            ? {
-                run: () => {},
-                description: '(no-op)',
-              }
-            : script,
+              ? {
+                  run: () => {},
+                  description: '(no-op)',
+                }
+              : script,
         ])
       ),
     }
@@ -92,7 +92,7 @@ async function toolchain(command, args) {
   }
 
   try {
-    if (!command.startsWith('pre' && scripts[`pre${command}`])) {
+    if (!command.startsWith('pre') && scripts[`pre${command}`]) {
       await (scripts[`pre${command}`] && scripts[`pre${command}`].run(args))
     }
     await script.run(args)

package/util/execa.cjs

@@ -17,6 +17,7 @@ function getExecaArgs(command, args, options, ...rest) {
   let projectDir, toolchainPackages
   try {
     ;({ projectDir, toolchainPackages } = require('./findUps.cjs'))
+    // eslint-disable-next-line no-unused-vars
   } catch (error) {
     projectDir = process.cwd()
     toolchainPackages = []

package/util/findUps.cjs

@@ -91,14 +91,30 @@ const toolchainPackages = (exports.toolchainPackages = [
   ...Object.keys(packageJson.devDependencies || {}),
 ].filter((dep) => dep.startsWith(name)))
 
+const isToolchainDev = Path.normalize(__dirname)
+  .replace(/\\/, '/')
+  .endsWith('packages/base/util')
+
 const toolchainPackageJsons = (exports.toolchainPackageJsons = {})
 for (const pkg of toolchainPackages) {
   toolchainPackageJsons[pkg] =
     pkg === packageJson.name
       ? packageJson
-      : require(require.resolve(`${pkg}/package.json`, {
-          paths: [projectDir],
-        }))
+      : require(
+          isToolchainDev
+            ? Path.resolve(
+                __dirname,
+                '..',
+                '..',
+                pkg === '@jcoreio/toolchain'
+                  ? 'base'
+                  : pkg.replace('@jcoreio/toolchain-', ''),
+                'package.json'
+              )
+            : require.resolve(`${pkg}/package.json`, {
+                paths: [projectDir],
+              })
+        )
 }
 
 let toolchainConfigFile
@@ -106,6 +122,7 @@ try {
   toolchainConfigFile = require.resolve(
     Path.join(exports.projectDir, 'toolchain.config.cjs')
   )
+  // eslint-disable-next-line no-unused-vars
 } catch (error) {
   // ignore
 }

package/util/getModules.cjs

@@ -22,10 +22,10 @@ module.exports = async function getModules(packageJsonFile) {
       ? /\.cjs$/.test(file)
         ? 'commonjs'
         : /\.mjs$/.test(file)
-        ? 'module'
-        : /\.js$/.test(file)
-        ? defaultType
-        : undefined
+          ? 'module'
+          : /\.js$/.test(file)
+            ? defaultType
+            : undefined
       : undefined
   ) {
     if (!file) return
@@ -55,8 +55,8 @@ module.exports = async function getModules(packageJsonFile) {
             (key === 'require'
               ? 'commonjs'
               : key === 'import'
-              ? 'module'
-              : undefined)
+                ? 'module'
+                : undefined)
         )
       }
     }

package/util/getPlugins.cjs

@@ -10,6 +10,7 @@ function getPlugins(name) {
       path = require.resolve(Path.join(pkg, 'plugins', `${name}.cjs`), {
         paths: [projectDir],
       })
+      // eslint-disable-next-line no-unused-vars
     } catch (error) {
       continue
     }