Skip to content

Commit 838b729

Browse files
author
Angelo Manganiello
committed
update blueprints line subgenerators log
1 parent 6b810c1 commit 838b729

File tree

11 files changed

+28
-20
lines changed

11 files changed

+28
-20
lines changed

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ or
4141

4242
`npm link "generator-jhipster" && npm link "generator-jhipster-nodejs"`
4343

44-
( 🏁 Kudos, you have done it. It is the time to generate the application `jhipster --blueprint nodejs` )
44+
( 🏁 Kudos, you have done it. It is the time to generate the application `jhipster --blueprints nodejs` )
4545

4646
✨✨✨✨ You are rocking ✨✨✨✨
4747

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@ yarn global upgrade generator-jhipster-nodejs
8585
## 🚦 What we have now
8686

8787
✅ General App generation
88-
- `jhipster --blueprint nodejs`
88+
- `jhipster --blueprints nodejs`
8989

9090
✅ Controller generation
91-
- `jhipster spring-controller <controller-name> --blueprint nodejs`
91+
- `jhipster spring-controller <controller-name> --blueprints nodejs`
9292

9393
✅ Entity generation
94-
- `jhipster entity <entity-name> --blueprint nodejs`
94+
- `jhipster entity <entity-name> --blueprints nodejs`
9595

9696
✅ JDL Entity model support generation
97-
- `jhipster import-jdl my_file.jdl --blueprint nodejs`
97+
- `jhipster import-jdl my_file.jdl --blueprints nodejs`
9898

9999
## ❤️ For community
100100

‎generators/client/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable consistent-return */
22
const chalk = require('chalk');
33
const ClientGenerator = require('generator-jhipster/generators/client');
4+
// const jhipsterPackagejs = require('generator-jhipster/package.json');
45
const constants = require('../generator-nodejs-constants');
56
const writeFiles = require('./files').writeFiles;
67

@@ -11,7 +12,7 @@ module.exports = class extends ClientGenerator {
1112
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1213

1314
if (!jhContext) {
14-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
15+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1516
}
1617

1718
this.configOptions = jhContext.configOptions || {};
@@ -25,6 +26,7 @@ module.exports = class extends ClientGenerator {
2526
// variables to use in templates
2627
setupCustomClientConsts() {
2728
this.SERVER_NODEJS_SRC_DIR = constants.SERVER_NODEJS_SRC_DIR;
29+
// this.packagejs = jhipsterPackagejs;
2830
}
2931
};
3032
return Object.assign(initPhaseFromJHipster, initNodeClientPhaseSteps);
@@ -39,7 +41,7 @@ module.exports = class extends ClientGenerator {
3941
return {
4042
askForClientSideOpts: prompts.askForClientSideOpts,
4143
setSharedConfigOptions() {
42-
// this.configOptions.clientFramework = this.clientFramework;
44+
this.configOptions.clientFramework = this.clientFramework;
4345
}
4446
};
4547
*/

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
<%_ if (protractorTests) { _%>
148148
"webdriver-manager": "12.1.6",
149149
<%_ } _%>
150-
"@openapitools/openapi-generator-cli": "0.0.14-4.0.2",
151150
"webpack": "4.39.3",
152151
"webpack-cli": "3.3.7",
153152
"webpack-dev-server": "3.8.0",
@@ -192,4 +191,4 @@
192191
"reportPath": "<%= BUILD_DIR %>test-results/jest",
193192
"reportFile": "TESTS-results-sonar.xml"
194193
}
195-
}
194+
}

