@jcoreio/toolchain 1.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",

package/scripts/init.cjs

@@ -1,13 +1,18 @@
 #!/usr/bin/env node
 
 const { packageJson } = require('../util/findUps.cjs')
+const fs = require('../util/projectFs.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 { version, dependencies = {}, devDependencies = {} } = packageJson
+  const toolchains = new Set(
+    Object.keys(devDependencies).filter((dep) =>
+      dep.startsWith('@jcoreio/toolchain-')
+    )
+  )
   const isBabel =
     devDependencies['@babel/core'] != null ||
     devDependencies['babel-core'] != null ||
@@ -17,15 +22,17 @@ async function init(args = []) {
   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
+  const isSemanticRelease =
+    devDependencies['semantic-release'] != null ||
+    (await fs.pathExists('release.config.cjs'))
 
-  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')
+  if (isMocha) toolchains.add('@jcoreio/toolchain-mocha')
+  if (isBabel) toolchains.add('@jcoreio/toolchain-esnext')
+  if (isFlow) toolchains.add('@jcoreio/toolchain-flow')
+  if (isTS) toolchains.add('@jcoreio/toolchain-typescript')
+  if (isReact) toolchains.add('@jcoreio/toolchain-react')
+  if (isCircle) toolchains.add('@jcoreio/toolchain-circle')
+  if (isSemanticRelease) toolchains.add('@jcoreio/toolchain-semantic-release')
 
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
 
@@ -33,20 +40,17 @@ async function init(args = []) {
   await execa('pnpm', [
     'add',
     '-D',
-    isTest ? '../packages/base' : '@jcoreio/toolchain',
+    isTest ? '../packages/base' : `@jcoreio/toolchain@^${version}`,
     ...(isTest
-      ? toolchains.map((t) => t.replace(/@jcoreio\/toolchain-/, '../packages/'))
-      : toolchains),
+      ? [...toolchains].map((t) =>
+          t.replace(/@jcoreio\/toolchain-/, '../packages/')
+        )
+      : [...toolchains].map((t) => `${t}@^${version}`)),
   ])
-  await execa('tc', ['bootstrap'])
-  await execa('pnpm', ['i', '--no-frozen-lockfile'])
-  await execa('tc', ['format'])
-  await execa('tc', ['lint:fix'])
-  await execa('tc', ['prepublish'])
+  await execa('tc', ['migrate'])
 }
 
-exports.description =
-  'install toolchains, bootstrap, format, lint:fix and prepublish'
+exports.description = 'install toolchains and migrate'
 exports.run = init
 
 if (require.main === module) {

package/scripts/{bootstrap/bootstrapConfigFiles.cjs → migrate/migrateConfigFiles.cjs}

@@ -3,7 +3,7 @@ const path = require('path')
 const getPluginsObjectAsync = require('../../util/getPluginsObjectAsync.cjs')
 const { name } = require('../../package.json')
 
-async function bootstrapConfigFiles() {
+async function migrateConfigFiles() {
   const files = await getPluginsObjectAsync('getConfigFiles')
   for (const file in files) {
     const value = files[file]
@@ -30,4 +30,4 @@ async function bootstrapConfigFiles() {
   }
 }
 
-module.exports = bootstrapConfigFiles
+module.exports = migrateConfigFiles

package/scripts/{bootstrap/bootstrapEslintConfigs.cjs → migrate/migrateEslintConfigs.cjs}

@@ -3,7 +3,7 @@ const Path = require('path')
 const JSON5 = require('json5')
 const fs = require('../../util/projectFs.cjs')
 
-async function bootstrapEslintConfigs() {
+async function migrateEslintConfigs() {
   for (const file of await glob(Path.join('**', '.eslintrc{,.json}'))) {
     const content = JSON5.parse(await fs.readFile(file, 'utf8'))
     if (content.extends) {
@@ -27,4 +27,4 @@ async function bootstrapEslintConfigs() {
   }
 }
 
-module.exports = bootstrapEslintConfigs
+module.exports = migrateEslintConfigs

package/scripts/{bootstrap/bootstrapGitignore.cjs → migrate/migrateGitignore.cjs}

@@ -1,7 +1,7 @@
 const execa = require('../../util/execa.cjs')
 const fs = require('../../util/projectFs.cjs')
 
-async function bootstrapGitignore() {
+async function migrateGitignore() {
   const paths = {
     '/dist': 'dist',
     '.nyc_output': '.nyc_output',
@@ -34,4 +34,4 @@ async function bootstrapGitignore() {
     console.error('updated .gitignore')
   }
 }
-module.exports = bootstrapGitignore
+module.exports = migrateGitignore

package/scripts/{bootstrap/bootstrapMoveTypeDefs.cjs → migrate/migrateMoveTypeDefs.cjs}

@@ -2,7 +2,7 @@ const glob = require('@jcoreio/toolchain/util/glob.cjs')
 const fs = require('@jcoreio/toolchain/util/projectFs.cjs')
 const path = require('path')
 
-async function bootstrapMoveTypeDefs() {
+async function migrateMoveTypeDefs() {
   for (const src of await glob('*.{d.ts,js.flow}')) {
     const dest = path.join('src', src)
     await fs.move(src, dest)
@@ -11,4 +11,4 @@ async function bootstrapMoveTypeDefs() {
   }
 }
 
-module.exports = bootstrapMoveTypeDefs
+module.exports = migrateMoveTypeDefs

package/scripts/{bootstrap/bootstrapProjectPackageJson.cjs → migrate/migrateProjectPackageJson.cjs}

@@ -6,14 +6,14 @@ const semver = require('semver')
 const isEmpty = require('lodash/isEmpty')
 const pick = require('lodash/pick')
 
-async function bootstrapProjectPackageJson() {
+async function migrateProjectPackageJson() {
   const { merge, unset } = require('lodash')
 
   const packageJson = await fs.readJson('package.json')
   const devDependencies =
     packageJson.devDependencies || (packageJson.devDependencies = {})
 
-  await getPluginsAsyncFunction('bootstrapProjectPackageJson')(packageJson)
+  await getPluginsAsyncFunction('migrateProjectPackageJson')(packageJson)
 
   for (const path of [
     'commitlint',
@@ -64,7 +64,7 @@ async function bootstrapProjectPackageJson() {
   ]) {
     unset(packageJson, path)
   }
-  for (const dep of require('./bootstrapRemoveDevDeps.cjs')) {
+  for (const dep of require('./migrateRemoveDevDeps.cjs')) {
     delete devDependencies[dep]
   }
 
@@ -114,4 +114,4 @@ async function bootstrapProjectPackageJson() {
   console.error('updated package.json')
 }
 
-module.exports = bootstrapProjectPackageJson
+module.exports = migrateProjectPackageJson

package/scripts/migrate.cjs

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+
+const fs = require('../util/projectFs.cjs')
+const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
+
+async function migrate(args = []) {
+  const execa = require('../util/execa.cjs')
+  const installGitHooks = require('./install-git-hooks.cjs')
+  const migrateProjectPackageJson = require('./migrate/migrateProjectPackageJson.cjs')
+  const migrateEslintConfigs = require('./migrate/migrateEslintConfigs.cjs')
+  const migrateConfigFiles = require('./migrate/migrateConfigFiles.cjs')
+  const migrateMoveTypeDefs = require('./migrate/migrateMoveTypeDefs.cjs')
+  const migrateGitignore = require('./migrate/migrateGitignore.cjs')
+  const migrateRemoveFiles = require('./migrate/migrateRemoveFiles.cjs')
+  const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
+
+  await execa('git', ['init'])
+  await installGitHooks.run()
+  await migrateProjectPackageJson()
+  if (await hasYarnOrNpmLockfile()) {
+    await execa('pnpm', ['import'])
+  }
+  await Promise.all(
+    migrateRemoveFiles.map(async (file) => {
+      const exists = await fs.pathExists(file)
+      if (exists) {
+        await fs.remove(file)
+        // eslint-disable-next-line no-console
+        console.error('removed', file)
+      }
+    })
+  )
+  await migrateConfigFiles()
+  await migrateEslintConfigs()
+  await migrateMoveTypeDefs()
+  await migrateGitignore()
+  await getPluginsAsyncFunction('migrate')(args)
+
+  if (!args.includes('--config-only')) {
+    await execa('pnpm', ['i', '--no-frozen-lockfile'])
+    await execa('tc', ['lint:fix'])
+    await execa('tc', ['format'])
+  }
+}
+
+exports.description =
+  'update dependencies and config, fix lint errors and format'
+exports.run = migrate
+
+if (require.main === module) {
+  migrate().then(
+    () => process.exit(0),
+    (error) => {
+      // eslint-disable-next-line no-console
+      console.error(error.stack)
+      process.exit(error.exitCode != null ? error.exitCode : 1)
+    }
+  )
+}

package/scripts/toolchain.cjs

@@ -5,7 +5,7 @@ const chalk = require('chalk')
 const getPluginsObjectSync = require('../util/getPluginsObjectSync.cjs')
 
 const scripts = {
-  bootstrap: require('./bootstrap.cjs'),
+  migrate: require('./migrate.cjs'),
   build: require('./build.cjs'),
   check: require('./check.cjs'),
   clean: require('./clean.cjs'),
@@ -16,6 +16,7 @@ const scripts = {
   'lint:fix': require('./lint-fix.cjs'),
   'open:coverage': require('./open-coverage.cjs'),
   prepublish: require('./prepublish.cjs'),
+  upgrade: require('./upgrade.cjs'),
   version: {
     description: `print version of ${name}`,
     run: () => {

package/scripts/upgrade.cjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+
+const { packageJson } = require('../util/findUps.cjs')
+const execa = require('../util/execa.cjs')
+
+async function upgrade([version] = []) {
+  const { devDependencies = {} } = packageJson
+  const toolchains = Object.keys(devDependencies).filter((pkg) =>
+    pkg.startsWith('@jcoreio/toolchain-')
+  )
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
+
+  if (!isTest && !version) {
+    version = (
+      await execa('npm', ['view', '@jcoreio/toolchain', 'version'], {
+        stdio: 'pipe',
+      })
+    ).stdout.trim()
+  }
+
+  await execa('pnpm', [
+    'add',
+    '-D',
+    isTest ? '../packages/base' : `@jcoreio/toolchain@^${version}`,
+    ...(isTest
+      ? toolchains.map((t) => t.replace(/@jcoreio\/toolchain-/, '../packages/'))
+      : toolchains.map((t) => `${t}@^${version}`)),
+  ])
+  await execa('tc', ['migrate'])
+}
+
+exports.description = 'upgrade toolchains and migrate'
+exports.run = upgrade
+
+if (require.main === module) {
+  upgrade().then(
+    () => process.exit(0),
+    (error) => {
+      // eslint-disable-next-line no-console
+      console.error(error.stack)
+      process.exit(error.exitCode != null ? error.exitCode : 1)
+    }
+  )
+}

package/scripts/bootstrap.cjs

@@ -1,52 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('../util/projectFs.cjs')
-const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
-
-async function bootstrap(args = []) {
-  const execa = require('../util/execa.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')
-  const bootstrapMoveTypeDefs = require('./bootstrap/bootstrapMoveTypeDefs.cjs')
-  const bootstrapGitignore = require('./bootstrap/bootstrapGitignore.cjs')
-  const bootstrapRemoveFiles = require('./bootstrap/bootstrapRemoveFiles.cjs')
-  const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
-
-  await execa('git', ['init'])
-  await installGitHooks.run()
-  await bootstrapProjectPackageJson()
-  if (await hasYarnOrNpmLockfile()) {
-    await execa('pnpm', ['import'])
-  }
-  await Promise.all(
-    bootstrapRemoveFiles.map(async (file) => {
-      const exists = await fs.pathExists(file)
-      if (exists) {
-        await fs.remove(file)
-        // eslint-disable-next-line no-console
-        console.error('removed', file)
-      }
-    })
-  )
-  await bootstrapConfigFiles()
-  await bootstrapEslintConfigs()
-  await bootstrapMoveTypeDefs()
-  await bootstrapGitignore()
-  await getPluginsAsyncFunction('bootstrap')(args)
-}
-
-exports.description = 'set up project'
-exports.run = bootstrap
-
-if (require.main === module) {
-  bootstrap().then(
-    () => process.exit(0),
-    (error) => {
-      // eslint-disable-next-line no-console
-      console.error(error.stack)
-      process.exit(error.exitCode != null ? error.exitCode : 1)
-    }
-  )
-}