generator-reshow 0.16.0 → 0.16.3

package/generators/app/templates/README.md

@@ -1,6 +1,12 @@
-# `APP`
+# `<%= mainName %>`
 
-> TODO: description
+> <%= description %> 
+
+## Repository 
+* `GIT`
+   * <%= repositoryHomepage %>
+* `NPM`
+   * https://www.npmjs.com/package/<%= mainName %>
 
 ## Usage
 

package/generators/app/templates/package.json

@@ -9,8 +9,7 @@
   "keywords": ["app", "reshow-app"],
   "author": "",
   "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
+  "dependencies": {
     "get-object-value": "*",
     "organism-react-ajax": "*",
     "organism-react-navigation": "*",

package/generators/app/templates/src/usePage.js

@@ -28,7 +28,7 @@ const usePage = (props) => {
         });
       });
     };
-  });
+  }, []);
 };
 
 export default usePage;

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

@@ -1,13 +1,19 @@
-#!/bin/sh
+#!/bin/bash
+
+DIR=$( cd "$(dirname "$0")" ; pwd -P )
+cd $DIR
+SWJS=${DIR}/service-worker.js
 
 conf='{'
-conf+='"assetsRoot":"./assets/",'
-conf+='"externals":{"d3": "d3"},'
+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+='}'
 
-DIR=$( cd "$(dirname "$0")" ; pwd -P )
-cd $DIR
 OPEN=$(which xdg-open 2>/dev/null)
 if [ -z "$OPEN" ]; then 
   OPEN="open"
@@ -25,26 +31,16 @@ checkBabel(){
   fi
 }
 