‎generators/common/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = class extends CommonGenerator {
1111
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1212

1313
if (!jhContext) {
14-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
14+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1515
}
1616

1717
this.configOptions = jhContext.configOptions || {};

‎generators/entity-server/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = class extends EntityServerGenerator {
2626
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
2727

2828
if (!jhContext) {
29-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
29+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
3030
}
3131

3232
this.configOptions = jhContext.configOptions || {};

‎generators/entity/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = class extends EntityGenerator {
99
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1010

1111
if (!jhContext) {
12-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
12+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1313
}
1414

1515
this.configOptions = jhContext.configOptions || {};

‎generators/languages/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = class extends LanguagesGenerator {
1111
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1212

1313
if (!jhContext) {
14-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
14+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1515
}
1616

1717
this.configOptions = jhContext.configOptions || {};

‎generators/server/index.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ const chalk = require('chalk');
33
const ServerGenerator = require('generator-jhipster/generators/server');
44
const jhipsterConstants = require('generator-jhipster/generators/generator-constants');
55
const os = require('os');
6+
// const jhipsterPackagejs = require('generator-jhipster/package.json');
67
const jhipsterNodeConstants = require('../generator-nodejs-constants');
7-
const packagejs = require('../../package.json');
8+
const nodePackagejs = require('../../package.json');
89
const writeFiles = require('./files').writeFiles;
910
const prompts = require('./prompts');
1011

@@ -15,7 +16,7 @@ module.exports = class extends ServerGenerator {
1516
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1617

1718
if (!jhContext) {
18-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
19+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1920
}
2021

2122
this.configOptions = jhContext.configOptions || {};
@@ -36,7 +37,7 @@ module.exports = class extends ServerGenerator {
3637
this.log(`${chalk.yellow(' ██║ ╚████║')}${chalk.green(' ██║ ██║ ████████╗ ██║ ██████╔╝ ██║ ████████╗ ██║ ╚██╗')}`);
3738
this.log(`${chalk.yellow(' ╚═╝ ╚═══╝')}${chalk.green(' ╚═╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═╝')}\n`);
3839
this.log(chalk.white.bold(' https://www.jhipster.tech\n'));
39-
this.log(chalk.white('Welcome to NHipster (Jhipster NodeJS Official Blueprint) ') + chalk.yellow(`v${packagejs.version}`));
40+
this.log(chalk.white('Welcome to NHipster (Jhipster NodeJS Official Blueprint) ') + chalk.yellow(`v${nodePackagejs.version}`));
4041
this.log(chalk.white('This blueprint generates your backend in NodeJS with NestJS framework'));
4142

4243
this.log(
@@ -112,6 +113,9 @@ module.exports = class extends ServerGenerator {
112113
this.testFrameworks =[];
113114

114115
/*
116+
this.packagejs= jhipsterPackagejs;
117+
this.jhipsterVersion=jhipsterPackagejs.version;
118+
115119
const configuration = this.getAllJhipsterConfig(this, true);
116120
this.mongoProdDatabase = configuration.get('mongoProdDatabase');
117121
*/
@@ -165,13 +169,16 @@ module.exports = class extends ServerGenerator {
165169
serverPort: this.serverPort,
166170
databaseType: this.databaseType,
167171
devDatabaseType: this.devDatabaseType,
168-
prodDatabaseType: this.prodDatabaseType
172+
prodDatabaseType: this.prodDatabaseType,
173+
174+
jhipsterVersion: this.jhipsterVersion
169175
};
170176
this.config.set(config);
171177
}
172178
};
173179
return Object.assign(confPhaseFromJHipster, jhipsterConfigNodeSteps);
174-
*/
180+
*/
181+
175182
// Here we are not overriding this phase and hence its being handled by JHipster
176183
return confPhaseFromJHipster;
177184
}

‎generators/spring-controller/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = class extends SpringControllerGenerator {
1111
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1212

1313
if (!jhContext) {
14-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
14+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1515
}
1616

1717
this.configOptions = jhContext.configOptions || {};

‎generators/spring-service/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = class extends SpringServiceGenerator {
1010
const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
1111

1212
if (!jhContext) {
13-
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprint nodejs')}`);
13+
this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints nodejs')}`);
1414
}
1515

1616
this.configOptions = jhContext.configOptions || {};

0 commit comments

Comments
 (0)