generator-reshow 0.16.3 → 0.17.1

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

@@ -10,18 +10,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "get-object-value": "*",
-    "organism-react-ajax": "*",
-    "organism-react-navigation": "*",
-    "organism-react-popup": "*",
-    "organism-react-progress": "*",
     "pmvc_react_admin": "*",
-    "react": "^16.x",
-    "react-dom": "^16.x",
-    "reshow": "*",
+    "react": "^18.x",
+    "react-dom": "^18.x",
     "reshow-app": "*",
-    "reshow-constant": "*",
-    "reshow-url": "*",
     "ricon": "*"
   },
   "scripts": {

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/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

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

@@ -3,7 +3,8 @@ version: 2.1
 executors:
   docker-publisher:
     docker:
-      - image: circleci/buildpack-deps:18.04
+      # https://github.com/CircleCI-Public/cimg-base
+      - image: cimg/base:current
 
 jobs:
   build-and-publish:

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

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

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

package/generators/update-esm-export/__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("!! update-esm-export !!", () => {
   let runResult;

package/generators/update-esm-export/index.js

@@ -1,6 +1,4 @@
-const getYo = require("yo-reshow");
-const { KEYS } = require("reshow-constant");
-const { YoGenerator, YoHelper, commonPrompt } = getYo();
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
 
 /**
  * update-esm-export Generator
@@ -27,32 +25,46 @@ module.exports = class extends YoGenerator {
    * https://github.com/SBoudrias/Inquirer.js
    */
   async prompting() {
-    const {
-      say,
-      exit,
-      isFile,
-      getDotYo,
-      glob,
-      updateJSON,
-    } = YoHelper(this);
+    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 {
+      srcArr,
+      prependArr,
+      moreKeyArr,
+      moreValArr,
+      pkgjson,
+      appendArr,
+      requirePrependArr,
+      requireAppendArr,
+      importPrependArr,
+      importAppendArr,
+    } = 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}`;
+          let content;
+          if (appendArr) {
+            const append = appendArr[index];
+            content = `${prepend}${filename}${append}`;
+          } else {
+            content = {
+              require: `${requirePrependArr[index]}${filename}${requireAppendArr[index]}`,
+              import: `${importPrependArr[index]}${filename}${importAppendArr[index]}`,
+            };
+          }
+          let nextKey = `${prepend}${filename}`;
+          if (nextKey === "./index") {
+            nextKey = ".";
+          }
+          nextExports[nextKey] = content;
         },
         true
       );
@@ -63,20 +75,27 @@ module.exports = class extends YoGenerator {
 
     const pkgFile = isFile(pkgjson);
     if (pkgFile) {
-      updateJSON(null, pkgFile, null, ({ exports, ...json }) => {
+      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]
+                next: nextExports[key],
               };
             }
-            delete exports[key];
+            if (exports[key] && nextExports[key]) {
+              delete exports[key];
+              delete nextExports[key];
+            }
           });
-          const allDiff = {...diff, ...exports};
-          this.log({allDiff});
+          const allDiff = {
+            new: nextExports,
+            willClean: exports,
+            modify: diff,
+          };
+          this.log({ allDiff });
           return null;
         } else {
           json.exports = nextExports;
@@ -84,7 +103,6 @@ module.exports = class extends YoGenerator {
         }
       });
     }
-
   }
 
   writing() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-reshow",
-  "version": "0.16.3",
+  "version": "0.17.1",
   "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"