generator-reshow 0.17.15 → 0.17.18

package/README.md

@@ -9,3 +9,9 @@ npx yonpx reshow my-app
 cd my-app
 npm start
 ```
+
+## GIT
+https://github.com/react-atomic/reshow/tree/main/packages/generator-reshow
+
+## NPM
+https://www.npmjs.com/package/generator-reshow

package/generators/app/templates/.gitignore

@@ -0,0 +1,8 @@
+node_modules
+npm-debug.log
+coverage*
+.tern-port
+v8.log
+build
+.*.sw?
+webpack.pid

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

@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-DIR=$( cd "$(dirname "$0")" ; pwd -P )
+DIR=$(
+  cd "$(dirname "$0")"
+  pwd -P
+)
 cd $DIR
 SWJS=${DIR}/service-worker.js
 
@@ -14,8 +17,8 @@ conf+='"swDest":"'${SWJS}'",'
 conf+='"hotPort": "'${hotPort:-3088}'"'
 conf+='}'
 
-OPEN=$(which xdg-open 2>/dev/null)
-if [ -z "$OPEN" ]; then 
+OPEN=$(which xdg-open 2> /dev/null)
+if [ -z "$OPEN" ]; then
   OPEN="open"
 fi
 
@@ -23,7 +26,7 @@ if [ "x<%= webpackEnabled %>" == "xon" ]; then
   webpack='npm run webpack --'
 fi
 
-checkBabel(){
+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
@@ -31,91 +34,96 @@ checkBabel(){
   fi
 }
 
-killBy(){
-    ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
+killBy() {
+  ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
 }
 
-stop(){
-    killBy ${DIR}/node_modules/.bin/babel 
-    cat webpack.pid | xargs -I{} kill -9 {}
-    npm run clean
-    rm $SWJS
-    echo "Stop done";
+stop() {
+  killBy ${DIR}/node_modules/.bin/babel
+  cat webpack.pid | xargs -I{} kill -9 {}
+  npm run clean
+  rm $SWJS
+  echo "Stop done"
 }
 
-stopServer(){
+stopServer() {
   killBy ${DIR}/node_modules/.bin/ws
-  echo "stop server done";
+  echo "stop server done"
 }
 
-startServer(){
-    stopServer
-    yarn
-    if [ ! -e "build" ]; then
-        develop
-    fi
-    port=${port-3000}
-    echo "Start server";
-    if [ "$1" == "open" ]; then
-        npm run start -- -p $port &
-        sleep 3 
-        $OPEN http://localhost:$port        
-    else
-        npm run start -- -p $port -v
-    fi
+startServer() {
+  stopServer
+  yarn
+  if [ ! -e "build" ]; then
+    develop
+  fi
+  port=${port-3000}
+  echo "Start server"
+  if [ "$1" == "open" ]; then
+    npm run start -- -p $port &
+    sleep 3
+    $OPEN http://localhost:$port
+  else
+    npm run start -- -p $port -v
+  fi
 }
 
-production(){
-    stop
-    echo "Production Mode";
-    checkBabel
-    npm run build
-    ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
+production() {
+  stop
+  echo "Production Mode"
+  checkBabel
+  npm run build
+  npm run clean:webpack
+  ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
 }
 
-analyzer(){
-    stop
-    echo "Analyzer Mode";
-    checkBabel
-    npm run build
-    CONFIG=$conf BUNDLE='{}' $webpack
+analyzer() {
+  stop
+  echo "Analyzer Mode"
+  checkBabel
+  npm run build
+  npm run clean:webpack
+  CONFIG=$conf BUNDLE='{}' $webpack
 }
 
-develop(){
-    stop
-    echo "Develop Mode";
-    checkBabel
-    npm run build
-    CONFIG=$conf $webpack
+develop() {
+  stop
+  echo "Develop Mode"
+  checkBabel
+  npm run build
+  npm run clean:webpack
+  CONFIG=$conf $webpack
 }
 
-watch(){
-    stop 
-    echo "Watch Mode";
-    checkBabel
-    npm run build:es:ui -- --watch &
-    npm run build:es:src -- --watch &
-    sleep 10 
-    CONFIG=$conf $webpack --watch &
+watch() {
+  stop
+  echo "Watch Mode"
+  checkBabel
+  npm run build:es:ui -- --watch &
+  npm run build:es:src -- --watch &
+  sleep 10
+  npm run clean:webpack
+  CONFIG=$conf $webpack --watch &
 }
 
-watchTest(){
-    stop 
-    echo "Watch Test";
-    checkBabel
-    npm run build:cjs:ui -- --watch &
-    npm run build:cjs:src -- --watch &
+watchTest() {
+  stop
+  echo "Watch Test"
+  checkBabel
+  npm run build:cjs:ui -- --watch &
+  npm run build:cjs:src -- --watch &
 }
 
-hot(){
-    stop
-    rm $SWJS 
-    echo "Hot Mode";
-    checkBabel
-    npm run build:es:ui -- --watch &
-    npm run build:es:src -- --watch &
-    sleep 5
-    HOT_UPDATE=1 CONFIG=$conf $webpack serve &
+hot() {
+  stop
+  rm $SWJS
+  echo "Hot Mode"
+  checkBabel
+  npm run build:es:ui -- --watch &
+  npm run build:es:src -- --watch &
+  sleep 10
+  npm run clean:webpack
+  HOT_UPDATE=1 CONFIG=$conf $webpack serve &
 }
 
 case "$1" in
@@ -123,7 +131,7 @@ case "$1" in
     production
     ;;
   a)
-    analyzer 
+    analyzer
     ;;
   s)
     startServer $2
@@ -135,17 +143,18 @@ case "$1" in
     hot
     ;;
   watch)
-    watch 
+    watch
     ;;
   watchTest)
     watchTest
     ;;
   stop)
-    stop 
+    stop
     ;;
   *)
     develop
     exit
+    ;;
 esac
 
 exit $?

package/generators/docker/README.md

@@ -2,7 +2,9 @@
 
 > Docker generator 
 
-## Environment Variables 
-
+## Environment Variables
 * DOCKER_LOGIN
 * DOCKER_PASSWORD
+
+### circleci sample url
+* https://app.circleci.com/settings/project/github/[git-org]/[git-repository-name]/environment-variables

package/generators/docker/index.js

@@ -56,7 +56,7 @@ module.exports = class extends YoGenerator {
         type: "input",
         name: "folderPrefix",
         message: "Please input your folder-prefix?",
-        default: "",
+        default: "ver-",
       },
       /*
       {

package/generators/docker/templates/.env.build

@@ -2,5 +2,5 @@ sourceImage=<%= sourceImage %>
 targetImage=<%= targetImage %>
 VERSION=0.0
 FOLDER_PREFIX=<%= folderPrefix %>
-COPY_FILES[]=Dockerfile
 COPY_FILES[]=install-packages.sh
+DOCKER_FILES[]=Dockerfile

package/generators/docker/templates/_circleci/config.yml

@@ -20,14 +20,23 @@ jobs:
       - run:
           name: Log time
           command: date
-      - run: FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
-          FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
-          ./build.sh << parameters.docker-tag >>
-          ls -la ${FOLDER}
-          echo "###"
-          echo "# --- Dockerfile Content ---"
-          echo "###"
-          cat ${FOLDER}/Dockerfile
+      - run:
+          name: Gen Docker file
+          command: |
+            FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
+            DOCKER_FILES=$(support/DOCKER_FILES.sh)
+            FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
+            ./build.sh << parameters.docker-tag >>
+            ls -la ${FOLDER}
+            for file in $DOCKER_FILES; do
+              echo ""
+              echo "###"
+              echo "# --- Dockerfile ($file) Content ---"
+              echo "###"
+              echo ""
+              cat ${FOLDER}/$file
+              echo ""
+            done
       - run:
           name: build Docker image
           command: |

package/generators/docker/templates/build.sh

@@ -7,21 +7,28 @@ DIR="$(
 
 FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
 COPY_FILES=$(${DIR}/support/COPY_FILES.sh)
+DOCKER_FILES=$(${DIR}/support/DOCKER_FILES.sh)
 BUILD_VERSION=$1
 
 if [ -z "$BUILD_VERSION" ]; then
   echo "Not set build version."
-  exit 1;
+  exit 1
 fi
 
 do_build() {
+  echo 'building --- Version: ' $BUILD_VERSION '-->'
   DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${BUILD_VERSION}
   mkdir -p ${DEST_FOLDER}
-  echo 'building --- Version: ' $BUILD_VERSION '-->'
+
   for file in $COPY_FILES; do [ -e "$file" ] && cp $file ${DEST_FOLDER}; done
-  DEST_FILE=${DEST_FOLDER}/Dockerfile
-  sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
-  if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
+  for file in $DOCKER_FILES; do
+    if [ -e "$file" ]; then
+      cp $file ${DEST_FOLDER}
+      DEST_FILE=${DEST_FOLDER}/$file
+      sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
+      if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
+    fi
+  done
 }
 
 do_build

package/generators/docker/templates/compile.sh

@@ -70,6 +70,9 @@ build() {
   if [ ! -z "$VERSION" ]; then
     BUILD_ARG="$BUILD_ARG --build-arg VERSION=${VERSION}"
   fi
+  if [ ! -z "$ALT_VERSION" ]; then
+    BUILD_ARG="$BUILD_ARG --build-arg ALT_VERSION=${ALT_VERSION}"
+  fi
   echo build: ${DIR}/${DOCKER_FILE}
   if [ "x" != "x$NO_CACHE" ]; then
     echo nocache: ${NO_CACHE}

package/generators/docker/templates/support/DOCKER_FILES.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+ENV=${DIR}/../.env.build
+
+if [ -z "$DOCKER_FILES" ]; then
+  DOCKER_FILES=$(awk -F "=" '/^DOCKER_FILES\[\]/ {print $2}' $ENV)
+fi
+
+echo $DOCKER_FILES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-reshow",
-  "version": "0.17.15",
+  "version": "0.17.18",
   "description": "Yeoman generator for reshow. (app, generator, ...etc)",
   "author": "Hill <hill@kimo.com>",
   "repository": {

package/generators/library/templates/Test.js

@@ -1,10 +0,0 @@
-import { expect } from "chai";
-
-import YourFunc from "../index";
-
-describe("Test <%= mainName %>", () => {
-  it("basic testt", () => {
-    /*your test code*/
-    YourFunc();
-  });
-});

package/generators/library/templates/compile.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-npm run build

package/generators/library/templates/src/index.js

@@ -1,3 +0,0 @@
-const YourFunc = (props) => {};
-
-export default YourFunc;

package/generators/npm/templates/Test.js

@@ -1,10 +0,0 @@
-const {expect} = require("chai");
-const {init} = require("../init");
-
-describe("Test <%= mainName %>", () => {
-  it("basic testt", () => {
-    /*your test code*/
-    const actual = init();
-    expect(actual).to.equal('bar');
-  });
-});

package/generators/npm/templates/src/index.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-const { init } = require("./init");
-
-init();

package/generators/npm/templates/src/init.js

@@ -1,8 +0,0 @@
-const init = (props) => {
-  console.log("foo");
-  return "bar";
-};
-
-module.exports = {
-  init,
-};