@jcoreio/toolchain 1.0.0-beta.3 → 1.0.0-beta.5

package/package.json

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

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

@@ -12,10 +12,14 @@ async function bootstrap(args = []) {
   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()
   await bootstrapProjectPackageJson()
+  if (await hasYarnOrNpmLockfile()) {
+    await execa('pnpm', ['import'])
+  }
   await Promise.all(
     bootstrapRemoveFiles.map(async (file) => {
       const exists = await fs.pathExists(file)

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',

package/scripts/preinstall.cjs

@@ -4,7 +4,12 @@ const fs = require('../util/projectFs.cjs')
 
 async function preinstall(args = []) {
   const preinstallUpdateProjectPackageJson = require('./preinstall/preinstallUpdateProjectPackageJson.cjs')
+  const execa = require('../util/execa.cjs')
+  const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
 
+  if (await hasYarnOrNpmLockfile()) {
+    await execa('pnpm', ['import'])
+  }
   await Promise.all(
     require('./preinstall/preinstallRemoveFiles.cjs').map(async (file) => {
       const exists = await fs.pathExists(file)

package/util/hasYarnOrNpmLockfile.cjs

@@ -0,0 +1,13 @@
+const fs = require('./projectFs.cjs')
+
+async function hasYarnOrNpmLockfile() {
+  return (
+    await Promise.all(
+      ['yarn.lock', 'npm-shrinkwrap.json', 'package-lock.json'].map((file) =>
+        fs.pathExists(file)
+      )
+    )
+  ).some((exists) => exists)
+}
+
+module.exports = hasYarnOrNpmLockfile