wp-lemon-create 2.1.0 → 2.2.0

package/lib/index.js

@@ -25,7 +25,7 @@ let is_spinup = false;
 let skipGit = false;
 let branch = false;
 let version_constraints = '*';
-let has_package_manager = false;
+let package_manager = false;
 const hasYarn = shell.which('yarn');
 const hasNpm = shell.which('npm');
 
@@ -65,10 +65,11 @@ program
         }
 
         if (!hasYarn && !hasNpm) {
-            shell.echo('Yarn or npm not found.');
+            shell.echo('Yarn and npm are both missing. Please install one of them.');
             shell.exit(1);
         } else {
             shell.echo(`✔️ ${hasYarn ? 'Yarn' : 'Npm'} installed`);
+            package_manager = hasYarn ? 'yarn' : 'npm';
         }
 
         if (!shell.which('wp')) {
@@ -111,7 +112,7 @@ program
             plugins_searchwp = prompt('Add plugin: SearchWP? yes/no (defaults to no)', 'no');
             plugins_wpml = prompt('Add plugin: WPML? yes/no (defaults to no)', 'no');
             is_spinup = prompt('Does the project run on Spinup-wp? (defaults to no)', 'no');
-            is_beta = prompt('Is this a beta project? (defaults to no)', 'no');
+            //is_beta = prompt('Is this a beta project? (defaults to no)', 'no');
 
             if (project_repository == 'none') {
                 skipGit = true;
@@ -132,9 +133,9 @@ program
 
         if (project_type == 'new') {
 
-            if (is_beta) {
-                version_constraints = '^4@beta';
-            }
+            //if (is_beta) {
+            //    version_constraints = '^4@beta';
+            //}
 
             shell.echo('⏳ Downloading Bedrock. This may take a minute or so.\n');
 
@@ -259,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.1.0",
+    "version": "2.2.0",
     "description": "Bootstrap your wp-lemon project",
     "main": "index.js",
     "author": "Studio Lemon <erik@studiolemon.nl>",