npm - generator-reshow - Versions diffs - 0.17.33 → 0.17.36 - Mend

generator-reshow 0.17.33 → 0.17.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/generators/app/__tests__/TestApp.js CHANGED Viewed

@@ -30,11 +30,11 @@ describe("generator-reshow:app", () => {
   });
   it("should have folder", () => {
-    assert.file(["src", "ui"]);
+    assert.file(["src", "src/ui"]);
   });
   it("should have file", () => {
-    assert.file(["compile.sh", "index.html"]);
+    assert.file(["compile.sh", "index.tpl"]);
   });
   it("should have content", () => {

package/generators/app/index.js CHANGED Viewed

@@ -36,6 +36,11 @@ module.exports = class extends YoGenerator {
     this.composeWith(require.resolve("../compile-sh"), {
       webpackEnabled: true,
     });
+    this.composeWith(require.resolve("../package-json"), {
+      ...answers,
+      isApp: true,
+      isUseWebpack: true,
+    });
   }
   writing() {
@@ -46,23 +51,23 @@ module.exports = class extends YoGenerator {
     chMainName(this.mainName);
     // handle copy file
-    mkdir("ui/organisms");
-    cp("ui");
     cp("src");
     cp("data");
     cp(".gitignore");
     cp("screen.sh");
-    cp("index.html");
-    cp("package.json");
+    cp("index.tpl");
     cp("README.md");
-    cp("webpack.config.js");
+    cp("webpack.config.mjs");
+    cp("babel.config.js");
+    cp("PageTest.js", "src/ui/pages/__tests__/PageTest.js");
+    mkdir("src/ui/organisms");
   }
   async end() {
     if (!this.options.skipInstall) {
       const { say, onExit } = YoHelper(this);
       await this.spawnCommand("./compile.sh", ["s", "open"]);
-      sonExit(() => ay("Check the web browser, it should autoload now."));
+      onExit(() => say("Check the web browser, it should autoload now."));
     }
   }
 };

package/generators/app/templates/PageTest.js ADDED Viewed

@@ -0,0 +1,12 @@
+import { expect } from "chai";
+import { render } from "reshow-unit";
+import Page1 from "../Page1";
+describe("Page Test", () => {
+  it("basic test", () => {
+    const wrap = render(<Page1 />);
+    const html = wrap.html();
+    expect(html).to.have.string("This is page");
+  });
+});

package/generators/app/templates/babel.config.js ADDED Viewed

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

package/generators/app/templates/index.tpl ADDED Viewed

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<!--
+  _____  ______  _____ _    _  ______          __
+ |  __ \|  ____|/ ____| |  | |/ __ \ \        / /
+ | |__) | |__  | (___ | |__| | |  | \ \  /\  / /
+ |  _  /|  __|  \___ \|  __  | |  | |\ \/  \/ /
+ | | \ \| |____ ____) | |  | | |__| | \  /\  /
+ |_|  \_\______|_____/|_|  |_|\____/   \/  \/
+ Interested in our source? Help us out by improving it.
+ https://github.com/react-atomic/reshow/issues
+-->
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge; IE=11; IE=10; IE=9; IE=8;">
+<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,shrink-to-fit=no">
+<!--[if IE]>
+<script defer src="https://cdn.jsdelivr.net/npm/babel-polyfill@6.26.0/dist/polyfill.min.js"></script>
+<![endif]-->
+<link rel="icon" href="data:,">
+</head>
+<body>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/combine/npm/purecss@2.1.0/build/base-min.css,npm/purecss@2.1.0/build/grids-min.css,npm/purecss@2.1.0/build/grids-responsive-min.css">
+<div id="app"></div>
+</body>
+</html>

package/generators/app/templates/src/client.js CHANGED Viewed

@@ -1,4 +1,4 @@
 import client from "reshow-app/client";
-import app from "../ui/pages/index";
+import app from "./ui/pages/index";
 export default client(app);

package/generators/app/templates/{ui → src/ui}/molecules/Menu.jsx RENAMED Viewed

File without changes

package/generators/app/templates/{ui → src/ui}/pages/Page1.jsx RENAMED Viewed

@@ -1,4 +1,4 @@
-import usePage from "../../src/usePage";
+import usePage from "../../usePage";
 const Page1 = (props) => {
   usePage({ ...props, pageName: "Page1" });

package/generators/app/templates/{ui → src/ui}/pages/Page2.jsx RENAMED Viewed

@@ -1,4 +1,4 @@
-import usePage from "../../src/usePage";
+import usePage from "../../usePage";
 const Page2 = (props) => {
   usePage({ ...props, pageName: "Page2" });

package/generators/app/templates/{ui → src/ui}/pages/index.jsx RENAMED Viewed

File without changes

package/generators/app/templates/{ui → src/ui}/templates/Doc.jsx RENAMED Viewed

File without changes

package/generators/app/templates/webpack.config.mjs ADDED Viewed

@@ -0,0 +1,3 @@
+import webpack from 'reshow-app/webpack.client';
+const __dirname = new URL('.', import.meta.url).pathname;
+export default webpack(__dirname);

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -48,53 +48,33 @@ module.exports = class extends YoGenerator {
       if (payload.isUseBabel) {
         this.composeWith(require.resolve("../compile-sh"), payload);
       }
+      this.composeWith(require.resolve("../package-json"), payload);
     });
   }
   writing() {
     this.env.options.nodePackageManager = "yarn";
     const { cp, chMainName, syncJSON } = YoHelper(this);
+    const { isUseBabel, isUseBabelUI } = this.payload || {};
     // 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(",");
-      if (keywords && keywords.length) {
-        data.keywords = keywords.map((s) => s.trim());
-      }
-      data.repository = this.payload.repository;
-      data.homepage = this.payload.repositoryHomepage;
-      data.dependencies = {
-        ...data.dependencies,
-        ...this.payload.npmDependencies,
-      };
-      if (!this.payload.isUseBabel) {
-        delete data.devDependencies["@babel/cli"];
-        delete data.exports;
-        delete data.module;
-        delete data.scripts.clean;
-        delete data.scripts.build;
-        delete data.scripts["build:cjs"];
-        delete data.scripts["build:es"];
-        data.main = "./src/index.js";
-        data.bin[this.mainName] = "./src/index.js";
-        data.scripts.test = "npm run mocha";
-        data.scripts.mocha = "npm run mochaFor -- 'src/**/__tests__/*.js'";
-        data.files = data.files.filter((f) => f !== "build");
-        data.files.push("src");
+    if (isUseBabel) {
+      cp("babel.config.js");
+      if (isUseBabelUI) {
+        cp("ui-src", "src");
+        cp("UITest.js", "src/ui/pages/__tests__/IndexTest.js", this.payload);
+      } else {
+        cp("lib-src", "src");
+        cp("LIBTest.js", "src/__tests__/LibTest.js", this.payload);
       }
-      if (!this.payload.isUseWebpack) {
-        delete data.scripts["webpack"];
-        delete data.scripts["clean:webpack"];
-      }
-      return data;
-    });
+    } else {
+      cp("src", null, this.payload);
+      cp("Test.js", "src/__tests__/Test.js", this.payload);
+    }
   }
 };

