wp-lemon-create 1.7.2 → 1.9.0

package/lib/index.js

@@ -49,7 +49,7 @@ program
             shell.exit(1);
         }
         {
-            shell.echo('✔️  Git installed');
+            shell.echo('✔️ Git installed');
         }
 
         if (!shell.which('composer')) {
@@ -57,7 +57,7 @@ program
             shell.exit(1);
         }
         {
-            shell.echo('✔️  composer installed');
+            shell.echo('✔️ Composer installed');
         }
 
         if (!shell.which('yarn')) {
@@ -65,7 +65,7 @@ program
             shell.exit(1);
         }
         {
-            shell.echo('✔️  yarn installed');
+            shell.echo('✔️ Yarn installed');
         }
 
         if (!shell.which('wp')) {
@@ -73,7 +73,7 @@ program
             shell.exit(1);
         }
         {
-            shell.echo('✔️  wp-cli installed');
+            shell.echo('✔️ wp-cli installed');
         }
 
         if (shell.exec('wp dotenv --help', { silent: true }).code !== 0) {
@@ -81,7 +81,7 @@ program
             shell.exit(1);
         }
         {
-            shell.echo('✔️  wp-cli dotenv package installed');
+            shell.echo('✔️ wp-cli dotenv package installed');
         }
 
         if (shell.exec('grep -q Microsoft /proc/version', { silent: true }).code == 0) {
@@ -127,13 +127,13 @@ program
         shell.echo(`🎉 Setting up ${project_type} wp-lemon project with url ${project_url} \n`);
 
         if (project_type == 'new') {
-            shell.echo('⏳  Downloading Bedrock. This may take a minute or so.\n');
+            shell.echo('⏳ Downloading Bedrock. This may take a minute or so.\n');
 
             /**
              * cloning bedrock and removing unneeded dirs
              */
             shell.exec('composer create-project roots/bedrock .', { silent: true });
-            shell.echo('✔️  Bedrock installed.\n');
+            shell.echo('✔️ Bedrock installed.\n');
             shell.rm('-rf', 'CHANGELOG.MD');
             shell.rm('-rf', 'LICENSE.MD');
             shell.rm('-rf', 'composer.lock');
@@ -151,10 +151,10 @@ program
             /**
              * Add composer packages
              */
-            shell.echo('⏳  Installing plugins, parent theme and packages. This may take a while\n');
+            shell.echo('⏳ Installing plugins, parent theme and packages. This may take a while\n');
 
             shell.exec('composer require composer/installers ~1.0', { silent: true });
-
+            shell.exec('"roots/wordpress', { silent: true });
             //  Add libraries and parent theme
             shell.exec('composer require highground/bulldozer giggsey/libphonenumber-for-php timber/timber satispress/wp-lemon --with-all-dependencies', { silent: true });
 
@@ -187,7 +187,7 @@ program
             if (!skipGit) {
                 shell.exec('git init', { silent: true });
                 shell.exec(`git remote add origin ${project_repository} `);
-                shell.echo(`✔️  Setting up empty local git repository and adding ${project_repository} as remote.\n`);
+                shell.echo(`✔️ Setting up empty local git repository and adding ${project_repository} as remote.\n`);
             }
 
             /**
@@ -201,14 +201,14 @@ program
             /**
              * Downloading child theme
              */
-            shell.echo('⏳  Downloading child theme.\n');
+            shell.echo('⏳ Downloading child theme.\n');
             shell.cd('web/app/themes/');
 
             shell.exec(`composer create-project --repository https://packagist.studiolemon.nl/satispress/ satispress/wp-lemon-child ${child_theme_folder} --no-dev`, { silent: true });
 
             shell.cd(child_theme_folder);
             shell.rm('-rf', '.github');
-            shell.echo('✔️  Downloading child theme succesful.');
+            shell.echo('✔️ Downloading child theme succesful.');
         } else {
             /**
              * Task: existing project.
@@ -239,18 +239,18 @@ program
         shell.sed('-i', 'http://wplemon.local', `http://${project_url}`, 'resources/assets/config.json');
         shell.sed('-i', 'wp-lemon-child', child_theme_folder, 'resources/assets/config.json');
         shell.sed('-i', 'wp-lemon child', project_name, 'style.css');
-        shell.echo('✔️  Configuring child theme succesful.\n');
+        shell.echo('✔️ Configuring child theme succesful.\n');
 
         /**
          * Installing node modules in child theme and parent theme.
          */
-        shell.echo('⏳  Installing npm dependencies. This may take a while.\n');
+        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.');
         } else {
-            shell.echo('✔️  Installing npm dependencies succesful.');
+            shell.echo('✔️ Installing npm dependencies succesful.');
             shell.exec(`yarn run dev`, { silent: true });
-            shell.echo('✔️  First webpack build succesful.\n');
+            shell.echo('✔️ First webpack build succesful.\n');
         }
 
         /**
@@ -263,7 +263,7 @@ program
          */
         shell.cd('../../../../');
 
-        shell.exec(`touch ${project_name}.code-workspace`);
+        shell.exec(`touch workspace.code-workspace`);
         shell.exec(`echo '{
             "folders": [
                 {
@@ -275,8 +275,8 @@ program
                     "path": "web/app/themes/${project_name}"
                 }
             ]
-        }' >> ${project_name}.code-workspace`);
-        shell.echo('✔️  .code-workspace file created.\n');
+        }' >> workspace.code-workspace`);
+        shell.echo('✔️ .code-workspace file created.\n');
 
 
         /**
@@ -296,7 +296,7 @@ program
         shell.exec(`wp dotenv set DB_PASSWORD ${DBpassword}`, { silent: true });
         shell.exec(`wp dotenv set WP_HOME http://${project_url}`, { silent: true });
         shell.exec(`wp dotenv salts generate`, { silent: true });
-        shell.echo('✔️  Generating .env successful.\n');
+        shell.echo('✔️ Generating .env successful.\n');
 
         if (is_wsl) {
             shell.echo('Uncommenting #DB_host and changing to 127.0.0.1 for allowing connection in WSL\n');
@@ -308,52 +308,22 @@ program
             shell.echo('⏳ Installing WordPress.\n');
 
             if (shell.exec(`wp db create`, { silent: true }).code !== 0) {
-                shell.echo('Database creation failed.');
+                prompt('Database creation failed. Please make sure your server is running. Press enter to continue.');
+                createDB(child_theme_folder);
             } else {
-                shell.echo('✔️  Database created');
+                shell.echo('✔️ Database created');
+                setupWordPress(child_theme_folder);
             }
 
-            if (
-                shell.exec(
-                    `wp core install --skip-email --url="http://${project_url}" --title="${project_name}" --admin_user="${username}" --admin_password="${password}" --admin_email="${email}"`,
-                    { silent: true },
-                ).code !== 0
-            ) {
-                shell.echo('Error: Installing WordPress failed.');
-                shell.exit(1);
-            }
 
-            shell.echo('✔️  Installing WordPress succesful.');
-            shell.exec(`wp rewrite structure '/%postname%/'`, { silent: true });
-            shell.echo('✔️  Setting permalink structure.');
-
-            shell.exec(`wp theme activate ${child_theme_folder}`, { silent: true });
-            shell.echo(`✔️  Activating child theme ${child_theme_folder}`);
-
-            shell.exec(`wp post update 2 --post_title='Home'`, { silent: true });
-            shell.exec(`wp option update show_on_front 'page'`, { silent: true });
-            shell.exec(`wp option update timezone_string 'Europe/Amsterdam'`, { silent: true });
-            shell.exec(`wp option update page_on_front 2`, { silent: true });
-            shell.exec(`wp post delete 1 --force`, { silent: true });
-            shell.exec(`wp comment delete 1 --force`, { silent: true });
-            shell.echo('✔️  Create homepage and set as front-page.');
-            // Set language
-            shell.exec(`wp language core install nl_NL`, { silent: true });
-            shell.exec(`wp language plugin install nl_NL --all`, { silent: true });
-            shell.exec(`wp language core activate nl_NL`, { silent: true });
-            shell.echo('✔️  Installed Dutch language.');
-            // set menu
-            shell.exec(`wp menu create "Hoofdmenu"`, { silent: true });
-            shell.exec(`wp menu item add-post Hoofdmenu 2`, { silent: true });
-            shell.exec(`wp menu location assign Hoofdmenu primary_navigation`, { silent: true });
-            shell.echo('✔️  Created primary menu.');
         } else {
             shell.echo('Creating Database.\n');
 
             if (shell.exec(`wp db create`, { silent: true }).code !== 0) {
-                shell.echo('Database creation failed.');
+                prompt('Database creation failed. Please make sure your server is running. Press enter to continue.');
+
             } else {
-                shell.echo('✔️  Database created.');
+                shell.echo('✔️ Database created.');
             }
 
             /**
@@ -361,13 +331,63 @@ program
              */
             shell.echo('You can import your database by placing the .sql dump in the project root and run wp db import databasename.sql.');
             prompt('Please import your database and uploads. After that press enter to continue.');
