@jcoreio/toolchain 5.3.5 → 5.4.0

package/package.json

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

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -69,6 +69,27 @@ async function migrateProjectPackageJson({ fromVersion }) {
       unset(packageJson, path)
     }
   }
+
+  const promptRemoveDevDeps = require('./migrateRemoveDevDeps.cjs')
+    .filter((dep) => devDependencies[dep])
+    .sort()
+  if (promptRemoveDevDeps.length) {
+    const selected =
+      require('../../util/isInteractive.cjs') ?
+        (
+          await require('../../util/prompt.cjs')({
+            name: 'selected',
+            type: 'multiselect',
+            message: 'Select dependencies to uninstall:',
+            choices: promptRemoveDevDeps,
+          })
+        ).selected
+      : promptRemoveDevDeps
+    for (const dep of selected) {
+      delete devDependencies[dep]
+    }
+  }
+
   if (
     !fromVersion &&
     !packageJson.main &&
@@ -89,10 +110,6 @@ async function migrateProjectPackageJson({ fromVersion }) {
       packageJson.types = 'dist/index.d.ts'
     }
 
-    for (const dep of require('./migrateRemoveDevDeps.cjs')) {
-      delete devDependencies[dep]
-    }
-
     if (
       semver.lt(fromVersion || '0.0.0', '3.0.0') &&
       !packageJson.exports &&

package/scripts/migrate/migrateRemoveDevDeps.cjs

@@ -22,6 +22,7 @@ module.exports = [
   '@babel/plugin-transform-export-extensions',
   '@babel/plugin-transform-flow-comments',
   '@babel/plugin-transform-object-rest-spread',
+  '@babel/plugin-transform-react-jsx',
   '@babel/plugin-transform-regenerator',
   '@babel/plugin-transform-runtime',
   '@babel/polyfill',
@@ -97,6 +98,8 @@ module.exports = [
   'babylon',
   'codecov',
   'commitizen',
+  'copy',
+  'cross-env',
   'cz-conventional-changelog',
   'coveralls',
   'eslint-watch',
@@ -111,9 +114,8 @@ module.exports = [
   'istanbul',
   'jsdom-global',
   'lint-staged',
-  'nyc',
   'prettier-eslint',
-  'prettier',
+  'rimraf',
   'semantic-release',
   'travis-deploy-once',
 ]

package/scripts/migrate.cjs

@@ -24,8 +24,8 @@ async function migrate(args = []) {
     packageJson[name] ? packageJson[name].migratedVersion : undefined
   if (!fromVersion && !isMonorepoSubpackage && !findGitDir()) {
     await execa('git', ['init'])
-    await installGitHooks.run()
   }
+  await installGitHooks.run()
   await migrateProjectPackageJson({ fromVersion })
   if (await hasYarnOrNpmLockfile()) {
     await execa('pnpm', ['import'])

package/util/glob.cjs

@@ -1,13 +1,41 @@
 const { glob, globSync, globIterate, globIterateSync } = require('glob')
 const { projectDir } = require('./findUps.cjs')
 
+const extendOptions = (options) => ({
+  cwd: projectDir,
+  ...options,
+  ignore:
+    (
+      options &&
+      options.ignore &&
+      !Array.isArray(options.ignore) &&
+      typeof options.ignore !== 'string'
+    ) ?
+      {
+        ignored: (p) =>
+          !/\/node_modules\/|\\node_modules\\/.test(p.fullpath()) &&
+          (!options.ignore.ignored || options.ignore.ignored(p)),
+        childrenIgnored: (p) =>
+          !/\/node_modules\/|\\node_modules\\/.test(p.fullpath()) &&
+          (!options.ignore.childrenIgnored ||
+            options.ignore.childrenIgnored(p)),
+      }
+    : [
+        ...((options && options.ignore ?
+          Array.isArray(options.ignore) ?
+            options.ignore
+          : [options.ignore]
+        : []) || []),
+        '**/node_modules/**',
+      ],
+})
+
 module.exports = {
-  glob: (what, options) => glob(what, { cwd: projectDir, ...options }),
-  globSync: (what, options) => globSync(what, { cwd: projectDir, ...options }),
-  globIterate: (what, options) =>
-    globIterate(what, { cwd: projectDir, ...options }),
+  glob: (what, options) => glob(what, extendOptions(options)),
+  globSync: (what, options) => globSync(what, extendOptions(options)),
+  globIterate: (what, options) => globIterate(what, extendOptions(options)),
   globIterateSync: (what, options) =>
-    globIterateSync(what, { cwd: projectDir, ...options }),
+    globIterateSync(what, extendOptions(options)),
   globExists: async (what, options) => {
     for await (const _ of module.exports.globIterate(what, options)) {
       return true