generator-reshow 0.17.42 → 0.17.44

package/generators/app/templates/src/ui/molecules/Menu.jsx

@@ -1,9 +1,14 @@
+//@ts-check
+
 import { VerticalMenu } from "pmvc_react_admin";
 import { SideMenu } from "organism-react-navigation";
 import { pageStore, ReLink } from "reshow";
 import { KEYS } from "reshow-constant";
 
-const Menu = (props) => {
+/**
+ * @returns {React.ReactElement}
+ */
+const Menu = () => {
   const thisMenus = {};
   const themes = pageStore.getMap("themes");
   KEYS(themes).forEach((item) => {

package/generators/app/templates/src/ui/pages/index.jsx

@@ -1,30 +1,29 @@
+import { lazy } from "react";
 import { ReshowMessage, Return } from "reshow";
 import { ClientRoute } from "reshow-url";
 import { PopupPool } from "organism-react-popup";
 import { PageLoadProgressHandler } from "organism-react-progress";
 
 import Doc from "../templates/Doc";
-import Page1 from "../pages/Page1";
-import Page2 from "../pages/Page2";
 
 const themes = {
-  Page1,
-  Page2,
+  Page1: lazy(() => import("../pages/Page1")),
+  Page2: lazy(() => import("../pages/Page2")),
 };
 
 const Index = (props) => (
-  <Return initStates={["tplProps", "pageName"]}>
-    {({ tplProps, pageName }) => {
-      return (
+  <>
+    <Return initStates={["tplProps", "pageName"]}>
+      {({ tplProps, pageName }) => (
         <Doc {...tplProps} className={pageName}>
           <ClientRoute {...props} themes={themes} defaultThemePath="Page1" />
-          <PageLoadProgressHandler ajax={true} />
-          <ReshowMessage />
-          <PopupPool />
         </Doc>
-      );
-    }}
-  </Return>
+      )}
+    </Return>
+    <PageLoadProgressHandler ajax={true} />
+    <ReshowMessage />
+    <PopupPool />
+  </>
 );
 
 export default Index;

package/generators/app/templates/src/ui/templates/Doc.jsx

@@ -1,4 +1,5 @@
-import React, { Component } from "react";
+//@ts-check
+
 import { getDocTemplate } from "organism-react-navigation";
 import Menu from "../molecules/Menu";
 

package/generators/package-json/index.js

@@ -1,4 +1,7 @@
-const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
+const { YoGenerator, YoHelper } = require("yo-reshow");
+
+const getUIBuildTypeScript = (filePattern) =>
+  `npx -p typescript tsc src/*.js ${filePattern} --jsx react-jsx --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types`;
 
 /**
  * package-json Generator
@@ -46,8 +49,9 @@ module.exports = class extends YoGenerator {
           };
           delete data.devDependencies;
           delete data.version;
-          data.scripts["prepublishOnly"] = "exit 1;";
+          data.scripts.prepublishOnly = "exit 1;";
           data.scripts.build = "npm run clean && npm run build:es";
+          data.scripts["build:type"] = getUIBuildTypeScript("src/ui/**/*.jsx");
         } else {
           delete data.private;
           data.dependencies = {
@@ -74,8 +78,9 @@ module.exports = class extends YoGenerator {
           data.devDependencies["react"] = "^18.x";
           data.devDependencies["react-dom"] = "^18.x";
           data.devDependencies["reshow-unit"] = "*";
-          data.scripts["build:type"] =
-            "npx -p typescript tsc src/index.js src/**/*.js src/ui/**/*.jsx --jsx react-jsx --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types";
+          data.scripts["build:type"] = getUIBuildTypeScript(
+            "src/**/*.js src/ui/**/*.jsx"
+          );
           delete data.devDependencies["reshow-unit-dom"];
         }
         if (!isUseWebpack) {

package/generators/package-json/templates/package.json

@@ -34,7 +34,7 @@
     "clean": "find ./build ./types -name '*.*' | xargs rm -rf",
     "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:type": "npx -p typescript tsc src/index.js src/**/*.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types",
+    "build:type": "npx -p typescript tsc src/*.js src/**/*.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types",
     "build": "npm run clean && npm run build:cjs && npm run build:es && npm run build:type",
     "mochaFor": "mocha -r global-jsdom/register",
     "mocha": "npm run mochaFor -- 'build/{cjs,es}/**/__tests__/*.{js,mjs}'",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.42",
+  "version": "0.17.44",
   "name": "generator-reshow",
   "repository": {
     "type": "git",