@jcoreio/toolchain 1.0.0-beta.7 → 1.0.0-beta.9

package/githooks/runHook.cjs

@@ -2,7 +2,7 @@ const Path = require('path')
 const { findGitDir } = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
 
-module.exports = async function runHook(hook) {
+module.exports = async function runHook(hookName) {
   try {
     const gitDir = findGitDir()
     if (!gitDir) {
@@ -16,9 +16,13 @@ module.exports = async function runHook(hook) {
     } catch (error) {
       hooks = require('../githooks.cjs')
     }
+    const hook = hooks[hookName]
+    if (!hook) return
 
-    if (hooks[hook]) {
-      await execa(hooks[hook], {
+    if (typeof hook === 'function') {
+      await hook()
+    } else if (hook) {
+      await execa(hook, {
         cwd: projDir,
         shell: true,
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.9",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -14,14 +14,10 @@
   },
   "homepage": "https://github.com/jcoreio/toolchains/tree/beta/packages/base",
   "dependencies": {
-    "@semantic-release/commit-analyzer": "^9.0.2",
-    "@semantic-release/github": "^8.0.4",
-    "@semantic-release/npm": "^10.0.4",
-    "@semantic-release/release-notes-generator": "^10.0.3",
     "chalk": "^4.0.0",
     "dedent-js": "^1.0.1",
-    "eslint": "^8.5.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
     "execa": "^5.0.0",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -31,23 +27,23 @@
     "open": "^8.4.0",
     "prettier": "^2.5.1",
     "resolve-bin": "^1.0.0",
-    "semantic-release": "^21.0.5",
     "semver": "^7.5.3",
     "toposort": "^2.0.2",
     "zod": "^3.21.4"
   },
   "toolchainManaged": {
+    "engines": {
+      "node": ">=16"
+    },
+    "packageManager": "pnpm@8.3.1",
     "devDependencies": {
       "eslint": "*"
     }
   },
   "bin": {
-    "cz": "./bin/cz",
     "eslint": "./bin/eslint",
-    "git-cz": "./bin/git-cz",
     "lint-staged": "./bin/lint-staged",
     "prettier": "./bin/prettier",
-    "semantic-release": "./bin/semantic-release",
     "tc": "./scripts/toolchain.cjs",
     "toolchain": "./scripts/toolchain.cjs"
   },

package/plugins/getConfigFiles.cjs

@@ -30,12 +30,6 @@ module.exports = [
       }
         }
       `,
-      'release.config.js': dedent`
-        /* eslint-env node, es2018 */
-        module.exports = {
-          extends: [require.resolve('${name}/release.config.cjs')],
-        }
-      `,
     }
     for (const file of [
       'githooks.cjs',

package/scripts/bootstrap/bootstrapConfigFiles.cjs

@@ -1,19 +1,28 @@
 const fs = require('../../util/projectFs.cjs')
-const getPluginsObject = require('../../util/getPluginsObject.cjs')
+const path = require('path')
+const getPluginsObjectAsync = require('../../util/getPluginsObjectAsync.cjs')
 const { name } = require('../../package.json')
 
 async function bootstrapConfigFiles() {
-  const files = await getPluginsObject('getConfigFiles')
+  const files = await getPluginsObjectAsync('getConfigFiles')
   for (const file in files) {
     const value = files[file]
-    const content = typeof value === 'string' ? value : value.content
-    const overwrite = typeof value === 'string' ? false : value.overwrite
+    let content, overwrite
+    if (typeof value === 'function') {
+      const prev = await fs.readFile(file, 'utf8').catch(() => undefined)
+      content = await value(prev)
+      overwrite = content !== prev
+    } else {
+      content = typeof value === 'string' ? value : value.content
+      overwrite = typeof value === 'string' ? false : value.overwrite
+    }
     if (
       overwrite === true ||
       !(await fs.pathExists(file)) ||
       (content.includes(name) &&
         !(await fs.readFile(file, 'utf8')).includes(name))
     ) {
+      await fs.mkdirs(path.dirname(file))
       await fs.writeFile(file, content, 'utf8')
       // eslint-disable-next-line no-console
       console.error(`wrote ${file}`)

package/scripts/bootstrap/bootstrapProjectPackageJson.cjs

@@ -1,9 +1,10 @@
-const { name } = require('../../package.json')
-const { projectDir, toolchainPackages } = require('../../util/findUps.cjs')
+const { toolchainManaged } = require('../../util/findUps.cjs')
 const getPluginsAsyncFunction = require('../../util/getPluginsAsyncFunction.cjs')
 const fs = require('../../util/projectFs.cjs')
 const sortDeps = require('../../util/sortDeps.cjs')
 const semver = require('semver')
+const isEmpty = require('lodash/isEmpty')
+const pick = require('lodash/pick')
 
 async function bootstrapProjectPackageJson() {
   const { merge, unset } = require('lodash')
@@ -12,41 +13,52 @@ async function bootstrapProjectPackageJson() {
   const devDependencies =
     packageJson.devDependencies || (packageJson.devDependencies = {})
 
-  const toolchainManaged = {}
-  for (const pkg of toolchainPackages) {
-    const toolchainPkgJson = require(require.resolve(`${pkg}/package.json`, {
-      paths: [projectDir],
-    }))
-    const toolchainPkgDeps = toolchainPkgJson.dependencies || {}
-    const toolchainPkgDevDeps = toolchainPkgJson.devDependencies || {}
-    if (toolchainPkgJson.toolchainManaged) {
-      for (const section in toolchainPkgJson.toolchainManaged) {
-        const sectionDeps = toolchainPkgJson.toolchainManaged[section]
-        if (!toolchainManaged[section]) toolchainManaged[section] = {}
-        for (const dep in sectionDeps) {
-          let version = sectionDeps[dep]
-          if (version === '*')
-            version = toolchainPkgDevDeps[dep] || toolchainPkgDeps[dep]
-          if (version !== '*') toolchainManaged[section][dep] = version
-        }
-      }
-    }
-  }
-
   for (const path of [
-    'exports',
+    'commitlint',
+    'config.commitizen',
+    'config.eslint',
+    'config.lint',
+    'config.mocha',
+    'config.prettier',
     'eslintConfig',
+    'exports',
     'files',
     'husky',
+    'husky',
+    'lint-staged',
     'main',
     'module',
-    'renovate',
-    'prettier',
-    'commitlint',
-    'lint-staged',
     'nyc',
-    'husky',
-    'config.mocha',
+    'prettier',
+    'renovate',
+    'scripts.build:cjs',
+    'scripts.build:js',
+    'scripts.build:mjs',
+    'scripts.build:types',
+    'scripts.build',
+    'scripts.clean',
+    'scripts.codecov',
+    'scripts.coverage',
+    'scripts.commitmsg',
+    'scripts.flow:coverage',
+    'scripts.flow:watch',
+    'scripts.flow',
+    'scripts.lint:fix',
+    'scripts.lint:watch',
+    'scripts.lint',
+    'scripts.open:coverage',
+    'scripts.precommit',
+    'scripts.prepublishOnly',
+    'scripts.prepush',
+    'scripts.prettier:check',
+    'scripts.prettier',
+    'scripts.semantic-release',
+    'scripts.test:debug',
+    'scripts.test:watch',
+    'scripts.test',
+    'scripts.travis-deploy-once',
+    'scripts.tsc:wath',
+    'scripts.tsc',
   ]) {
     unset(packageJson, path)
   }
@@ -54,22 +66,26 @@ async function bootstrapProjectPackageJson() {
     delete devDependencies[dep]
   }
 
-  merge(packageJson, {
-    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',
-    },
-    config: {
-      commitizen: { path: `${name}/commitizen.cjs` },
+  merge(
+    packageJson,
+    {
+      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'),
+    pick(packageJson, 'engines')
+  )
+  if (isEmpty(packageJson.config)) delete packageJson.config
 
   for (const section in toolchainManaged) {
+    if (!section.endsWith('ependencies')) continue
     const managedSection = toolchainManaged[section]
     const pkgSectionName = section.replace(/^optionalD/, 'd')
     let pkgSection = packageJson[pkgSectionName]
@@ -82,10 +98,7 @@ async function bootstrapProjectPackageJson() {
       const versionRange = managedSection[dep]
       if (
         !pkgSection[dep] ||
-        semver.gt(
-          versionRange.replace(/^\D+/, ''),
-          pkgSection[dep].replace(/^\D+/, '')
-        )
+        !semver.satisfies(semver.minVersion(pkgSection[dep]), versionRange)
       ) {
         pkgSection[dep] = versionRange
       }

package/scripts/bootstrap/bootstrapRemoveDevDeps.cjs

@@ -89,6 +89,8 @@ module.exports = [
   'babel-types',
   'babylon',
   'codecov',
+  'commitizen',
+  'cz-conventional-changelog',
   'coveralls',
   'eslint-watch',
   'flow-copy-source',

package/scripts/bootstrap.cjs

@@ -5,7 +5,7 @@ const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
 
 async function bootstrap(args = []) {
   const execa = require('../util/execa.cjs')
-  const installGitHooks = require('./bootstrap/installGitHooks.cjs')
+  const installGitHooks = require('./install-git-hooks.cjs')
   const bootstrapProjectPackageJson = require('./bootstrap/bootstrapProjectPackageJson.cjs')
   const bootstrapEslintConfigs = require('./bootstrap/bootstrapEslintConfigs.cjs')
   const bootstrapConfigFiles = require('./bootstrap/bootstrapConfigFiles.cjs')
@@ -15,7 +15,7 @@ async function bootstrap(args = []) {
   const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
 
   await execa('git', ['init'])
-  await installGitHooks()
+  await installGitHooks.run()
   await bootstrapProjectPackageJson()
   if (await hasYarnOrNpmLockfile()) {
     await execa('pnpm', ['import'])

package/scripts/check.cjs

@@ -8,8 +8,9 @@ const fs = require('../util/projectFs.cjs')
 exports.run = async function check(args = []) {
   await require('../scripts/runPrettier.cjs').prettierCheck(args)
   await require('../scripts/runEslint.cjs').eslintCheck(args)
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
   if (devDependencies['flow-bin'] && (await fs.pathExists('.flowconfig'))) {
-    await execa('flow')
+    await execa('flow', isTest ? ['check'] : [])
   }
   if (devDependencies['typescript'] && (await fs.pathExists('tsconfig.json'))) {
     await execa('tsc', ['--noEmit'])

package/scripts/init.cjs

@@ -3,23 +3,29 @@
 const { packageJson } = require('../util/findUps.cjs')
 const preinstall = require('./preinstall.cjs')
 const execa = require('../util/execa.cjs')
+const hasTSFiles = require('../util/hasTSFiles.cjs')
 
 async function init(args = []) {
   const { dependencies = {}, devDependencies = {} } = packageJson
   const toolchains = []
   const isBabel =
     devDependencies['@babel/core'] != null ||
-    devDependencies['babel-core'] != null
-  const isTS = isBabel && devDependencies.typescript != null
+    devDependencies['babel-core'] != null ||
+    devDependencies['@jcoreio/toolchain-esnext'] != null
+  const isTS = await hasTSFiles()
   const isFlow = isBabel && devDependencies['flow-bin'] != null
   const isReact = dependencies.react != null || devDependencies.react != null
   const isMocha = devDependencies['mocha'] != null
+  const isCircle = true // might be false someday
+  const isSemanticRelease = devDependencies['semantic-release'] != null
 
   if (isMocha) toolchains.push('@jcoreio/toolchain-mocha')
   if (isBabel) toolchains.push('@jcoreio/toolchain-esnext')
   if (isFlow) toolchains.push('@jcoreio/toolchain-flow')
   if (isTS) toolchains.push('@jcoreio/toolchain-typescript')
   if (isReact) toolchains.push('@jcoreio/toolchain-react')
+  if (isCircle) toolchains.push('@jcoreio/toolchain-circle')
+  if (isSemanticRelease) toolchains.push('@jcoreio/toolchain-semantic-release')
 
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
 

package/scripts/{bootstrap/installGitHooks.cjs → install-git-hooks.cjs}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
-const execa = require('../../util/execa.cjs')
+const execa = require('../util/execa.cjs')
 const Path = require('path')
 const dedent = require('dedent-js')
-const { findGitDir } = require('../../util/findUps.cjs')
+const { findGitDir } = require('../util/findUps.cjs')
 const fs = require('fs-extra')
 
-const githooksDir = Path.resolve(__dirname, '..', '..', 'githooks')
+const githooksDir = Path.resolve(__dirname, '..', 'githooks')
 
 async function installGitHooks() {
   const gitDir = findGitDir()
@@ -15,7 +15,7 @@ async function installGitHooks() {
     console.warn(dedent`
       .git directory not found!
       git hooks could not be installed.
-      after you run \`git init\`, try \`pnpm exec install-git-hooks\`.
+      after you run \`git init\`, try \`pnpm tc install-git-hooks\`.
     `)
   } else {
     // chmod in case pnpm doesn't preserve mode of hooks scripts
@@ -34,4 +34,6 @@ async function installGitHooks() {
   }
 }
 
-module.exports = installGitHooks
+exports.description = 'install git hooks'
+
+exports.run = installGitHooks

package/scripts/prepublish.cjs

@@ -1,10 +1,10 @@
 const check = require('./check.cjs')
-const coverage = require('./coverage.cjs')
 const build = require('./build.cjs')
+const scripts = require('./toolchain.cjs')
 
 exports.run = async function (args = []) {
   await check.run()
-  await coverage.run()
+  if (scripts.coverage) await scripts.coverage.run()
   await build.run()
 }
 

package/scripts/toolchain.cjs

@@ -2,13 +2,13 @@
 
 const { name, version } = require('../package.json')
 const chalk = require('chalk')
+const getPluginsObjectSync = require('../util/getPluginsObjectSync.cjs')
 
 const scripts = {
   bootstrap: require('./bootstrap.cjs'),
   build: require('./build.cjs'),
   check: require('./check.cjs'),
   clean: require('./clean.cjs'),
-  coverage: require('./coverage.cjs'),
   format: require('./format.cjs'),
   init: require('./init.cjs'),
   preinstall: require('./preinstall.cjs'),
@@ -16,7 +16,6 @@ const scripts = {
   'lint:fix': require('./lint-fix.cjs'),
   'open:coverage': require('./open-coverage.cjs'),
   prepublish: require('./prepublish.cjs'),
-  test: require('./test.cjs'),
   version: {
     description: `print version of ${name}`,
     run: () => {
@@ -24,6 +23,8 @@ const scripts = {
       console.log(`${name}@${version}`)
     },
   },
+  'install-git-hooks': require('./install-git-hooks.cjs'),
+  ...getPluginsObjectSync('scripts'),
 }
 
 exports.scripts = scripts

package/util/findUps.cjs

@@ -1,6 +1,7 @@
 const findUp = require('find-up')
 const Path = require('path')
 const fs = require('fs-extra')
+const merge = require('lodash/merge')
 const once = require('./once.cjs')
 const { name } = require('../package.json')
 const configSchema = require('./configSchema.cjs')
@@ -25,12 +26,19 @@ if (!packageJsonFile) {
 }
 exports.packageJsonFile = packageJsonFile
 const packageJson = (exports.packageJson = fs.readJsonSync(packageJsonFile))
-exports.projectDir = Path.dirname(packageJsonFile)
+const projectDir = (exports.projectDir = Path.dirname(packageJsonFile))
 
-exports.toolchainPackages = [
+const toolchainPackages = (exports.toolchainPackages = [
   ...Object.keys(packageJson.dependencies || {}),
   ...Object.keys(packageJson.devDependencies || {}),
-].filter((dep) => dep.startsWith(name))
+].filter((dep) => dep.startsWith(name)))
+
+const toolchainPackageJsons = (exports.toolchainPackageJsons = {})
+for (const pkg of toolchainPackages) {
+  toolchainPackageJsons[pkg] = require(require.resolve(`${pkg}/package.json`, {
+    paths: [projectDir],
+  }))
+}
 
 let toolchainConfigFile
 try {
@@ -59,3 +67,29 @@ try {
 }
 
 exports.toolchainConfig = toolchainConfig
+
+const toolchainManaged = (exports.toolchainManaged = {})
+for (const toolchainPkgJson of Object.values(toolchainPackageJsons)) {
+  const toolchainPkgDeps = toolchainPkgJson.dependencies || {}
+  const toolchainPkgDevDeps = toolchainPkgJson.devDependencies || {}
+  if (toolchainPkgJson.toolchainManaged) {
+    for (const section in toolchainPkgJson.toolchainManaged) {
+      if (!toolchainManaged[section]) toolchainManaged[section] = {}
+      const sectionCfg = toolchainPkgJson.toolchainManaged[section]
+      if (section.endsWith('ependencies')) {
+        for (const dep in sectionCfg) {
+          let version = sectionCfg[dep]
+          if (version === '*')
+            version = toolchainPkgDevDeps[dep] || toolchainPkgDeps[dep]
+          if (version !== '*') toolchainManaged[section][dep] = version
+        }
+        continue
+      }
+      if (sectionCfg && typeof sectionCfg === 'object') {
+        toolchainManaged[section] = merge(toolchainManaged[section], sectionCfg)
+        continue
+      }
+      toolchainManaged[section] = sectionCfg
+    }
+  }
+}

package/util/getPluginsObjectAsync.cjs

@@ -0,0 +1,15 @@
+const getPlugins = require('./getPlugins.cjs')
+
+async function getPluginsObjectAsync(name, ...args) {
+  const plugins = getPlugins(name)
+  const result = {}
+  for (const plugin of plugins) {
+    Object.assign(
+      result,
+      typeof plugin === 'function' ? await plugin(...args) : plugin
+    )
+  }
+  return result
+}
+
+module.exports = getPluginsObjectAsync

package/util/getPluginsObjectSync.cjs

@@ -0,0 +1,15 @@
+const getPlugins = require('./getPlugins.cjs')
+
+function getPluginsObjectSync(name, ...args) {
+  const plugins = getPlugins(name)
+  const result = {}
+  for (const plugin of plugins) {
+    Object.assign(
+      result,
+      typeof plugin === 'function' ? plugin(...args) : plugin
+    )
+  }
+  return result
+}
+
+module.exports = getPluginsObjectSync

package/util/hasFlowFiles.cjs

@@ -0,0 +1,7 @@
+const fs = require('./projectFs.cjs')
+const once = require('./once.cjs')
+
+module.exports = once(async function hasFlowFiles() {
+  const files = await fs.readdir('src')
+  return files.some((f) => /\.flow$/.test(f))
+})

package/util/hasTSFiles.cjs

@@ -0,0 +1,7 @@
+const fs = require('./projectFs.cjs')
+const once = require('./once.cjs')
+
+module.exports = once(async function hasTSFiles() {
+  const files = await fs.readdir('src')
+  return files.some((f) => /\.[cm]?tsx?$/.test(f))
+})

package/util/hasTSSourcesSync.cjs

@@ -3,5 +3,5 @@ const once = require('./once.cjs')
 
 module.exports = once(function hasTSSourcesSync() {
   const files = fs.readdirSync('src')
-  return files.find((f) => /\.tsx?$/.test(f) && !/\.d\.tsx?$/.test(f)) != null
+  return files.some((f) => /\.[cm]?tsx?$/.test(f) && !/\.d\.[cm]?tsx?$/.test(f))
 })

package/release.config.cjs

@@ -1,16 +0,0 @@
-const { projectDir } = require('./util/findUps.cjs')
-const path = require('path')
-
-module.exports = {
-  plugins: [
-    require.resolve('@semantic-release/commit-analyzer'),
-    require.resolve('@semantic-release/release-notes-generator'),
-    [
-      require.resolve('@semantic-release/npm'),
-      {
-        pkgRoot: path.join(projectDir, 'dist'),
-      },
-    ],
-    require.resolve('@semantic-release/github'),
-  ],
-}

package/scripts/coverage.cjs

@@ -1,12 +0,0 @@
-const getPlugins = require('../util/getPlugins.cjs')
-const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
-
-exports.run = async function (args = []) {
-  if (!getPlugins('coverage').length) {
-    throw new Error(
-      'missing test toolchain, install @jcoreio/toolchain-mocha (there may be alternatives in the future)'
-    )
-  }
-  await getPluginsAsyncFunction('coverage')(args)
-}
-exports.description = 'run tests with code coverage'

package/scripts/test.cjs

@@ -1,12 +0,0 @@
-const getPlugins = require('../util/getPlugins.cjs')
-const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
-
-exports.run = async function (args = []) {
-  if (!getPlugins('test').length) {
-    throw new Error(
-      'missing test toolchain, install @jcoreio/toolchain-mocha (there may be alternatives in the future)'
-    )
-  }
-  await getPluginsAsyncFunction('test')(args)
-}
-exports.description = 'run tests'

package/util/getPluginsObject.cjs

@@ -1,12 +0,0 @@
-const getPlugins = require('./getPlugins.cjs')
-
-async function getPluginsObject(name, ...args) {
-  const plugins = getPlugins(name)
-  const result = {}
-  for (const plugin of plugins) {
-    Object.assign(result, await plugin(...args))
-  }
-  return result
-}
-
-module.exports = getPluginsObject