java: npmw wrapper adjusts

Author: mshima

generators/java/generators/node/generator.ts

@@ -95,7 +95,6 @@ export default class NodeGenerator extends BaseApplicationGenerator {
           blocks: [
             {
               condition: (ctx: any) => ctx.useNpmWrapper,
-              transform: false,
               templates: ['npmw', 'npmw.cmd'],
             },
           ],

generators/java/generators/node/templates/npmw.cmd renamed to generators/java/generators/node/templates/npmw.cmd.ejs

@@ -4,17 +4,17 @@ setlocal
 
 set NPMW_DIR=%~dp0
 
-if exist "%NPMW_DIR%mvnw.cmd" (
-  set NODE_EXE=^"^"
-  set NODE_PATH=%NPMW_DIR%target\node\
-  set NPM_EXE=^"%NPMW_DIR%target\node\npm.cmd^"
-  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%mvnw.cmd^" -Pwebapp frontend:install-node-and-npm@install-node-and-npm
-) else (
-  set NODE_EXE=^"%NPMW_DIR%build\node\bin\node.exe^"
-  set NODE_PATH=%NPMW_DIR%build\node\bin\
-  set NPM_EXE=^"%NPMW_DIR%build\node\lib\node_modules\npm\bin\npm-cli.js^"
-  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%gradlew.bat^" npmSetup
-)
+<%_ if (buildToolMaven) { _%>
+set NODE_EXE=^"^"
+set NODE_PATH=%NPMW_DIR%target\node\
+set NPM_EXE=^"%NPMW_DIR%target\node\npm.cmd^"
+set INSTALL_NPM_COMMAND=^"%NPMW_DIR%mvnw.cmd^" -Pwebapp frontend:install-node-and-npm@install-node-and-npm
+<%_ } else if (buildToolGradle) { _%>
+set NODE_EXE=^"%NPMW_DIR%build\node\bin\node.exe^"
+set NODE_PATH=%NPMW_DIR%build\node\bin\
+set NPM_EXE=^"%NPMW_DIR%build\node\lib\node_modules\npm\bin\npm-cli.js^"
+set INSTALL_NPM_COMMAND=^"%NPMW_DIR%gradlew.bat^" npmSetup --no-daemon
+<%_ } _%>
 
 if not exist %NPM_EXE% (
   call %INSTALL_NPM_COMMAND%

generators/java/generators/node/templates/npmw renamed to generators/java/generators/node/templates/npmw.ejs

@@ -2,14 +2,17 @@
 
 basedir=$(dirname "$0")
 
+<%_ if (buildToolMaven) { _%>
 if [ -f "$basedir/mvnw" ]; then
   bindir="$basedir/target/node"
   repodir="$basedir/target/node/node_modules"
   installCommand="$basedir/mvnw --batch-mode -ntp -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
-elif [ -f "$basedir/gradlew" ]; then
+<%_ } else if (buildToolGradle) { _%>
+if [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"
-  installCommand="$basedir/gradlew npmSetup"
+  installCommand="$basedir/gradlew npmSetup --no-daemon"
+<%_ } _%>
 else
   echo "Using npm installed globally"
   exec npm "$@"