generator-reshow 0.16.2 → 0.17.0

package/generators/app/__tests__/TestApp.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("generator-reshow:app", () => {
   let runResult;

package/generators/app/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * App Generator

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/compile-sh/__tests__/Test.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! compile-sh !!", () => {
   let runResult;

package/generators/compile-sh/index.js

@@ -1,12 +1,12 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * compile-sh Generator
  */
 module.exports = class extends YoGenerator {
   writing() {
-    const { cp } = YoHelper(this);
-    cp("compile.sh", null, { webpackEnabled: this.options.webpackEnabled });
+    const { cp, getDotYo } = YoHelper(this);
+    const { webpackEnabled } = { ...this.options, ...getDotYo(this.options) };
+    cp("compile.sh", null, { webpackEnabled }, true);
   }
 };

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/__tests__/Test.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! docker !!", () => {
   let runResult;

package/generators/docker/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * docker Generator
@@ -37,6 +36,22 @@ module.exports = class extends YoGenerator {
     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",

package/generators/docker/templates/README.md

@@ -1,3 +1,6 @@
+[![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 %> 

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

@@ -2,8 +2,6 @@ version: 2.1
 
 executors:
   docker-publisher:
-    environment:
-      IMAGE_NAME: <%= mainName %>
     docker:
       - image: circleci/buildpack-deps:18.04
 
@@ -33,6 +31,7 @@ jobs:
           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=""

package/generators/docker/templates/compile.sh

@@ -42,16 +42,20 @@ push() {
     fi
   fi
   echo "* <!-- Start to push ${targetImage}:$tag"
-  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_LOGIN" --password-stdin
+  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 to push -->"
+  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 to push -->"
+      echo "* Finish pushed -->"
     fi
   fi
 }
@@ -67,7 +71,7 @@ build() {
     BUILD_ARG="$BUILD_ARG --build-arg VERSION=${VERSION}"
   fi
   echo build: ${DIR}/${DOCKER_FILE}
-  if [ -z "$NO_CACHE" ]; then
+  if [ "x" != "x$NO_CACHE" ]; then
     echo nocache: ${NO_CACHE}
   fi
   docker build ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $sourceImage ${DIR}

package/generators/generator/__tests__/TestGenerator.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! generator !!", () => {
   let runResult;

package/generators/generator/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * The Generator

package/generators/generator/templates/Test.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! <%= mainName %> !!", () => {
   let runResult;

package/generators/generator/templates/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * <%= mainName %> Generator
@@ -29,9 +28,7 @@ module.exports = class extends YoGenerator {
     const {
       say,
       handleAnswers,
-      mergePromptOrOption,
-      promptChainLocator,
-      promptChain,
+      promptChainAll,
     } = YoHelper(this);
 
     const prompts = [
@@ -47,14 +44,13 @@ module.exports = class extends YoGenerator {
       */
     ];
 
-    const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
-      promptChain(promptChainLocator(nextPrompts))
-    );
+    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

package/generators/library/__tests__/Test.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! library !!", () => {
   let runResult;

package/generators/library/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * Library Generator
@@ -59,7 +58,7 @@ module.exports = class extends YoGenerator {
     cp("package.json", null, this.payload);
     cp("src", null, this.payload);
     cp("Test.js", "src/__tests__/Test.js", this.payload);
-    cp("yarn.lock");
+    // cp("yarn.lock");
   }
 
   end() {

package/generators/library/templates/Test.js

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

package/generators/library/templates/compile.sh

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

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

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

package/generators/npm/__tests__/Test.js

@@ -6,8 +6,7 @@
  * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
  */
 
-const getYoUnit = require("yo-unit");
-const { YoTest, assert } = getYoUnit();
+const { YoTest, assert } = require("yo-unit");
 
 describe("!! npm !!", () => {
   let runResult;

package/generators/npm/index.js

@@ -1,5 +1,4 @@
-const getYo = require("yo-reshow");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * NPM Generator
@@ -63,7 +62,7 @@ module.exports = class extends YoGenerator {
     cp("src", null, this.payload);
     cp("README.md", null, this.payload);
     cp("Test.js", "src/__tests__/Test.js", this.payload);
-    cp("yarn.lock");
+    // cp("yarn.lock");
 
     updateJSON("package.json", null, this.payload, (data) => {
       data.repository = this.payload.repository;

package/generators/npm/templates/Test.js

@@ -0,0 +1,10 @@
+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

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

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

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

package/generators/update-esm-export/README.md

@@ -0,0 +1,9 @@
+# `update-esm-export`
+
+> update exm export 
+
+## Usage
+
+```
+npx yonpx update-esm-export
+```

package/generators/update-esm-export/__tests__/Test.js

@@ -0,0 +1,44 @@
+/**
+ * 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 { YoTest, assert } = require("yo-unit");
+
+describe("!! update-esm-export !!", () => {
+  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/update-esm-export/index.js

@@ -0,0 +1,88 @@
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
+
+/**
+ * update-esm-export 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, exit, isFile, getDotYo, glob, updateJSON } = YoHelper(this);
+    const pkg = isFile("package.json");
+
+    const opts = getDotYo();
+    if (!opts.exports) {
+      return;
+    }
+    const { srcArr, appendArr, prependArr, moreKeyArr, moreValArr, pkgjson } =
+      opts.exports;
+    const nextExports = {};
+    srcArr.forEach((v, index) => {
+      const prepend = prependArr[index];
+      const append = appendArr[index];
+      glob(
+        v,
+        ({ filename }) => {
+          nextExports[
+            `${prepend}${filename}`
+          ] = `${prepend}${filename}${append}`;
+        },
+        true
+      );
+    });
+    moreKeyArr?.forEach((v, index) => {
+      nextExports[v] = moreValArr[index];
+    });
+
+    const pkgFile = isFile(pkgjson);
+    if (pkgFile) {
+      updateJSON(null, pkgFile, null, ({ exports = {}, ...json }) => {
+        if (this.options.n) {
+          const diff = {};
+          KEYS(exports).forEach((key) => {
+            if (exports[key] !== nextExports[key]) {
+              diff[key] = {
+                prev: exports[key],
+                next: nextExports[key],
+              };
+            }
+            if (exports[key] && nextExports[key]) {
+              delete exports[key];
+              delete nextExports[key];
+            }
+          });
+          const allDiff = {
+            new: nextExports,
+            willClean: exports,
+            modify: diff,
+          };
+          this.log({ allDiff });
+          return null;
+        } else {
+          json.exports = nextExports;
+          return json;
+        }
+      });
+    }
+  }
+
+  writing() {}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-reshow",
-  "version": "0.16.2",
+  "version": "0.17.0",
   "description": "Yeoman generator for reshow. (app, generator, ...etc)",
   "author": "Hill <hill@kimo.com>",
   "repository": {
@@ -14,10 +14,10 @@
   "license": "ISC",
   "main": "",
   "dependencies": {
-    "yo-reshow": "^0.16.0"
+    "yo-reshow": "*"
   },
   "devDependencies": {
-    "yo-unit": "^0.16.0"
+    "yo-unit": "*"
   },
   "files": [
     "generators"

package/generators/app/templates/.gitignore

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