generator-reshow 0.17.21 → 0.17.25

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

@@ -6,10 +6,10 @@ DIR=$(
 )
 cd $DIR
 SWJS=${DIR}/service-worker.js
-webpackEnabled=$(awk -F "=" '/^webpackEnabled/ {print $2}' $DIR/.yo)
+webpackEnabled=$([ -e "$DIR/.yo" ] && awk -F "=" '/^webpackEnabled/ {print $2}' $DIR/.yo)
 
 conf='{'
-conf+='"assetsRoot":"/assets/",'
+conf+='"assetsRoot":"./assets/",'
 conf+='"externals":{},'
 conf+='"indexTpl":"'${DIR}/index.tpl'",'
 conf+='"indexHtml":"'${DIR}/index.html'",'
@@ -27,14 +27,6 @@ if [ "x$webpackEnabled" == "xon" ]; then
   webpack='npm run webpack --'
 fi
 
-checkBabel() {
-  if [ ! -e ".babelrc" ] && [ ! -e "../../packages" ]; then
-    if [ -e ${DIR}/node_modules/reshow-app/.babelrc ]; then
-      cp ${DIR}/node_modules/reshow-app/.babelrc ${DIR}/.babelrc
-    fi
-  fi
-}
-
 killBy() {
   ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
 }
@@ -45,7 +37,7 @@ stop() {
     cat webpack.pid | xargs -I{} kill -9 {}
     npm run clean:webpack
   fi
-  rm $SWJS
+  [ -e "$SWJS" ] && rm $SWJS
   echo "Stop done"
 }
 
@@ -74,7 +66,6 @@ startServer() {
 production() {
   stop
   echo "Production Mode"
-  checkBabel
   npm run build
   if [ ! -z "$webpack" ]; then
     ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
@@ -84,7 +75,6 @@ production() {
 analyzer() {
   stop
   echo "Analyzer Mode"
-  checkBabel
   npm run build
   [ ! -z "$webpack" ] && CONFIG=$conf BUNDLE='{}' $webpack
 }
@@ -92,24 +82,20 @@ analyzer() {
 develop() {
   stop
   echo "Develop Mode"
-  checkBabel
   npm run build
   [ ! -z "$webpack" ] && CONFIG=$conf $webpack
 }
 
 watch() {
-  stop
   echo "Watch Mode"
-  checkBabel
   npm run build:es:ui -- --watch &
   npm run build:es:src -- --watch &
 }
 
 hot() {
   stop
-  rm $SWJS
+  [ -e "$SWJS" ] && rm $SWJS
   echo "Hot Mode"
-  checkBabel
   npm run build:es:ui -- --watch &
   npm run build:es:src -- --watch &
   [ ! -z "$webpack" ] && sleep 10 && HOT_UPDATE=1 CONFIG=$conf $webpack serve &
@@ -139,7 +125,7 @@ case "$1" in
     ;;
   *)
     develop
-    exit
+    exit 0
     ;;
 esac
 

package/generators/npm/index.js

@@ -85,6 +85,10 @@ module.exports = class extends YoGenerator {
         data.files = data.files.filter((f) => f !== "build");
         data.files.push("src");
       }
+      if (!this.payload.isUseWebpack) {
+        delete data.scripts["webpack"];
+        delete data.scripts["clean:webpack"];
+      }
       return data;
     });
   }

package/generators/npm/templates/package.json

@@ -20,11 +20,16 @@
     "<%= mainName %>": "./build/cjs/src/index.js"
   },
   "scripts": {
+    "update-compile-sh": "yo reshow:compile-sh",
+    "webpack": "webpack",
+    "start": "ws",
+    "format": "prettier-eslint --write 'src/**/*.js' 'ui/**/*.js*'",
+    "clean:webpack": "find ./assets -name '*.*' | xargs rm -rf && rm -rf workbox-*.js",
     "clean": "find ./build -name '*.*' | xargs rm -rf",
     "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src<%= babelRootMode %>",
     "build:es": "BABEL_ENV=es babel src -d build/es/src<%= babelRootMode %>",
     "build": "npm run clean && npm run build:cjs && npm run build:es",
-    "mochaFor": "mocha -r jsdom-global/register",
+    "mochaFor": "mocha -r global-jsdom/register",
     "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"

package/package.json

@@ -1,37 +1,35 @@
 {
+  "version": "0.17.25",
   "name": "generator-reshow",
-  "version": "0.17.21",
-  "description": "Yeoman generator for reshow. (app, generator, ...etc)",
-  "author": "Hill <hill@kimo.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/react-atomic/reshow",
     "directory": "packages/generator-reshow"
   },
-  "keywords": [
-    "yeoman-generator"
-  ],
+  "homepage": "https://github.com/react-atomic/reshow/tree/main/packages/generator-reshow",
+  "description": "Yeoman generator for reshow. (app, generator, ...etc)",
+  "keywords": ["yeoman-generator"],
+  "author": "Hill <hill@kimo.com>",
   "license": "ISC",
-  "main": "",
   "dependencies": {
     "yo-reshow": "*"
   },
   "devDependencies": {
     "yo-unit": "*"
   },
-  "files": [
-    "generators"
-  ],
   "scripts": {
     "mochaFor": "mocha",
     "mocha": "npm run mochaFor -- 'generators/**/__tests__/*.js'",
     "test": "npm run mocha",
     "prepublishOnly": "npm run test"
   },
+  "bugs": {
+    "url": "https://github.com/react-atomic/reshow/issues"
+  },
   "engines": {
     "node": ">=12"
   },
-  "bugs": {
-    "url": "https://github.com/react-atomic/reshow/issues"
-  }
+  "files": [
+    "generators"
+  ]
 }