@jcoreio/toolchain 3.6.2 → 3.7.0

package/package.json

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

package/plugins/getConfigFiles.cjs

@@ -2,6 +2,7 @@ const { name } = require('../package.json')
 const dedent = require('dedent-js')
 const fs = require('../util/projectFs.cjs')
 const JSON5 = require('json5')
+const getPluginsArraySync = require('../util/getPluginsArraySync.cjs')
 
 async function getRootEslintConfig() {
   if (await fs.pathExists('.eslintrc.json')) {
@@ -30,6 +31,21 @@ module.exports = [
       }
         }
       `,
+      'toolchain.config.cjs': async (existing) => {
+        if (existing) return existing
+        return dedent`
+          /* eslint-env node, es2018 */
+          module.exports = {
+            // scripts: {
+            //   pretest: 'docker compose up -d',
+            //   jsExample: {
+            //     description: 'example of running a JS script',
+            //     run: async (args = []) => console.log('TEST', ...args),
+            //   },
+            // }
+          }
+        `
+      },
     }
     for (const file of [
       'githooks.cjs',
@@ -45,6 +61,30 @@ module.exports = [
   
       `
     }
+    const tasks = await getPluginsArraySync('vscodeTasks')
+    const launch = await getPluginsArraySync('vscodeLaunch')
+
+    if (tasks) {
+      files['.vscode/tasks.json'] = JSON.stringify(
+        {
+          version: '2.0.0',
+          tasks,
+        },
+        null,
+        2
+      )
+    }
+    if (launch) {
+      files['.vscode/launch.json'] = JSON.stringify(
+        {
+          version: '0.2.0',
+          configurations: launch,
+        },
+        null,
+        2
+      )
+    }
+
     return files
   },
 ]

package/scripts/check.cjs

@@ -8,7 +8,7 @@ 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)
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
   if (devDependencies['flow-bin'] && (await fs.pathExists('.flowconfig'))) {
     await execa('flow', isTest ? ['check'] : [])
   }

package/scripts/init.cjs

@@ -54,8 +54,16 @@ async function init(args = []) {
       })),
     }))
   }
+  if (
+    ['flow', 'typescript', 'react'].some((value) =>
+      selectedToolchains.includes(`${name}-${value}`)
+    ) &&
+    !selectedToolchains.includes(`${name}-esnext`)
+  ) {
+    selectedToolchains.push(`${name}-esnext`)
+  }
 
-  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
 
   await execa('tc', ['preinstall'])
   await execa('pnpm', [

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -1,4 +1,5 @@
 const { toolchainManaged } = require('../../util/findUps.cjs')
+const { name } = require('../../package.json')
 const getPluginsAsyncFunction = require('../../util/getPluginsAsyncFunction.cjs')
 const fs = require('../../util/projectFs.cjs')
 const sortDeps = require('../../util/sortDeps.cjs')
@@ -6,7 +7,6 @@ const semver = require('semver')
 const isEmpty = require('lodash/isEmpty')
 const pick = require('lodash/pick')
 const Path = require('path')
-const { toolchainConfig } = require('../../util/findUps.cjs')
 const confirmOutputEsm = require('./confirmOutputEsm.cjs')
 const confirm = require('../../util/confirm.cjs')
 
@@ -107,9 +107,7 @@ async function migrateProjectPackageJson() {
         ? {
             './*': {
               types: './*.d.ts',
-              ...(toolchainConfig.outputEsm !== false
-                ? { import: './*.mjs' }
-                : {}),
+              ...(outputEsm !== false ? { import: './*.mjs' } : {}),
               default: './*.js',
             },
           }
@@ -135,6 +133,8 @@ async function migrateProjectPackageJson() {
   )
   if (isEmpty(packageJson.config)) delete packageJson.config
 
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
+
   for (const section in toolchainManaged) {
     if (!section.endsWith('ependencies')) continue
     const managedSection = toolchainManaged[section]
@@ -147,7 +147,9 @@ async function migrateProjectPackageJson() {
     for (const dep in managedSection) {
       if (/^optional/.test(section) && !pkgSection[dep]) continue
       const versionRange = managedSection[dep]
-      if (
+      if (isTest && dep.startsWith(`${name}-`)) {
+        pkgSection[dep] = `link:${dep.replace(`${name}-`, '../packages/')}`
+      } else if (
         !pkgSection[dep] ||
         !semver.satisfies(semver.minVersion(pkgSection[dep]), versionRange)
       ) {

package/scripts/prepublish.cjs

@@ -4,6 +4,7 @@ exports.run = async function (args = []) {
   const { scripts } = require('./toolchain.cjs')
   await execa('tc', ['check'])
   if (scripts.coverage) await execa('tc', ['coverage'])
+  if (scripts['test:esm']) await execa('tc', ['test:esm'])
   await execa('tc', ['build'])
 }
 

package/scripts/upgrade.cjs

@@ -9,7 +9,7 @@ async function upgrade([version] = []) {
   const toolchains = Object.keys(devDependencies).filter((pkg) =>
     pkg.startsWith(`${name}-`)
   )
-  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
+  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
 
   if (!isTest && !version) {
     version = (

package/util/isInteractive.cjs

@@ -1,5 +1,5 @@
 module.exports =
-  !process.env.JCOREIO_TOOLCHAIN_TEST &&
+  !process.env.JCOREIO_TOOLCHAIN_SELF_TEST &&
   process.stdout.isTTY &&
   process.env.TERM !== 'dumb' &&
   !('CI' in process.env)