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

package/githooks.cjs

@@ -1,5 +1,3 @@
 module.exports = {
-  'prepare-commit-msg': `grep -qE '^[^#]' .git/COMMIT_EDITMSG || (exec < /dev/tty && cz --hook || true)`,
   'pre-commit': 'lint-staged',
-  'commit-msg': `commitlint -e`,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -14,15 +14,11 @@
   },
   "homepage": "https://github.com/jcoreio/toolchains/tree/beta/packages/base",
   "dependencies": {
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
     "@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",
-    "commitizen": "^4.2.4",
-    "cz-conventional-changelog": "^3.3.0",
     "dedent-js": "^1.0.1",
     "eslint": "^8.5.0",
     "eslint-config-prettier": "^8.3.0",
@@ -36,15 +32,16 @@
     "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"
   },
-  "peerDependencies": {
-    "eslint": "^8.0.0"
+  "toolchainManaged": {
+    "devDependencies": {
+      "eslint": "*"
+    }
   },
   "bin": {
-    "commitizen": "./bin/commitizen",
-    "commitlint": "./bin/commitlint",
     "cz": "./bin/cz",
     "eslint": "./bin/eslint",
     "git-cz": "./bin/git-cz",

package/plugins/getConfigFiles.cjs

@@ -38,7 +38,6 @@ module.exports = [
       `,
     }
     for (const file of [
-      'commitlint.config.cjs',
       'githooks.cjs',
       'lint-staged.config.cjs',
       'prettier.config.cjs',

package/scripts/bootstrap/bootstrapProjectPackageJson.cjs

@@ -1,8 +1,9 @@
-const { name, peerDependencies: basePeerDeps } = require('../../package.json')
+const { name } = require('../../package.json')
 const { projectDir, toolchainPackages } = 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')
 
 async function bootstrapProjectPackageJson() {
   const { merge, unset } = require('lodash')
@@ -11,13 +12,25 @@ async function bootstrapProjectPackageJson() {
   const devDependencies =
     packageJson.devDependencies || (packageJson.devDependencies = {})
 
-  const peerDependencies = { ...basePeerDeps }
+  const toolchainManaged = {}
   for (const pkg of toolchainPackages) {
-    Object.assign(
-      peerDependencies,
-      require(require.resolve(`${pkg}/package.json`, { paths: [projectDir] }))
-        .peerDependencies
-    )
+    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 [
@@ -56,11 +69,26 @@ async function bootstrapProjectPackageJson() {
     },
   })
 
-  if (peerDependencies) {
-    for (const dep in peerDependencies) {
-      const version = peerDependencies[dep]
-      if (version.startsWith('workspace') || version === '*') continue
-      packageJson.devDependencies[dep] = version
+  for (const section in toolchainManaged) {
+    const managedSection = toolchainManaged[section]
+    const pkgSectionName = section.replace(/^optionalD/, 'd')
+    let pkgSection = packageJson[pkgSectionName]
+    if (!pkgSection) {
+      if (/^optional/.test(section)) continue
+      pkgSection = packageJson[pkgSectionName] = {}
+    }
+    for (const dep in managedSection) {
+      if (/^optional/.test(section) && !pkgSection[dep]) continue
+      const versionRange = managedSection[dep]
+      if (
+        !pkgSection[dep] ||
+        semver.gt(
+          versionRange.replace(/^\D+/, ''),
+          pkgSection[dep].replace(/^\D+/, '')
+        )
+      ) {
+        pkgSection[dep] = versionRange
+      }
     }
   }
 

package/scripts/bootstrap/bootstrapRemoveDevDeps.cjs

@@ -90,18 +90,14 @@ module.exports = [
   'babylon',
   'codecov',
   'coveralls',
-  'eslint-plugin-flowtype',
-  'eslint-plugin-prettier',
-  'eslint-plugin-react',
   'eslint-watch',
-  'eslint',
   'flow-copy-source',
   'flow-watch',
   'husky',
   'isparta',
   'istanbul',
+  'jsdom-global',
   'lint-staged',
-  'mocha',
   'nyc',
   'prettier-eslint',
   'prettier',

package/bin/commitizen

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" commitizen) "$@"

package/bin/commitlint

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" @commitlint/cli commitlint) "$@"

package/bin/cz

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" commitizen cz) "$@"

package/bin/git-cz

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-exec $(node "$basedir/resolveBin.cjs" commitizen git-cz) "$@"

package/commitizen.cjs

@@ -1 +0,0 @@
-module.exports = require('cz-conventional-changelog')

package/commitlint.config.cjs

@@ -1,11 +0,0 @@
-module.exports = {
-  extends: [require.resolve('@commitlint/config-conventional')],
-  rules: {
-    'scope-case': [0, 'always', ['lowerCase']],
-    'subject-case': [
-      0,
-      'never',
-      ['upper-case', 'camel-case', 'pascal-case', 'snake-case'],
-    ],
-  },
-}