package/generators/npm/templates/LIBTest.js ADDED Viewed

@@ -0,0 +1,13 @@
+import { expect } from "chai";
+import { getSinon } from "reshow-unit-dom";
+import lib from "../lib";
+describe("Lib Test", () => {
+  it("basic test", () => {
+    const spy = getSinon().spy(lib);
+    const actual = spy("foo");
+    expect(actual).to.equal("foo");
+    expect(spy.called).to.be.true;
+  });
+});

package/generators/npm/templates/UITest.js ADDED Viewed

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

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

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

package/generators/npm/templates/lib-src/index.js ADDED Viewed

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

package/generators/npm/templates/lib-src/lib.js ADDED Viewed

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

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

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

package/generators/npm/templates/ui-src/ui/pages/Index.jsx ADDED Viewed

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

package/generators/package-json/README.md ADDED Viewed

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

package/generators/package-json/__tests__/Test.js ADDED Viewed

@@ -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("!! package-json !!", () => {
+  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/package-json/index.js ADDED Viewed

@@ -0,0 +1,97 @@
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
+/**
+ * package-json Generator
+ */
+module.exports = class extends YoGenerator {
+  writing() {
+    const { cp, getDotYo, handleKeywords, syncJSON } = YoHelper(this);
+    const payload = {
+      mainName: "",
+      description: "",
+      babelRootMode: "",
+      ...this.payload,
+      ...this.options,
+      ...getDotYo(this.options),
+    };
+    syncJSON(
+      "package.json",
+      null,
+      payload,
+      (
+        data,
+        {
+          isApp,
+          isUseWebpack,
+          isUseBabel,
+          isUseBabelUI,
+          keyword,
+          repository,
+          repositoryHomepage,
+          npmDependencies,
+        }
+      ) => {
+        handleKeywords(keyword, (arr) => (data.keywords = arr));
+        data.repository = repository;
+        data.homepage = repositoryHomepage;
+        if (isApp) {
+          data.private = true;
+          data.dependencies = {
+            pmvc_react_admin: "*",
+            react: "^18.x",
+            "react-dom": "^18.x",
+            "reshow-app": "*",
+            ...npmDependencies,
+          };
+          delete data.devDependencies;
+          delete data.version;
+          data.scripts["prepublishOnly"] = "exit 1;";
+          data.scripts.build = "npm run clean && npm run build:es";
+        } else {
+          delete data.private;
+          data.dependencies = {
+            ...data.dependencies,
+            ...npmDependencies,
+          };
+        }
+        if (!isUseBabel) {
+          if (data.devDependencies) {
+            delete data.devDependencies["@babel/cli"];
+          }
+          delete data.exports;
+          delete data.module;
+          delete data.scripts["build:cjs"];
+          data.main = "./src/index.js";
+          data.bin[this.mainName] = "./src/index.js";
+          data.files = data.files.filter((f) => f !== "build");
+          data.files.push("src");
+        } else {
+          data.devDependencies["react-atomic-atom"] = "*";
+        }
+        if (isUseBabelUI) {
+          delete data.bin;
+          data.devDependencies["react"] = "^18.x";
+          data.devDependencies["react-dom"] = "^18.x";
+          data.devDependencies["reshow-unit"] = "*";
+          delete data.devDependencies["reshow-unit-dom"];
+        }
+        if (!isUseWebpack) {
+          delete data.scripts["webpack"];
+          delete data.scripts["clean:webpack"];
+        } else {
+          cp(".yo");
+        }
+        if (!isApp && !isUseBabel) {
+          delete data.scripts["build:es"];
+          delete data.scripts.build;
+          delete data.scripts.clean;
+          data.scripts.test = "npm run mocha";
+          data.scripts.mocha =
+            "npm run mochaFor -- 'src/**/__tests__/*.{js,mjs}'";
+        }
+        return data;
+      }
+    );
+  }
+};

package/generators/package-json/templates/.yo ADDED Viewed

	@@ -0,0 +1 @@
1	+ webpackEnabled=on

package/generators/{npm → package-json}/templates/package.json RENAMED Viewed

@@ -1,4 +1,5 @@
 {
+  "private": true,
   "version": "0.0.0",
   "name": "<%= mainName %>",
   "repository": {},
@@ -31,11 +32,11 @@
     "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": "BABEL_ENV=cjs babel src -d build/cjs/src<%= babelRootMode %>",
-    "build:es": "BABEL_ENV=es babel src -d build/es/src<%= babelRootMode %>",
+    "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --ignore /**/__tests__<%= babelRootMode %>",
+    "build:es": "BABEL_ENV=es babel src -d build/es/src --out-file-extension .mjs<%= babelRootMode %>",
     "build": "npm run clean && npm run build:cjs && npm run build:es",
     "mochaFor": "mocha -r global-jsdom/register",
-    "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
+    "mocha": "npm run mochaFor -- 'build/{cjs,es}/**/__tests__/*.{js,mjs}'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"
   },

package/package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.33",
+  "version": "0.17.36",
   "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"

package/generators/app/templates/index.html DELETED Viewed

@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge; IE=11; IE=10; IE=9; IE=8;">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<script defer src="//cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
-<script defer src="//cdn.jsdelivr.net/npm/d3@6.5.0/dist/d3.js"></script>
-<script defer src="assets/main.bundle.js"></script>
-<link rel="icon" href="data:,">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/purecss@2.0.6/build/base-min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/purecss@2.0.6/build/grids-min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/purecss@2.0.6/build/grids-responsive-min.css">
-</head>
-<body>
-<div id="app"></div>
-</body>
-<script src="assets/vendor.bundle.js"></script>
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-segment@latest/segment.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-progress@latest/progress.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-rail@latest/rail.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-header@latest/header.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-form@latest/form.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-menu@latest/menu.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-dropdown@latest/dropdown.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-input@latest/input.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-button@latest/button.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-search@latest/search.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-label@latest/label.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-card@latest/card.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-popup@latest/popup.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-modal@latest/modal.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-dimmer@latest/dimmer.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-message@latest/message.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-table@latest/table.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-tab@latest/tab.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/semantic-ui-checkbox@latest/checkbox.min.css">
-<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/prismjs/themes/prism.css">
-</html>

package/generators/app/templates/package.json DELETED Viewed

@@ -1,29 +0,0 @@
-{
-  "private": true,
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/react-atomic/"
-  },
-  "description": "Reshow App",
-  "version": "0.0.0",
-  "keywords": ["app", "reshow-app"],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "pmvc_react_admin": "*",
-    "react": "^18.x",
-    "react-dom": "^18.x",
-    "reshow-app": "*",
-    "ricon": "*"
-  },
-  "scripts": {
-    "webpack": "webpack",
-    "start": "ws",
-    "format": "prettier-eslint --write 'src/**/*.js' 'ui/**/*.jsx'",
-    "clean": "find ./build ./assets -name '*.*' | xargs rm -rf",
-    "build:ui": "BABEL_ENV=es babel ui -d build/es/ui --ignore /**/__tests__",
-    "build:src": "BABEL_ENV=es babel src -d build/es/src --ignore /**/__tests__",
-    "build": "npm run clean && npm run build:ui && npm run build:src",
-    "prepublishOnly": "exit 1;"
-  }
-}

package/generators/app/templates/webpack.config.js DELETED Viewed

@@ -1,3 +0,0 @@
-const webpack = require('reshow-app/webpack.client');
-module.exports = webpack(__dirname);