update blueprints line subgenerators log

Author: Angelo Manganiello

CONTRIBUTING.md

@@ -41,7 +41,7 @@ or
 
 `npm link "generator-jhipster" && npm link "generator-jhipster-nodejs"`
 
-( 🏁 Kudos, you have done it. It is the time to generate the application `jhipster --blueprint nodejs` )
+( 🏁 Kudos, you have done it. It is the time to generate the application `jhipster --blueprints nodejs` )
 
 ✨✨✨✨ You are rocking ✨✨✨✨
 

README.md

@@ -85,16 +85,16 @@ yarn global upgrade generator-jhipster-nodejs
 ## 🚦 What we have now
 
 ✅ General App generation 
-   - `jhipster --blueprint nodejs`
+   - `jhipster --blueprints nodejs`
 
 ✅ Controller generation
-   - `jhipster spring-controller <controller-name> --blueprint nodejs`
+   - `jhipster spring-controller <controller-name> --blueprints nodejs`
 
 ✅ Entity generation
-   - `jhipster entity <entity-name> --blueprint nodejs`
+   - `jhipster entity <entity-name> --blueprints nodejs`
 
 ✅ JDL Entity model support generation
-   - `jhipster import-jdl my_file.jdl --blueprint nodejs`
+   - `jhipster import-jdl my_file.jdl --blueprints nodejs`
 
 ## ❤️ For community
 

generators/client/index.js

@@ -1,6 +1,7 @@
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
 const ClientGenerator = require('generator-jhipster/generators/client');
+// const jhipsterPackagejs = require('generator-jhipster/package.json');
 const constants = require('../generator-nodejs-constants');
 const writeFiles = require('./files').writeFiles;
 
@@ -11,7 +12,7 @@ module.exports = class extends ClientGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};
@@ -25,6 +26,7 @@ module.exports = class extends ClientGenerator {
             // variables to use in templates
             setupCustomClientConsts() {
                 this.SERVER_NODEJS_SRC_DIR = constants.SERVER_NODEJS_SRC_DIR;
+                // this.packagejs = jhipsterPackagejs;
             }
         };
         return Object.assign(initPhaseFromJHipster, initNodeClientPhaseSteps);
@@ -39,7 +41,7 @@ module.exports = class extends ClientGenerator {
         return {
             askForClientSideOpts: prompts.askForClientSideOpts,
             setSharedConfigOptions() {
-                // this.configOptions.clientFramework = this.clientFramework;
+                 this.configOptions.clientFramework = this.clientFramework;
             }
         };
         */

generators/client/templates/angular/package.json.ejs

@@ -147,7 +147,6 @@
     <%_ if (protractorTests) { _%>
     "webdriver-manager": "12.1.6",
     <%_ } _%>
-    "@openapitools/openapi-generator-cli": "0.0.14-4.0.2",
     "webpack": "4.39.3",
     "webpack-cli": "3.3.7",
     "webpack-dev-server": "3.8.0",
@@ -192,4 +191,4 @@
     "reportPath": "<%= BUILD_DIR %>test-results/jest",
     "reportFile": "TESTS-results-sonar.xml"
   }
-}
+}

generators/common/index.js

@@ -11,7 +11,7 @@ module.exports = class extends CommonGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};

generators/entity-server/index.js

@@ -26,7 +26,7 @@ module.exports = class extends EntityServerGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};

generators/entity/index.js

@@ -9,7 +9,7 @@ module.exports = class extends EntityGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};

generators/languages/index.js

@@ -11,7 +11,7 @@ module.exports = class extends LanguagesGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};

generators/server/index.js

@@ -3,8 +3,9 @@ const chalk = require('chalk');
 const ServerGenerator = require('generator-jhipster/generators/server');
 const jhipsterConstants = require('generator-jhipster/generators/generator-constants');
 const os = require('os');
+// const jhipsterPackagejs = require('generator-jhipster/package.json');
 const jhipsterNodeConstants = require('../generator-nodejs-constants');
-const packagejs = require('../../package.json');
+const nodePackagejs = require('../../package.json');
 const writeFiles = require('./files').writeFiles;
 const prompts = require('./prompts');
 
@@ -15,7 +16,7 @@ module.exports = class extends ServerGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};
@@ -36,7 +37,7 @@ module.exports = class extends ServerGenerator {
                 this.log(`${chalk.yellow(' ██║ ╚████║')}${chalk.green(' ██║   ██║ ████████╗ ██║       ██████╔╝    ██║    ████████╗ ██║  ╚██╗')}`);
                 this.log(`${chalk.yellow(' ╚═╝  ╚═══╝')}${chalk.green(' ╚═╝   ╚═╝ ╚═══════╝ ╚═╝       ╚═════╝     ╚═╝    ╚═══════╝ ╚═╝   ╚═╝')}\n`);
                 this.log(chalk.white.bold('                            https://www.jhipster.tech\n'));
-                this.log(chalk.white('Welcome to NHipster (Jhipster NodeJS Official Blueprint) ') + chalk.yellow(`v${packagejs.version}`));
+                this.log(chalk.white('Welcome to NHipster (Jhipster NodeJS Official Blueprint) ') + chalk.yellow(`v${nodePackagejs.version}`));
                 this.log(chalk.white('This blueprint generates your backend in NodeJS with NestJS framework'));
 
                 this.log(
@@ -112,6 +113,9 @@ module.exports = class extends ServerGenerator {
                 this.testFrameworks =[];
 
                 /*
+                this.packagejs= jhipsterPackagejs;
+                this.jhipsterVersion=jhipsterPackagejs.version;
+
                 const configuration = this.getAllJhipsterConfig(this, true);
                 this.mongoProdDatabase = configuration.get('mongoProdDatabase');
                 */
@@ -165,13 +169,16 @@ module.exports = class extends ServerGenerator {
                     serverPort: this.serverPort,
                     databaseType: this.databaseType,
                     devDatabaseType: this.devDatabaseType,
-                    prodDatabaseType: this.prodDatabaseType
+                    prodDatabaseType: this.prodDatabaseType,
+
+                   jhipsterVersion: this.jhipsterVersion
                 };
                 this.config.set(config);
             }
         };
          return Object.assign(confPhaseFromJHipster, jhipsterConfigNodeSteps);
-        */
+         */
+
         // Here we are not overriding this phase and hence its being handled by JHipster
         return confPhaseFromJHipster;
     }

generators/spring-controller/index.js

@@ -11,7 +11,7 @@ module.exports = class extends SpringControllerGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};

generators/spring-service/index.js

@@ -10,7 +10,7 @@ module.exports = class extends SpringServiceGenerator {
         const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
 
         if (!jhContext) {
-            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
+            this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
         }
 
         this.configOptions = jhContext.configOptions || {};