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

package/package.json

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

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.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