generator-reshow 0.17.38 → 0.17.40

package/generators/compile-sh/templates/compile.sh

@@ -4,19 +4,34 @@ DIR=$(
   cd "$(dirname "$0")"
   pwd -P
 )
+CHK_PHP=$(which php 2>/dev/null)
+PHP_CONFIG=$DIR/cnfig/config.php
+YO_CONFIG=$DIR/.yo
+WEBPACK_SERVER_CONFIG="--config webpack.server.mjs"
+
 cd $DIR
-SWJS=${DIR}/service-worker.js
-webpackEnabled=$([ -e "$DIR/.yo" ] && awk -F "=" '/^webpackEnabled/ {print $2}' $DIR/.yo)
-
-conf='{'
-conf+='"assetsRoot":"./assets/",'
-conf+='"externals":{},'
-conf+='"indexTpl":"'${DIR}/index.tpl'",'
-conf+='"indexHtml":"'${DIR}/index.html'",'
-conf+='"swDest":"'${SWJS}'",'
-# conf+='"swDebug":true,'
-conf+='"hotPort": "'${hotPort:-3088}'"'
-conf+='}'
+webpackEnabled=$([ -e "$YO_CONFIG" ] && awk -F "=" '/^webpackEnabled/ {print $2}' $YO_CONFIG)
+serverEnabled=$([ -e "$YO_CONFIG" ] && awk -F "=" '/^serverEnabled/ {print $2}' $YO_CONFIG)
+HTDOCS=${DIR}$([ -e "$YO_CONFIG" ] && awk -F "=" '/^HTDOCS/ {print $2}' $YO_CONFIG)
+SWJS=${HTDOCS}/service-worker.js
+
+if [ ! -z "$CHK_PHP" ] && [ -s "$PHP_CONFIG" ]; then
+  conf=`DUMP=cli php -r "include('$PHP_CONFIG');"`
+else
+  conf='{'
+  conf+='"assetsRoot":"./assets/",'
+  conf+='"externals":{},'
+  if [ -z "$serverEnabled" ]; then
+    conf+='"indexTpl":"'${DIR}/index.tpl'",'
+    conf+='"indexHtml":"'${DIR}/index.html'",'
+  fi
+  conf+='"swDest":"'${SWJS}'",'
+  # conf+='"swDebug":true,'
+  conf+='"hotPort": "'${hotPort:-3088}'"'
+  conf+='}'
+fi
+echo $conf;
+
 
 OPEN=$(which xdg-open 2> /dev/null)
 if [ -z "$OPEN" ]; then
@@ -31,16 +46,6 @@ killBy() {
   ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
 }
 
-stop() {
-  killBy ${DIR}/node_modules/.bin/babel
-  if [ ! -z "$webpack" ]; then
-    cat webpack.pid | xargs -I{} kill -9 {}
-    npm run clean:webpack
-  fi
-  [ -e "$SWJS" ] && rm $SWJS
-  echo "Stop done"
-}
-
 stopServer() {
   killBy ${DIR}/node_modules/.bin/ws
   echo "stop server done"
@@ -63,12 +68,26 @@ startServer() {
   fi
 }
 
+stop() {
+  killBy ${DIR}/node_modules/.bin/babel
+  if [ ! -z "$webpack" ]; then
+    cat webpack.pid | xargs -I{} kill -9 {}
+    npm run clean:webpack
+    rm $HTDOCS/workbox-*.js
+  fi
+  [ -e "$SWJS" ] && rm $SWJS
+  echo "Stop done"
+}
+
 production() {
   stop
   echo "Production Mode"
   npm run build
   if [ ! -z "$webpack" ]; then
     ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
+    if [ ! -z "$serverEnabled" ]; then
+      ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack $WEBPACK_SERVER_CONFIG
+    fi
   fi
 }
 
@@ -83,7 +102,7 @@ develop() {
   stop
   echo "Develop Mode"
   npm run build
-  [ ! -z "$webpack" ] && CONFIG=$conf $webpack
+  [ ! -z "$webpack" ] && CONFIG=$conf $webpack && [ ! -z "$serverEnabled" ] && CONFIG=$conf $webpack $WEBPACK_SERVER_CONFIG
 }
 
 watch() {
@@ -98,7 +117,15 @@ hot() {
   [ ! -z "$webpack" ] && sleep 10 && HOT_UPDATE=1 CONFIG=$conf $webpack serve &
 }
 
+nodeTest(){
+    echo '{"themePath":"hello"}' | node ./server.js
+    echo ""
+}
+
 case "$1" in
+  node)
+    nodeTest
+    ;;
   p)
     production
     ;;

package/generators/package-json/templates/package.json

@@ -30,7 +30,7 @@
     "webpack": "webpack",
     "start": "ws",
     "format": "prettier-eslint --write 'src/**/*.js'",
-    "clean:webpack": "find ./assets -name '*.*' | xargs rm -rf && rm -rf workbox-*.js",
+    "clean:webpack": "find ./assets -name '*.*' | xargs rm -rf",
     "clean": "find ./build ./types -name '*.*' | xargs rm -rf",
     "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --ignore /**/__tests__<%= babelRootMode %>",
     "build:es": "BABEL_ENV=es babel src -d build/es/src --out-file-extension .mjs<%= babelRootMode %>",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.38",
+  "version": "0.17.40",
   "name": "generator-reshow",
   "repository": {
     "type": "git",