-production(){
-    echo "Production Mode";
-    checkBabel
-    npm run build
-    CONFIG=$conf NODE_ENV=production $webpack
-}
-
-analyzer(){
-    echo "Analyzer Mode";
-    checkBabel
-    npm run build
-    CONFIG=$conf BUNDLE='{}' $webpack
+killBy(){
+    ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
 }
 
-develop(){
-    stop
-    echo "Develop Mode";
-    checkBabel
-    npm run build
-    CONFIG=$conf $webpack
+stop(){
+    killBy ${DIR}/node_modules/.bin/babel 
+    cat webpack.pid | xargs -I{} kill -9 {}
+    npm run clean
+    rm $SWJS
+    echo "Stop done";
 }
 
 stopServer(){
@@ -69,23 +65,36 @@ startServer(){
     fi
 }
 
-killBy(){
-    ps -eo pid,args | grep $1 | grep -v grep | awk '{print $1}' | xargs -I{} kill -9 {}
+production(){
+    stop
+    echo "Production Mode";
+    checkBabel
+    npm run build
+    ENABLE_SW=1 CONFIG=$conf NODE_ENV=production $webpack
 }
 
-stop(){
-    killBy ${DIR}/node_modules/.bin/babel 
-    cat webpack.pid | xargs -I{} kill -9 {}
-    npm run clean
-    echo "Stop done";
+analyzer(){
+    stop
+    echo "Analyzer Mode";
+    checkBabel
+    npm run build
+    CONFIG=$conf BUNDLE='{}' $webpack
+}
+
+develop(){
+    stop
+    echo "Develop Mode";
+    checkBabel
+    npm run build
+    CONFIG=$conf $webpack
 }
 
 watch(){
     stop 
     echo "Watch Mode";
     checkBabel
-    npm run build:ui -- --watch &
-    npm run build:src -- --watch &
+    npm run build:es:ui -- --watch &
+    npm run build:es:src -- --watch &
     sleep 10 
     CONFIG=$conf $webpack --watch &
 }
@@ -94,16 +103,17 @@ watchTest(){
     stop 
     echo "Watch Test";
     checkBabel
-    npm run build:test:ui -- --watch &
-    npm run build:test:src -- --watch &
+    npm run build:cjs:ui -- --watch &
+    npm run build:cjs:src -- --watch &
 }
 
 hot(){
-    stop 
+    stop
+    rm $SWJS 
     echo "Hot Mode";
     checkBabel
-    npm run build:ui -- --watch &
-    npm run build:src -- --watch &
+    npm run build:es:ui -- --watch &
+    npm run build:es:src -- --watch &
     sleep 5
     HOT_UPDATE=1 CONFIG=$conf $webpack serve &
 }
@@ -116,7 +126,7 @@ case "$1" in
     analyzer 
     ;;
   s)
-    startServer $2 
+    startServer $2
     ;;
   ss)
     stopServer

package/generators/docker/README.md

@@ -0,0 +1,9 @@
+# `docker`
+
+> TODO: description 
+
+## Usage
+
+```
+npx yonpx docker
+```

package/generators/docker/__tests__/Test.js

@@ -0,0 +1,45 @@
+/**
+ * https://yeoman.io/authoring/testing.html
+ * https://gilsondev.gitbooks.io/yeoman-authoring/content/authoring/unit_testing.html
+ *
+ * https://github.com/yeoman/yeoman-assert/blob/main/index.js
+ * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
+ */
+
+const getYoUnit = require("yo-unit");
+const { YoTest, assert } = getYoUnit();
+
+describe("!! docker !!", () => {
+  let runResult;
+
+  before(async () => {
+    runResult = await YoTest({
+      source: __dirname + "/../.",
+      params: {
+        isReady: true,
+        appNamee: "foo",
+        description: "foo-desc",
+        keyword: "foo-keyword",
+      },
+    });
+  });
+
+  after(() => {
+    if (runResult) {
+      runResult.restore();
+    }
+  });
+
+  it("should have folder", () => {
+    //    assert.file(["src", "ui"]);
+  });
+
+  it("should have file", () => {
+    //   assert.file(["compile.sh", "index.html"]);
+  });
+
+  it("should have content", () => {
+    //    assert.fileContent('composer.json', 'foo-desc');
+    //    assert.fileContent('.circleci/config.yml', 'foo');
+  });
+});

package/generators/docker/index.js

@@ -0,0 +1,100 @@
+const getYo = require("yo-reshow");
+const { YoGenerator, YoHelper, commonPrompt } = getYo();
+
+/**
+ * docker Generator
+ */
+module.exports = class extends YoGenerator {
+  /**
+   * Run loop (Life cycle)
+   * https://yeoman.io/authoring/running-context.html#the-run-loop
+   *
+   * 1. initializing
+   * 2. prompting
+   * 3. configuring
+   * 4. default
+   * 5. writing
+   * 6. conflicts
+   * 7. install
+   * 8. end
+   */
+
+  /**
+   * Questions.
+   *
+   * https://www.alwaystwisted.com/post.php?s=using-lists-in-a-yeoman-generator
+   * https://github.com/SBoudrias/Inquirer.js
+   */
+  async prompting() {
+    const {
+      say,
+      handleAnswers,
+      mergePromptOrOption,
+      promptChainLocator,
+      promptChain,
+    } = YoHelper(this);
+
+    const prompts = [
+      ...commonPrompt.mainName(this),
+      ...commonPrompt.desc(this),
+      ...commonPrompt.repository(this, {
+        defaultRepositoryName: "[REPOSITORY_NAME]",
+        defaultRepositoryOrgName: "[REPOSITORY_ORG_NAME]",
+      }),
+      {
+        type: "input",
+        name: "dockerImageName",
+        message: "Please input your docker-image-name?",
+        default: "[DOCKER_IMAGE_NAME]",
+      },
+      {
+        type: "input",
+        name: "dockerOrgName",
+        message: "Please input your docker-org-name?",
+        default: "[DOCKER_ORG_NAME]",
+      },
+      {
+        type: "input",
+        name: "folderPrefix",
+        message: "Please input your folder-prefix?",
+        default: "",
+      },
+      /*
+      {
+        type: "input",
+        name: "xxx",
+        message: "Please input xxx?",
+        default: "",
+      },
+      */
+    ];
+
+    const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
+      promptChain(promptChainLocator(nextPrompts))
+    );
+    handleAnswers(answers);
+  }
+
+  writing() {
+    this.payload.folderPrefixGitIgnore = this.payload.folderPrefix
+      ? this.payload.folderPrefix + "*"
+      : "";
+
+    this.env.options.nodePackageManager = "yarn";
+    const { cp, chMainName } = YoHelper(this);
+
+    // handle change to new folder
+    chMainName();
+
+    // handle copy file
+    cp(".env.build", null, this.payload);
+    cp("Dockerfile", null, this.payload);
+    cp("README.md", null, this.payload);
+    cp("_circleci", ".circleci", this.payload);
+    cp("_gitignore", ".gitignore", this.payload);
+    cp("build.sh", null, this.payload);
+    cp("compile.sh", null, this.payload);
+    cp("install-packages.sh", null, this.payload);
+    cp("support", null, this.payload);
+  }
+};

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

@@ -0,0 +1,4 @@
+sourceImage=<%= mainName %>
+targetImage=<%= mainName %>
+VERSION=0.0
+FOLDER_PREFIX=<%= folderPrefix %>

package/generators/docker/templates/Dockerfile

@@ -0,0 +1,9 @@
+ARG VERSION=${VERSION:-[VERSION]}
+
+FROM alpine:3.15
+
+# apk
+COPY ./install-packages.sh /usr/local/bin/
+RUN apk update && apk add bash bc \
+  && INSTALL_VERSION=$VERSION install-packages.sh \
+  && rm /usr/local/bin/install-packages.sh;

package/generators/docker/templates/README.md

@@ -0,0 +1,12 @@
+[![CircleCI](https://circleci.com/gh/<%= repositoryOrgName %>/<%= repositoryName %>/tree/main.svg?style=svg)](https://circleci.com/gh/<%= repositoryOrgName %>/<%= repositoryName %>/tree/main)
+[![Docker Pulls](https://img.shields.io/docker/pulls/<%= dockerOrgName %>/<%= dockerImageName %>.svg)](https://hub.docker.com/r/<%= dockerOrgName %>/<%= dockerImageName %>)
+
+# `<%= mainName %>`
+
+> <%= description %> 
+
+## Usage
+
+```
+
+```

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

@@ -0,0 +1,52 @@
+version: 2.1
+
+executors:
+  docker-publisher:
+    docker:
+      - image: circleci/buildpack-deps:18.04
+
+jobs:
+  build-and-publish:
+    parameters:
+      docker-tag:
+        type: string
+      folder-prefix:
+        type: string
+        default: "<%= folderPrefix %>"
+    executor: docker-publisher
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.7
+          docker_layer_caching: true
+      - run:
+          name: Log time
+          command: date
+      - run:
+          name: Gen Docker file
+          command: |
+            ./build.sh << parameters.docker-tag >>
+            ls -la << parameters.folder-prefix >><< parameters.docker-tag >>
+      - run:
+          name: build Docker image
+          command: |
+            VERSION=$(support/VERSION.sh)
+            IMAGE_NAME=$(support/targetImage.sh)
+            BUILD_VERSION=<< parameters.docker-tag >>
+            BUILD_FOLDER=<< parameters.folder-prefix >><< parameters.docker-tag >>
+            BUILD_ARG=""
+            docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
+              -t $IMAGE_NAME:${BUILD_VERSION} \
+              ./${BUILD_FOLDER}
+      - run:
+          name: Publish Docker Image to Docker Hub
+          command: |
+            ./compile.sh p << parameters.docker-tag >>
+
+workflows:
+  run-job:
+    jobs:
+      - build-and-publish:
+          matrix:
+            parameters:
+              docker-tag: ["0.0"]

package/generators/docker/templates/_gitignore

@@ -0,0 +1,3 @@
+archive.tar
+.*.sw?
+<%= folderPrefixGitIgnore %>

package/generators/docker/templates/build.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
+
+do_build() {
+  SED_REPLACE_VER=$1
+  DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${SED_REPLACE_VER}
+  mkdir -p ${DEST_FOLDER}
+  echo "building --- Version: " $SED_REPLACE_VER "-->"
+  DEST_FILE=${DEST_FOLDER}/Dockerfile
+  cp Dockerfile ${DEST_FILE}
+  cp install-packages.sh ${DEST_FOLDER}
+  sed -i -e "s|\[VERSION\]|$SED_REPLACE_VER|g" ${DEST_FILE}
+  if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
+}
+
+do_build $1

package/generators/docker/templates/compile.sh

@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+sourceImage=$(${DIR}/support/sourceImage.sh)
+targetImage=$(${DIR}/support/targetImage.sh)
+archiveFile=$DIR/archive.tar
+VERSION=$(${DIR}/support/VERSION.sh)
+DOCKER_FILE=${DOCKER_FILE:-Dockerfile}
+
+list() {
+  docker images | head -10
+}
+
+tag() {
+  tag=$1
+  if [ -z "$tag" ]; then
+    if [ -z "$VERSION" ]; then
+      tag=latest
+    else
+      tag=$VERSION
+    fi
+  fi
+  echo "* <!-- Start to tag: ${tag}"
+  echo $tag
+  docker tag $sourceImage ${targetImage}:$tag
+  list
+  echo "* Finish tag -->"
+}
+
+push() {
+  PUSH_VERSION=${1:-$VERSION}
+  LATEST_TAG=${2:-latest}
+  if [ -z "$PUSH_VERSION" ]; then
+    tag=latest
+  else
+    tag=$PUSH_VERSION
+    if [ "x$LATEST_TAG" != "xlatest" ]; then
+      tag=$LATEST_TAG-$PUSH_VERSION
+    fi
+  fi
+  echo "* <!-- Start to push ${targetImage}:$tag"
+  IS_LOGIN=$(echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_LOGIN" --password-stdin)
+  if ! [[ $IS_LOGIN =~ "Succeeded" ]]; then
+    echo "Login Failed."
+    exit 1
+  fi
+  docker push ${targetImage}:$tag
+  echo "* Finish pushed -->"
+  echo ""
+  if [ ! -z "$1" ]; then
+    if [ "x$VERSION" == "x$PUSH_VERSION" ]; then
+      echo "* <!-- Start to auto push ${targetImage}:${LATEST_TAG}"
+      docker tag ${targetImage}:$tag ${targetImage}:${LATEST_TAG}
+      docker push ${targetImage}:${LATEST_TAG}
+      echo "* Finish pushed -->"
+    fi
+  fi
+}
+
+build() {
+  if [ -z "$1" ]; then
+    NO_CACHE=""
+  else
+    NO_CACHE="--no-cache"
+  fi
+  BUILD_ARG=""
+  if [ ! -z "$VERSION" ]; then
+    BUILD_ARG="$BUILD_ARG --build-arg VERSION=${VERSION}"
+  fi
+  echo build: ${DIR}/${DOCKER_FILE}
+  if [ "x" != "x$NO_CACHE" ]; then
+    echo nocache: ${NO_CACHE}
+  fi
+  docker build ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $sourceImage ${DIR}
+  list
+}
+
+save() {
+  echo save
+  docker save $sourceImage > $archiveFile
+}
+
+restore() {
+  echo restore
+  docker save --output $archiveFile $sourceImage
+}
+
+case "$1" in
+  save)
+    save
+    ;;
+  restore)
+    restore
+    ;;
+  p)
+    push $2 $3
+    ;;
+  t)
+    tag $2
+    ;;
+  nocache)
+    build --no-cache
+    ;;
+  auto)
+    build
+    tag
+    ;;
+  b)
+    build
+    ;;
+  l)
+    list
+    ;;
+  *)
+    echo "$0 [save|restore|p|t|nocache|auto|b|l]"
+    exit
+    ;;
+esac
+
+exit $?