-
-            // Flush rewrite rules
-            shell.exec(`wp rewrite flush`);
         }
 
+        // Flush rewrite rules
+        shell.exec(`wp rewrite flush`);
+
         shell.echo(`\n`);
-        shell.echo(`🎉  All done! Happy developing!`);
-        shell.echo(`🌐  You can now navigate to http://${project_url}`);
+        shell.echo(`🎉 All done! Happy developing!`);
+        shell.echo(`🌐 You can now navigate to http://${project_url}`);
     })
     .parse(process.argv);
+
+
+function createDB(theme_name) {
+    if (shell.exec(`wp db create`, { silent: true }).code !== 0) {
+        prompt('Database creation failed. Please make sure your server is running. Press enter to continue.');
+    } else {
+        shell.echo('✔️ Database created');
+        setupWordPress(theme_name);
+    }
+}
+
+
+
+function setupWordPress(child_theme_folder) {
+    if (
+        shell.exec(
+            `wp core install --skip-email --url="http://${project_url}" --title="${project_name}" --admin_user="${username}" --admin_password="${password}" --admin_email="${email}"`,
+            { silent: true },
+        ).code !== 0
+    ) {
+        shell.echo('Error: Installing WordPress failed.');
+        shell.exit(1);
+    }
+
+    shell.echo('✔️ Installing WordPress succesful.');
+    shell.exec(`wp rewrite structure '/%postname%/'`, { silent: true });
+    shell.echo('✔️ Setting permalink structure.');
+
+    shell.exec(`wp theme activate ${child_theme_folder}`, { silent: true });
+    shell.echo(`✔️ Activating child theme ${child_theme_folder}`);
+
+    shell.exec(`wp post update 2 --post_title='Home'`, { silent: true });
+    shell.exec(`wp option update show_on_front 'page'`, { silent: true });
+    shell.exec(`wp option update timezone_string 'Europe/Amsterdam'`, { silent: true });
+    shell.exec(`wp option update page_on_front 2`, { silent: true });
+    shell.exec(`wp post delete 1 --force`, { silent: true });
+    shell.exec(`wp comment delete 1 --force`, { silent: true });
+    shell.echo('✔️ Create homepage and set as front-page.');
+    // Set language
+    shell.exec(`wp language core install nl_NL`, { silent: true });
+    shell.exec(`wp language plugin install nl_NL --all`, { silent: true });
+    shell.exec(`wp language core activate nl_NL`, { silent: true });
+    shell.echo('✔️ Installed Dutch language.');
+    // set menu
+    shell.exec(`wp menu create "Hoofdmenu"`, { silent: true });
+    shell.exec(`wp menu item add-post Hoofdmenu 2`, { silent: true });
+    shell.exec(`wp menu location assign Hoofdmenu primary_navigation`, { silent: true });
+    shell.echo('✔️ Created primary menu.');
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wp-lemon-create",
-    "version": "1.7.2",
+    "version": "1.9.0",
     "description": "Bootstrap your wp-lemon project",
     "main": "index.js",
     "author": "Erik van der bas",