generator-reshow 0.17.34 → 0.17.35

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

@@ -88,16 +88,13 @@ develop() {
 
 watch() {
   echo "Watch Mode"
-  npm run build:es:ui -- --watch &
-  npm run build:es:src -- --watch &
+  npm run build:es -- --watch &
 }
 
 hot() {
   stop
-  [ -e "$SWJS" ] && rm $SWJS
   echo "Hot Mode"
-  npm run build:es:ui -- --watch &
-  npm run build:es:src -- --watch &
+  npm run build:es -- --watch &
   [ ! -z "$webpack" ] && sleep 10 && HOT_UPDATE=1 CONFIG=$conf $webpack serve &
 }
 

package/generators/npm/index.js

@@ -53,16 +53,14 @@ module.exports = class extends YoGenerator {
 
   writing() {
     this.env.options.nodePackageManager = "yarn";
-    const { cp, mkdir, chMainName, syncJSON } = YoHelper(this);
+    const { cp, chMainName, syncJSON } = YoHelper(this);
 
     // handle change to new folder
     chMainName(this.mainName);
 
     // handle copy file
-    cp("src", null, this.payload);
     cp("README.md", null, this.payload);
     cp(".gitignore", null, this.payload);
-    cp("Test.js", "src/__tests__/Test.js", this.payload);
 
     syncJSON("package.json", null, this.payload, (data) => {
       const keywords = this.payload.keyword?.split(",");
@@ -91,7 +89,6 @@ module.exports = class extends YoGenerator {
         data.files.push("src");
       }
       if (this.payload.babelUI) {
-        delete data.bin;
         data.scripts["build:cjs"] = data.scripts["build:ui:cjs"];
         data.scripts["build:es"] = data.scripts["build:ui:es"];
         data.scripts["mocha"] = data.scripts["mocha:ui"];
@@ -105,11 +102,22 @@ module.exports = class extends YoGenerator {
             data.scripts[key] += " --root-mode upward";
           });
         }
+        delete data.bin;
         ["build:ui:cjs", "build:ui:es", "mocha:ui"].forEach((key) => {
           delete data.scripts[key];
         });
-        mkdir("ui");
+        data.devDependencies["react"] = "^18.x";
+        data.devDependencies["react-dom"] = "^18.x";
+        data.devDependencies["reshow-unit"] = "*";
+        data.devDependencies["react-atomic-atom"] = "*";
+        delete data.devDependencies["reshow-unit-dom"];
+        cp("ui");
+        cp("babel.config.js");
+        cp("ui-src", "src");
+        cp("IndexTest.js", "ui/pages/__tests__/IndexTest.js", this.payload);
       } else {
+        cp("src", null, this.payload);
+        cp("Test.js", "src/__tests__/Test.js", this.payload);
         // clean babelUI script
         [
           "build:cjs:src",

package/generators/npm/templates/IndexTest.js

@@ -0,0 +1,11 @@
+import { expect } from "chai";
+import { render } from "reshow-unit";
+
+import Index from "../Index";
+
+describe("AjaxForm Test", () => {
+  it("basic test", () => {
+    const wrap = render(<Index />);
+    expect(wrap.html()).to.have.string("Hello, there.");
+  });
+});

package/generators/npm/templates/babel.config.js

@@ -0,0 +1 @@
+module.exports = require("react-atomic-atom/babel.config");

package/generators/npm/templates/ui/pages/Index.jsx

@@ -0,0 +1,2 @@
+const Index = props => <div>Hello, there.</div>
+export default Index;

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

@@ -0,0 +1,2 @@
+
+export { default as Index } from "../ui/pages/Index";

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.34",
+  "version": "0.17.35",
   "name": "generator-reshow",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "yo-unit": "*"
   },
   "scripts": {
-    "mochaFor": "mocha",
+    "mochaFor": "mocha --timeout 2500",
     "mocha": "npm run mochaFor -- 'generators/**/__tests__/*.js'",
     "test": "npm run mocha",
     "prepublishOnly": "npm run test"