@jcoreio/toolchain 2.0.1 → 2.0.2

package/package.json

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

package/scripts/init.cjs

@@ -5,18 +5,17 @@ const fs = require('../util/projectFs.cjs')
 const preinstall = require('./preinstall.cjs')
 const execa = require('../util/execa.cjs')
 const hasTSFiles = require('../util/hasTSFiles.cjs')
+const { name, version } = require('../package.json')
 
 async function init(args = []) {
-  const { version, dependencies = {}, devDependencies = {} } = packageJson
+  const { dependencies = {}, devDependencies = {} } = packageJson
   const toolchains = new Set(
-    Object.keys(devDependencies).filter((dep) =>
-      dep.startsWith('@jcoreio/toolchain-')
-    )
+    Object.keys(devDependencies).filter((dep) => dep.startsWith(`${name}-`))
   )
   const isBabel =
     devDependencies['@babel/core'] != null ||
     devDependencies['babel-core'] != null ||
-    devDependencies['@jcoreio/toolchain-esnext'] != null
+    devDependencies[`${name}-esnext`] != null
   const isTS = await hasTSFiles()
   const isFlow = isBabel && devDependencies['flow-bin'] != null
   const isReact = dependencies.react != null || devDependencies.react != null
@@ -26,13 +25,13 @@ async function init(args = []) {
     devDependencies['semantic-release'] != null ||
     (await fs.pathExists('release.config.cjs'))
 
-  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')
+  if (isMocha) toolchains.add(`${name}-mocha`)
+  if (isBabel) toolchains.add(`${name}-esnext`)
+  if (isFlow) toolchains.add(`${name}-flow`)
+  if (isTS) toolchains.add(`${name}-typescript`)
+  if (isReact) toolchains.add(`${name}-react`)
+  if (isCircle) toolchains.add(`${name}-circle`)
+  if (isSemanticRelease) toolchains.add(`${name}-semantic-release`)
 
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
 
@@ -40,11 +39,9 @@ async function init(args = []) {
   await execa('pnpm', [
     'add',
     '-D',
-    isTest ? '../packages/base' : `@jcoreio/toolchain@^${version}`,
+    isTest ? '../packages/base' : `${name}@^${version}`,
     ...(isTest
-      ? [...toolchains].map((t) =>
-          t.replace(/@jcoreio\/toolchain-/, '../packages/')
-        )
+      ? [...toolchains].map((t) => t.replace(`${name}-`, '../packages/'))
       : [...toolchains].map((t) => `${t}@^${version}`)),
   ])
   await execa('tc', ['migrate'])

package/scripts/upgrade.cjs

@@ -2,17 +2,18 @@
 
 const { packageJson } = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
+const { name } = require('../package.json')
 
 async function upgrade([version] = []) {
   const { devDependencies = {} } = packageJson
   const toolchains = Object.keys(devDependencies).filter((pkg) =>
-    pkg.startsWith('@jcoreio/toolchain-')
+    pkg.startsWith(`${name}-`)
   )
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
 
   if (!isTest && !version) {
     version = (
-      await execa('npm', ['view', '@jcoreio/toolchain', 'version'], {
+      await execa('npm', ['view', name, 'version'], {
         stdio: 'pipe',
       })
     ).stdout.trim()
@@ -21,9 +22,9 @@ async function upgrade([version] = []) {
   await execa('pnpm', [
     'add',
     '-D',
-    isTest ? '../packages/base' : `@jcoreio/toolchain@^${version}`,
+    isTest ? '../packages/base' : `${name}@^${version}`,
     ...(isTest
-      ? toolchains.map((t) => t.replace(/@jcoreio\/toolchain-/, '../packages/'))
+      ? toolchains.map((t) => t.replace(`${name}-`, '../packages/'))
       : toolchains.map((t) => `${t}@^${version}`)),
   ])
   await execa('tc', ['migrate'])