Merge branch 'master' into update_documentation_for_new_features

Author: sarthak-sehgal

generators/app/index.js

@@ -8,10 +8,14 @@ module.exports = class extends Generator {
   // Note: arguments and options should be defined in the constructor.
   constructor(args, opts) {
     super(args, opts);
-    this.argument("projectDirectory", { type: String, required: false });
-    if (!this.options.projectDirectory) {
-      this.options.projectDirectory = "web-component";
-    }
+    this.argument("projectDirectory", {
+      type: String,
+      required: false,
+      default: "web-component",
+      desc: `${chalk.blue(
+        "path of the project directory, if you enter the path of a directory which does not exist, the generator will make one for you, otherwise it will use the existing one."
+      )} Default directory: ${chalk.cyan("web-component")}`
+    });
   }
 
   initializing() {
@@ -58,7 +62,7 @@ module.exports = class extends Generator {
         message:
           "I need the build file (generally index.js, main.js or componentName.js) for this, import it using one of the options -",
         choices: [
-          "Install component from npm package (Recommended - fastest way)",
+          "Install component from npm package. (Recommended - fastest way)",
           "Tell us the path of the build file on your local machine and I will import it in the project.",
           "Tell us the npm package name, version, build file URL and I will download the build file."
         ],
@@ -83,7 +87,7 @@ module.exports = class extends Generator {
         name: "changeImportSourceFromNpmPackage",
         message: "What do you want to do?",
         choices: [
-          "Enter package name again to install component from npm package.",
+          "Enter package name again to install component from npm package. (Recommended - fastest way)",
           "Import the file locally from your computer.",
           "Enter package name, version, build file URL to download the build file."
         ],
@@ -130,7 +134,7 @@ module.exports = class extends Generator {
         name: "changeImportSourceFromNpmBuildFile",
         message: "What do you want to do?",
         choices: [
-          "Enter package name again to install component from npm package.",
+          "Enter package name again to install component from npm package. (Recommended - fastest way)",
           "Import the file locally from your computer.",
           "Enter package name, version, build file URL to download the build file."
         ],
@@ -203,9 +207,8 @@ module.exports = class extends Generator {
       {
         type: "input",
         name: "directoryName",
-        message: `The build file will be imported in a separate directory in the project's root. Enter the name of this directory or press Enter if you like to go with default ${chalk.cyan(
-          "component-dist"
-        )}.`,
+        message:
+          "The build file will be imported in a separate directory in the project's root. Enter the name of this directory or press Enter if you like to go with default.",
         validate: validators.directoryName,
         default: "component-dist"
       },

generators/app/validator.js

@@ -140,7 +140,7 @@ validators.checkVersionAndInstallComponent = async function(props, answers) {
 
 validators.directoryName = async props => {
   var res;
-  if (props.trim() === "o") {
+  if (props.trim() === "o" || props.trim() === "O") {
     res = await executeCommand(`rm -rf ${projectDirectory}/${buildDirectory}/*`)
       .then(() => true)
       .catch(err => {