package/generators/docker/templates/enter

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+VERSION=${VERSION:-latest}
+SOURCE_IMAGE=$(${DIR}/support/sourceImage.sh)
+
+C=''
+for i in "$@"; do
+  i="${i//\\/\\\\}"
+  C="$C \"${i//\"/\\\"}\""
+done
+
+pid=$$
+
+cli='env docker run --rm -it'
+cli+=" -v $DIR:$DIR"
+cli+=" -w $DIR"
+cli+=" --name ${SOURCE_IMAGE}-${pid} ${SOURCE_IMAGE}:${VERSION}"
+cli+=" sh ${C}"
+
+bash -c "$cli"

package/generators/docker/templates/install-packages.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+INSTALL=""
+
+BUILD_DEPS=""
+
+echo "###"
+echo "# Will install"
+echo "###"
+echo ""
+echo $INSTALL
+echo ""
+echo "###"
+echo "# Will build package"
+echo "###"
+echo ""
+echo $BUILD_DEPS
+echo ""
+
+apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL
+
+apk del -f .build-deps && rm -rf /var/cache/apk/* || exit 1
+
+exit 0

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

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

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

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

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

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

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

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

package/generators/generator/templates/index.js

@@ -29,9 +29,7 @@ module.exports = class extends YoGenerator {
     const {
       say,
       handleAnswers,
-      mergePromptOrOption,
-      promptChainLocator,
-      promptChain,
+      promptChainAll,
     } = YoHelper(this);
 
     const prompts = [
@@ -47,14 +45,13 @@ module.exports = class extends YoGenerator {
       */
     ];
 
-    const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
-      promptChain(promptChainLocator(nextPrompts))
-    );
-    handleAnswers(answers, payload => { say(payload) });
+    const answers = await promptChainAll(prompts);
+    handleAnswers(answers);
   }
 
   writing() {
     this.env.options.nodePackageManager = "yarn";
+    this.options.skipInstall = true;
     const { cp,  chMainName } = YoHelper(this);
 
     // handle change to new folder