wp-lemon-create 2.0.6 → 2.1.1

package/lib/index.js

@@ -25,6 +25,9 @@ let is_spinup = false;
 let skipGit = false;
 let branch = false;
 let version_constraints = '*';
+let package_manager = false;
+const hasYarn = shell.which('yarn');
+const hasNpm = shell.which('npm');
 
 program
     .name(commandName)
@@ -56,18 +59,17 @@ program
 
         if (!shell.which('composer')) {
             shell.echo('Sorry, this script requires composer');
-            shell.exit(1);
         }
         {
             shell.echo('✔️ Composer installed');
         }
 
-        if (!shell.which('yarn')) {
-            shell.echo('Sorry, this script requires yarn');
+        if (!hasYarn && !hasNpm) {
+            shell.echo('Yarn and npm are both missing. Please install one of them.');
             shell.exit(1);
-        }
-        {
-            shell.echo('✔️ Yarn installed');
+        } else {
+            shell.echo(`✔️ ${hasYarn ? 'Yarn' : 'Npm'} installed`);
+            package_manager = hasYarn ? 'yarn' : 'npm';
         }
 
         if (!shell.which('wp')) {
@@ -258,11 +260,11 @@ program
          * Installing node modules in child theme and parent theme.
          */
         shell.echo('⏳ Installing npm dependencies. This may take a while.\n');
-        if (shell.exec(`yarn run bootstrap-project`, { silent: true }).code !== 0) {
-            shell.echo('Error: yarn run bootstrap-project failed. Please install node dependencies manually by running yarn run bootstrap-project in your child theme.');
+        if (shell.exec(`${package_manager} run bootstrap-project`, { silent: true }).code !== 0) {
+            shell.echo(`Error: ${package_manager} run bootstrap-project failed. Please install node dependencies manually by running ${package_manager} run bootstrap-project in your child theme.`);
         } else {
             shell.echo('✔️ Installing npm dependencies succesful.');
-            shell.exec(`yarn run dev`, { silent: true });
+            shell.exec(`${package_manager} run dev`, { silent: true });
             shell.echo('✔️ First webpack build succesful.\n');
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wp-lemon-create",
-    "version": "2.0.6",
+    "version": "2.1.1",
     "description": "Bootstrap your wp-lemon project",
     "main": "index.js",
     "author": "Studio Lemon <erik@studiolemon.nl>",