Skip to content

Commit df99b4b

Browse files
author
Angelo Manganiello
authored
Merge pull request #177 from jhipster/feature/server-install-issue-161
Feature/server install issue 161
2 parents d72dc1c + 0ce999f commit df99b4b

File tree

3 files changed

+27
-45
lines changed

3 files changed

+27
-45
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
# [1.3.0](https://github.com/jhipster/generator-jhipster-nodejs/tree/v1.3.0)
1414

15+
- Add npm/yarn install after running the generator for the server side [issue #161](https://github.com/jhipster/generator-jhipster-nodejs/issues/161)
1516
- Configure Swagger UI for OAuth 2.0 [issue #67](https://github.com/jhipster/generator-jhipster-nodejs/issues/67)
1617
- feat: build and run from Docker Support [issue #172](https://github.com/jhipster/generator-jhipster-nodejs/issues/172)
1718
- Node JS microservice is not registered properly in Jhipster Registry [issue #103](https://github.com/jhipster/generator-jhipster-nodejs/issues/103)

generators/server/index.js

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,32 @@ module.exports = class extends ServerGenerator {
118118
}
119119

120120
get install() {
121+
const installPhaseFromJHipster = super._install();
122+
const jhipsterInstallNodeSteps = {
123+
/* istanbul ignore next */
124+
jhipsterNodeServerInstall() {
125+
if (this.skipServer) return;
126+
const logMsg = `To install your server dependencies manually, run: cd server && ${chalk.yellow.bold(
127+
`${this.clientPackageManager} install`
128+
)}`;
129+
130+
if (this.options.skipInstall) {
131+
this.log(logMsg);
132+
} else {
133+
try {
134+
this.log(chalk.bold('\nInstalling server dependencies using npm'));
135+
this.spawnCommandSync('npm', ['install'], { cwd: `${process.cwd()}/server` });
136+
} catch (e) {
137+
this.warning('Install of server dependencies failed!');
138+
this.log(logMsg);
139+
}
140+
}
141+
}
142+
};
143+
144+
return Object.assign(installPhaseFromJHipster, jhipsterInstallNodeSteps);
121145
// Here we are not overriding this phase and hence its being handled by JHipster
122-
return super._install();
146+
// return super._install();
123147
}
124148

125149
get end() {
@@ -133,9 +157,7 @@ module.exports = class extends ServerGenerator {
133157

134158
this.log(
135159
chalk.green(
136-
`Run your application (after ${
137-
this.clientPackageManager
138-
} install in root folder and server folder) :\n ${chalk.yellow.bold(
160+
`Run your application :\n ${chalk.yellow.bold(
139161
`${executable}`
140162
)}\nOtherwise, run the npm scripts explained under ${chalk.yellow.bold(READMES)}`
141163
)

package-lock.json

Lines changed: 0 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)