@@ -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 )
0 commit comments