@jcoreio/toolchain 1.0.0-beta.4 → 1.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -36,11 +36,14 @@
     "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",

package/scripts/bootstrap/bootstrapConfigFiles.cjs

@@ -1,5 +1,6 @@
 const fs = require('../../util/projectFs.cjs')
 const getPluginsObject = require('../../util/getPluginsObject.cjs')
+const { name } = require('../../package.json')
 
 async function bootstrapConfigFiles() {
   const files = await getPluginsObject('getConfigFiles')
@@ -7,7 +8,12 @@ async function bootstrapConfigFiles() {
     const value = files[file]
     const content = typeof value === 'string' ? value : value.content
     const overwrite = typeof value === 'string' ? false : value.overwrite
-    if (overwrite || !(await fs.pathExists(file))) {
+    if (
+      overwrite === true ||
+      !(await fs.pathExists(file)) ||
+      (content.includes(name) &&
+        !(await fs.readFile(file, 'utf8')).includes(name))
+    ) {
       await fs.writeFile(file, content, 'utf8')
       // eslint-disable-next-line no-console
       console.error(`wrote ${file}`)

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/scripts/bootstrap/bootstrapRemoveFiles.cjs

@@ -1,24 +1,26 @@
 module.exports = [
-  '.babelrc.cjs',
   '.babelrc.js',
   '.babelrc.json',
   '.babelrc.mjs',
   '.babelrc',
+  'babel.config.cjs',
+  'babel.config.js',
+  'babel.config.json',
+  'babel.config.mjs',
   '.commitlintrc.js',
   '.commitlintrc.json',
   '.commitlintrc.yml',
+  'commitlint.config.js',
   '.eslintignore',
-  '.github/renovate.json',
-  '.github/renovate.json5',
   '.gitignore',
-  '.gitlab/renovate.json',
-  '.gitlab/renovate.json5',
   '.lintstagedrc',
+  'lint-staged.config.js',
   '.npmignore',
   '.nycrc.json',
   '.nycrc.yaml',
   '.nycrc.yml',
   '.nycrc',
+  'nyc.config.js',
   '.prettierrc.cjs',
   '.prettierrc.js',
   '.prettierrc.json',
@@ -27,24 +29,17 @@ module.exports = [
   '.prettierrc.yaml',
   '.prettierrc.yml',
   '.prettierrc',
+  'prettier.config.js',
+  'package-lock.json',
+  '.github/renovate.json',
+  '.github/renovate.json5',
+  '.gitlab/renovate.json',
+  '.gitlab/renovate.json5',
   '.renovaterc.json',
   '.renovaterc',
-  '.travis.yml',
-  'babel.config.cjs',
-  'babel.config.js',
-  'babel.config.json',
-  'babel.config.mjs',
-  'commitlint.config.cjs',
-  'commitlint.config.js',
-  'lint-staged.config.cjs',
-  'lint-staged.config.js',
-  'nyc.config.cjs',
-  'nyc.config.js',
-  'package-lock.json',
-  'prettier.config.cjs',
-  'prettier.config.js',
   'renovate.json',
   'renovate.json5',
   'solano.yml',
+  '.travis.yml',
   'yarn.lock',
 ]

package/scripts/preinstall/preinstallRemoveFiles.cjs

@@ -2,7 +2,6 @@ module.exports = [
   '.babelrc',
   '.babelrc.json',
   '.babelrc.js',
-  '.babelrc.cjs',
   '.babelrc.mjs',
   'babel.config.json',
   'babel.config.js',
@@ -17,25 +16,21 @@ module.exports = [
   '.prettierrc.js',
   '.prettierrc.cjs',
   'prettier.config.js',
-  'prettier.config.cjs',
   'package-lock.json',
   '.npmignore',
   '.gitignore',
   '.eslintignore',
   'commitlint.config.js',
-  'commitlint.config.cjs',
   '.commitlintrc.js',
   '.commitlintrc.json',
   '.commitlintrc.yml',
   '.lintstagedrc',
   'lint-staged.config.js',
-  'lint-staged.config.cjs',
   '.nycrc',
   '.nycrc.json',
   '.nycrc.yaml',
   '.nycrc.yml',
   'nyc.config.js',
-  'nyc.config.cjs',
   '.github/renovate.json',
   '.github/renovate.json5',
   '.gitlab/renovate.json',