generator-reshow 0.17.19 → 0.17.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,5 @@
1
1
  import { VerticalMenu } from "pmvc_react_admin";
2
2
  import { SideMenu } from "organism-react-navigation";
3
- import get from "get-object-value";
4
3
  import { pageStore, ReLink } from "reshow";
5
4
  import { KEYS } from "reshow-constant";
6
5
 
@@ -6,9 +6,10 @@ DIR=$(
6
6
  )
7
7
  cd $DIR
8
8
  SWJS=${DIR}/service-worker.js
9
+ webpackEnabled=$(awk -F "=" '/^webpackEnabled/ {print $2}' $DIR/.yo)
9
10
 
10
11
  conf='{'
11
- conf+='"assetsRoot":"/assets/",'
12
+ conf+='"assetsRoot":"./assets/",'
12
13
  conf+='"externals":{},'
13
14
  conf+='"indexTpl":"'${DIR}/index.tpl'",'
14
15
  conf+='"indexHtml":"'${DIR}/index.html'",'
@@ -22,26 +23,20 @@ if [ -z "$OPEN" ]; then
22
23
  OPEN="open"
23
24
  fi
24
25
 
25
- if [ "x<%= webpackEnabled %>" == "xon" ]; then
26
+ if [ "x$webpackEnabled" == "xon" ]; then
26
27
  webpack='npm run webpack --'
27
28
  fi
28
29
 
29
- checkBabel() {
30
- if [ ! -e ".babelrc" ] && [ ! -e "../../packages" ]; then
31
- if [ -e ${DIR}/node_modules/reshow-app/.babelrc ]; then
32
- cp ${DIR}/node_modules/reshow-app/.babelrc ${DIR}/.babelrc
33
- fi
34
- fi
35
- }
36
-
37
30
  killBy() {
38
31
  ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
39
32
  }
40
33
 
41
34
  stop() {
42
35
  killBy ${DIR}/node_modules/.bin/babel
43
- cat webpack.pid | xargs -I{} kill -9 {}
44
- npm run clean:webpack
36
+ if [ ! -z "$webpack" ]; then
37
+ cat webpack.pid | xargs -I{} kill -9 {}
38
+ npm run clean:webpack
39
+ fi
45
40
  rm $SWJS
46
41
  echo "Stop done"
47
42
  }
@@ -71,54 +66,39 @@ startServer() {
71
66
  production() {
72
67
  stop
73
68
  echo "Production Mode"
74
- checkBabel
75
69
  npm run build
76
- ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
70
+ if [ ! -z "$webpack" ]; then
71
+ ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
72
+ fi
77
73
  }
78
74
 
79
75
  analyzer() {
80
76
  stop
81
77
  echo "Analyzer Mode"
82
- checkBabel
83
78
  npm run build
84
- CONFIG=$conf BUNDLE='{}' $webpack
79
+ [ ! -z "$webpack" ] && CONFIG=$conf BUNDLE='{}' $webpack
85
80
  }
86
81
 
87
82
  develop() {
88
83
  stop
89
84
  echo "Develop Mode"
90
- checkBabel
91
85
  npm run build
92
- CONFIG=$conf $webpack
86
+ [ ! -z "$webpack" ] && CONFIG=$conf $webpack
93
87
  }
94
88
 
95
89
  watch() {
96
- stop
97
90
  echo "Watch Mode"
98
- checkBabel
99
91
  npm run build:es:ui -- --watch &
100
92
  npm run build:es:src -- --watch &
101
- sleep 10
102
- CONFIG=$conf $webpack --watch &
103
- }
104
-
105
- watchTest() {
106
- stop
107
- echo "Watch Test"
108
- checkBabel
109
- npm run build:cjs:ui -- --watch &
110
- npm run build:cjs:src -- --watch &
111
93
  }
112
94
 
113
95
  hot() {
114
96
  stop
115
97
  rm $SWJS
116
98
  echo "Hot Mode"
117
- checkBabel
118
99
  npm run build:es:ui -- --watch &
119
100
  npm run build:es:src -- --watch &
120
- sleep 10
121
- HOT_UPDATE=1 CONFIG=$conf $webpack serve &
101
+ [ ! -z "$webpack" ] && sleep 10 && HOT_UPDATE=1 CONFIG=$conf $webpack serve &
122
102
  }
123
103
 
124
104
  case "$1" in
@@ -140,9 +120,6 @@ case "$1" in
140
120
  watch)
141
121
  watch
142
122
  ;;
143
- watchTest)
144
- watchTest
145
- ;;
146
123
  stop)
147
124
  stop
148
125
  ;;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "generator-reshow",
3
- "version": "0.17.19",
3
+ "version": "0.17.23",
4
4
  "description": "Yeoman generator for reshow. (app, generator, ...etc)",
5
5
  "author": "Hill <hill@kimo.com>",
6
6
  "repository": {