generator-reshow 0.17.32 → 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/docker/README.md

@@ -2,9 +2,23 @@
 
 > Docker generator 
 
-## Environment Variables
+## Setup circleci
+
+### setup multi version
+* https://github.com/HillLiu/docker-twemproxy-alpine/blob/main/.circleci/config.yml#L62
+
+### Environment Variables
 * DOCKER_LOGIN
 * DOCKER_PASSWORD
 
 ### circleci sample url
-* https://app.circleci.com/settings/project/github/[git-org]/[git-repository-name]/environment-variables
+
+* Syntax
+```
+* /settings/project/github/[git-org]/[git-repository-name]/environment-variables
+```
+
+* Sample
+   * git-org: HillLiu
+   * git-repository-name: docker-twemproxy-alpine
+   * url: https://app.circleci.com/settings/project/github/HillLiu/docker-twemproxy-alpine/environment-variables

package/generators/npm/index.js

@@ -59,10 +59,8 @@ module.exports = class extends YoGenerator {
     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(",");
@@ -77,6 +75,7 @@ module.exports = class extends YoGenerator {
       };
       if (!this.payload.isUseBabel) {
         delete data.devDependencies["@babel/cli"];
+        delete data.exports;
         delete data.module;
         delete data.scripts.clean;
         delete data.scripts.build;
@@ -89,6 +88,49 @@ module.exports = class extends YoGenerator {
         data.files = data.files.filter((f) => f !== "build");
         data.files.push("src");
       }
+      if (this.payload.babelUI) {
+        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"];
+        if (this.payload.babelRootMode) {
+          [
+            "build:cjs:src",
+            "build:cjs:ui",
+            "build:es:src",
+            "build:es:ui",
+          ].forEach((key) => {
+            data.scripts[key] += " --root-mode upward";
+          });
+        }
+        delete data.bin;
+        ["build:ui:cjs", "build:ui:es", "mocha:ui"].forEach((key) => {
+          delete data.scripts[key];
+        });
+        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",
+          "build:cjs:ui",
+          "build:ui:cjs",
+          "build:es:src",
+          "build:es:ui",
+          "build:ui:es",
+          "mocha:ui",
+        ].forEach((key) => {
+          delete data.scripts[key];
+        });
+      }
       if (!this.payload.isUseWebpack) {
         delete data.scripts["webpack"];
         delete data.scripts["clean:webpack"];

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/package.json

@@ -31,10 +31,17 @@
     "format": "prettier-eslint --write 'src/**/*.js' 'ui/**/*.js*'",
     "clean:webpack": "find ./assets -name '*.*' | xargs rm -rf && rm -rf workbox-*.js",
     "clean": "find ./build -name '*.*' | xargs rm -rf",
+    "build:cjs:src": "BABEL_ENV=cjs babel src -d build/cjs/src --ignore /**/__tests__",
+    "build:cjs:ui": "BABEL_ENV=cjs babel ui -d build/cjs/ui --ignore /**/__tests__",
+    "build:ui:cjs": "npm run build:cjs:src && npm run build:cjs:ui",
     "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src<%= babelRootMode %>",
+    "build:es:src": "BABEL_ENV=es babel src -d build/es/src --out-file-extension .mjs",
+    "build:es:ui": "BABEL_ENV=es babel ui -d build/es/ui --out-file-extension .mjs",
+    "build:ui:es": "npm run build:es:src && npm run build:es:ui",
     "build:es": "BABEL_ENV=es babel src -d build/es/src<%= babelRootMode %>",
     "build": "npm run clean && npm run build:cjs && npm run build:es",
     "mochaFor": "mocha -r global-jsdom/register",
+    "mocha:ui": "npm run mochaFor -- 'build/es/**/__tests__/*.mjs'",
     "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"

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.32",
+  "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"