@modern-js/entry-generator 3.0.4 → 3.0.6

package/README.md

@@ -1,30 +1,26 @@
-
 <p align="center">
   <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
+
+<h1 align="center">Modern.js</h1>
+
 <p align="center">
-现代 Web 工程体系
-  <br/>
-  <a href="https://modernjs.dev" target="blank">
-    modernjs.dev
-  </a>
-</p>
-<p align="center">
-  The meta-framework suite designed from scratch for frontend-focused modern web development
+  A Progressive React Framework for modern web development.
 </p>
 
-# Introduction
-
-> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
+## Getting Started
 
-- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
+Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js.
 
-## Getting Started
+## Documentation
 
-- [Quick Start](https://modernjs.dev/docs/start)
-- [Guides](https://modernjs.dev/docs/guides)
-- [API References](https://modernjs.dev/docs/apis)
+- [English Documentation](https://modernjs.dev/en/)
+- [中文文档](https://modernjs.dev)
 
 ## Contributing
 
-- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)
+Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+
+## License
+
+Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).

package/dist/index.js

@@ -34714,6 +34714,26 @@ var require_compiled = __commonJS({
   }
 });
 
+// ../../../toolkit/utils/dist/commands.js
+var require_commands = __commonJS({
+  "../../../toolkit/utils/dist/commands.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isDevCommand = exports.getCommand = void 0;
+    var getCommand = () => {
+      const args = process.argv.slice(2);
+      const command = args[0];
+      return command;
+    };
+    exports.getCommand = getCommand;
+    var isDevCommand = () => {
+      const command = (0, exports.getCommand)();
+      return command === "dev" || command === "start";
+    };
+    exports.isDevCommand = isDevCommand;
+  }
+});
+
 // ../../../toolkit/utils/dist/format.js
 var require_format = __commonJS({
   "../../../toolkit/utils/dist/format.js"(exports) {
@@ -35089,12 +35109,14 @@ var require_node_env = __commonJS({
   "../../../toolkit/utils/dist/is/node-env.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isProdProfile = exports.isTest = exports.isProd = exports.isDev = void 0;
-    var isDev = () => process.env.NODE_ENV === "development";
+    exports.isProdProfile = exports.isTest = exports.isProd = exports.isDev = exports.getNodeEnv = void 0;
+    var getNodeEnv = () => process.env.NODE_ENV || "development";
+    exports.getNodeEnv = getNodeEnv;
+    var isDev = () => (0, exports.getNodeEnv)() === "development";
     exports.isDev = isDev;
-    var isProd = () => process.env.NODE_ENV === "production";
+    var isProd = () => (0, exports.getNodeEnv)() === "production";
     exports.isProd = isProd;
-    var isTest = () => process.env.NODE_ENV === "test";
+    var isTest = () => (0, exports.getNodeEnv)() === "test";
     exports.isTest = isTest;
     var isProdProfile = () => (0, exports.isProd)() && process.argv.includes("--profile");
     exports.isProdProfile = isProdProfile;
@@ -35237,10 +35259,10 @@ var require_is = __commonJS({
 
 // ../../../toolkit/utils/dist/compatRequire.js
 var require_compatRequire = __commonJS({
-  "../../../toolkit/utils/dist/compatRequire.js"(exports) {
+  "../../../toolkit/utils/dist/compatRequire.js"(exports, module2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.cleanRequireCache = exports.requireExistModule = exports.dynamicImport = exports.compatRequire = void 0;
+    exports.deleteRequireCache = exports.cleanRequireCache = exports.requireExistModule = exports.dynamicImport = exports.compatRequire = void 0;
     var findExists_1 = require_findExists();
     var compatRequire = (filePath, interop = true) => {
       const mod = require(filePath);
@@ -35267,6 +35289,15 @@ var require_compatRequire = __commonJS({
       });
     };
     exports.cleanRequireCache = cleanRequireCache;
+    function deleteRequireCache(path4) {
+      if (require.cache[path4]) {
+        delete require.cache[path4];
+      }
+      if (module2.children) {
+        module2.children = module2.children.filter((item) => item.filename !== path4);
+      }
+    }
+    exports.deleteRequireCache = deleteRequireCache;
   }
 });
 
@@ -35288,7 +35319,7 @@ var require_constants = __commonJS({
     exports.SERVER_DIR = "server";
     exports.SHARED_DIR = "shared";
     exports.CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
-    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".ejs", ".mjs"];
+    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".mjs"];
     exports.OUTPUT_CONFIG_FILE = "modern.config.json";
     exports.DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
     exports.ROUTE_MINIFEST_FILE = "routes-manifest.json";
@@ -35779,7 +35810,7 @@ var require_nodeEnv = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -35789,7 +35820,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -36868,6 +36899,7 @@ var require_dist = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_compiled(), exports);
+    __exportStar(require_commands(), exports);
     __exportStar(require_format(), exports);
     __exportStar(require_FileSizeReporter(), exports);
     __exportStar(require_printBuildError(), exports);
@@ -66974,7 +67006,7 @@ var require_nodeEnv2 = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -66984,7 +67016,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -75622,7 +75654,7 @@ var require_env = __commonJS({
     exports.canUseNpm = canUseNpm3;
     exports.canUseNvm = canUseNvm;
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     var _utils = require_dist2();
     function canUseNvm() {
       return __async(this, null, function* () {
@@ -75649,7 +75681,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -76685,14 +76717,14 @@ var require_packageManager = __commonJS({
       value: true
     });
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     exports.runInstall = runInstall;
     var _path = _interopRequireDefault(require("path"));
     var _utils = require_dist2();
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -76739,7 +76771,7 @@ var require_packageManager = __commonJS({
             params.push(`--registry=${registryUrl}`);
           }
           yield (0, _utils.execa)("pnpm", params, options);
-        } else if (yield canUseYarn3()) {
+        } else if (yield canUseYarn2()) {
           const params = ["install", "--production", "--silent", "--ignore-scripts"];
           if (registryUrl) {
             params.push(`--registry=${registryUrl}`);
@@ -102004,12 +102036,12 @@ var require_figures = __commonJS({
 var require_separator = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/objects/separator.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var figures = require_figures();
     var Separator = class {
       constructor(line) {
         this.type = "separator";
-        this.line = chalk.dim(line || new Array(15).join(figures.line));
+        this.line = chalk2.dim(line || new Array(15).join(figures.line));
       }
       toString() {
         return this.line;
@@ -121427,7 +121459,7 @@ var require_ora3 = __commonJS({
   "../../../../node_modules/.pnpm/ora@5.4.1/node_modules/ora/index.js"(exports, module2) {
     "use strict";
     var readline = require("readline");
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var cliCursor = require_cli_cursor();
     var cliSpinners = require_cli_spinners();
     var logSymbols = require_browser2();
@@ -121623,7 +121655,7 @@ var require_ora3 = __commonJS({
         const { frames } = this.spinner;
         let frame = frames[this.frameIndex];
         if (this.color) {
-          frame = chalk[this.color](frame);
+          frame = chalk2[this.color](frame);
         }
         this.frameIndex = ++this.frameIndex % frames.length;
         const fullPrefixText = typeof this.prefixText === "string" && this.prefixText !== "" ? this.prefixText + " " : "";
@@ -121872,7 +121904,7 @@ var require_base3 = __commonJS({
       defaults: require_defaults2(),
       clone: require_clone()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var runAsync = require_run_async();
     var { filter, flatMap, share, take, takeUntil } = require_operators();
     var Choices = require_choices();
@@ -121890,7 +121922,7 @@ var require_base3 = __commonJS({
           filteringText: "",
           when: () => true,
           suffix: "",
-          prefix: chalk.green("?")
+          prefix: chalk2.green("?")
         });
         if (!this.opt.name) {
           this.throwParamError("name");
@@ -121963,12 +121995,12 @@ var require_base3 = __commonJS({
         return value;
       }
       getQuestion() {
-        let message = (this.opt.prefix ? this.opt.prefix + " " : "") + chalk.bold(this.opt.message) + this.opt.suffix + chalk.reset(" ");
+        let message = (this.opt.prefix ? this.opt.prefix + " " : "") + chalk2.bold(this.opt.message) + this.opt.suffix + chalk2.reset(" ");
         if (this.opt.default != null && this.status !== "touched" && this.status !== "answered") {
           if (this.opt.type === "password") {
-            message += chalk.italic.dim("[hidden] ");
+            message += chalk2.italic.dim("[hidden] ");
           } else {
-            message += chalk.dim("(" + this.opt.default + ") ");
+            message += chalk2.dim("(" + this.opt.default + ") ");
           }
         }
         return message;
@@ -122030,7 +122062,7 @@ var require_events = __commonJS({
 var require_paginator = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/utils/paginator.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var Paginator = class {
       constructor(screen, options = {}) {
         const { isInfinite = true } = options;
@@ -122051,7 +122083,7 @@ var require_paginator = __commonJS({
         }
         const visibleLines = this.isInfinite ? this.getInfiniteLines(lines, active, pageSize) : this.getFiniteLines(lines, active, pageSize);
         this.lastIndex = active;
-        return visibleLines.join("\n") + "\n" + chalk.dim("(Move up and down to reveal more choices)");
+        return visibleLines.join("\n") + "\n" + chalk2.dim("(Move up and down to reveal more choices)");
       }
       getInfiniteLines(lines, active, pageSize) {
         if (this.pointer === void 0) {
@@ -122107,7 +122139,7 @@ var require_incrementListIndex = __commonJS({
 var require_list2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/list.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var figures = require_figures();
     var cliCursor = require_cli_cursor();
     var runAsync = require_run_async();
@@ -122156,10 +122188,10 @@ var require_list2 = __commonJS({
       render() {
         let message = this.getQuestion();
         if (this.firstRender) {
-          message += chalk.dim("(Use arrow keys)");
+          message += chalk2.dim("(Use arrow keys)");
         }
         if (this.status === "answered") {
-          message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
+          message += chalk2.cyan(this.opt.choices.getChoice(this.selected).short);
         } else {
           const choicesStr = listRender(this.opt.choices, this.selected);
           const indexPosition = this.opt.choices.indexOf(
@@ -122228,7 +122260,7 @@ var require_list2 = __commonJS({
         const isSelected = i - separatorOffset === pointer;
         let line = (isSelected ? figures.pointer + " " : "  ") + choice.name;
         if (isSelected) {
-          line = chalk.cyan(line);
+          line = chalk2.cyan(line);
         }
         output2 += line + " \n";
       });
@@ -122242,7 +122274,7 @@ var require_list2 = __commonJS({
 var require_input = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/input.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base3();
     var observe2 = require_events();
@@ -122272,10 +122304,10 @@ var require_input = __commonJS({
         if (transformer) {
           message += transformer(appendContent, this.answers, { isFinal });
         } else {
-          message += isFinal ? chalk.cyan(appendContent) : appendContent;
+          message += isFinal ? chalk2.cyan(appendContent) : appendContent;
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -122331,7 +122363,7 @@ var require_number = __commonJS({
 var require_confirm = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/confirm.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { take, takeUntil } = require_operators();
     var Base = require_base3();
     var observe2 = require_events();
@@ -122364,7 +122396,7 @@ var require_confirm = __commonJS({
       render(answer) {
         let message = this.getQuestion();
         if (typeof answer === "boolean") {
-          message += chalk.cyan(answer ? "Yes" : "No");
+          message += chalk2.cyan(answer ? "Yes" : "No");
         } else {
           message += this.rl.line;
         }
@@ -122390,7 +122422,7 @@ var require_confirm = __commonJS({
 var require_rawlist = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/rawlist.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base3();
     var Separator = require_separator();
@@ -122444,7 +122476,7 @@ var require_rawlist = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (this.status === "answered") {
-          message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
+          message += chalk2.cyan(this.opt.choices.getChoice(this.selected).short);
         } else {
           const choicesStr = renderChoices(this.opt.choices, this.selected);
           message += "\n" + this.paginator.paginate(choicesStr, this.selected, this.opt.pageSize);
@@ -122452,7 +122484,7 @@ var require_rawlist = __commonJS({
         }
         message += this.rl.line;
         if (error) {
-          bottomContent = "\n" + chalk.red(">> ") + error;
+          bottomContent = "\n" + chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -122519,7 +122551,7 @@ var require_rawlist = __commonJS({
         const index = i - separatorOffset;
         let display = index + 1 + ") " + choice.name;
         if (index === pointer) {
-          display = chalk.cyan(display);
+          display = chalk2.cyan(display);
         }
         output2 += display;
       });
@@ -122533,7 +122565,7 @@ var require_rawlist = __commonJS({
 var require_expand2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/expand.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base3();
     var Separator = require_separator();
@@ -122576,7 +122608,7 @@ var require_expand2 = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (this.status === "answered") {
-          message += chalk.cyan(this.answer);
+          message += chalk2.cyan(this.answer);
         } else if (this.status === "expanded") {
           const choicesStr = renderChoices(this.opt.choices, this.selectedKey);
           message += this.paginator.paginate(choicesStr, this.selectedKey, this.opt.pageSize);
@@ -122584,10 +122616,10 @@ var require_expand2 = __commonJS({
         }
         message += this.rl.line;
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         if (hint) {
-          bottomContent = chalk.cyan(">> ") + hint;
+          bottomContent = chalk2.cyan(">> ") + hint;
         }
         this.screen.render(message, bottomContent);
       }
@@ -122611,7 +122643,7 @@ var require_expand2 = __commonJS({
           }
           let choiceStr = choice.key + ") " + choice.name;
           if (this.selectedKey === choice.key) {
-            choiceStr = chalk.cyan(choiceStr);
+            choiceStr = chalk2.cyan(choiceStr);
           }
           output2 += choiceStr;
         });
@@ -122697,7 +122729,7 @@ var require_expand2 = __commonJS({
         }
         let choiceStr = choice.key + ") " + choice.name;
         if (pointer === choice.key) {
-          choiceStr = chalk.cyan(choiceStr);
+          choiceStr = chalk2.cyan(choiceStr);
         }
         output2 += choiceStr;
       });
@@ -122711,7 +122743,7 @@ var require_expand2 = __commonJS({
 var require_checkbox = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/checkbox.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var cliCursor = require_cli_cursor();
     var figures = require_figures();
     var { map: map2, takeUntil } = require_operators();
@@ -122760,10 +122792,10 @@ var require_checkbox = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (!this.dontShowHints) {
-          message += "(Press " + chalk.cyan.bold("<space>") + " to select, " + chalk.cyan.bold("<a>") + " to toggle all, " + chalk.cyan.bold("<i>") + " to invert selection, and " + chalk.cyan.bold("<enter>") + " to proceed)";
+          message += "(Press " + chalk2.cyan.bold("<space>") + " to select, " + chalk2.cyan.bold("<a>") + " to toggle all, " + chalk2.cyan.bold("<i>") + " to invert selection, and " + chalk2.cyan.bold("<enter>") + " to proceed)";
         }
         if (this.status === "answered") {
-          message += chalk.cyan(this.selection.join(", "));
+          message += chalk2.cyan(this.selection.join(", "));
         } else {
           const choicesStr = renderChoices(this.opt.choices, this.pointer);
           const indexPosition = this.opt.choices.indexOf(
@@ -122786,7 +122818,7 @@ var require_checkbox = __commonJS({
           message += "\n" + this.paginator.paginate(choicesStr, realIndexPosition, this.opt.pageSize);
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -122869,7 +122901,7 @@ var require_checkbox = __commonJS({
         } else {
           const line = getCheckbox(choice.checked) + " " + choice.name;
           if (i - separatorOffset === pointer) {
-            output2 += chalk.cyan(figures.pointer + line);
+            output2 += chalk2.cyan(figures.pointer + line);
           } else {
             output2 += " " + line;
           }
@@ -122879,7 +122911,7 @@ var require_checkbox = __commonJS({
       return output2.replace(/\n$/, "");
     }
     function getCheckbox(checked) {
-      return checked ? chalk.green(figures.radioOn) : figures.radioOff;
+      return checked ? chalk2.green(figures.radioOn) : figures.radioOff;
     }
     module2.exports = CheckboxPrompt;
   }
@@ -122889,7 +122921,7 @@ var require_checkbox = __commonJS({
 var require_password = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/password.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base3();
     var observe2 = require_events();
@@ -122922,15 +122954,15 @@ var require_password = __commonJS({
           message += this.getMaskedValue(this.rl.line || "");
         }
         if (error) {
-          bottomContent = "\n" + chalk.red(">> ") + error;
+          bottomContent = "\n" + chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
       getMaskedValue(value) {
         if (this.status === "answered") {
-          return this.opt.mask ? chalk.cyan(mask(value, this.opt.mask)) : chalk.italic.dim("[hidden]");
+          return this.opt.mask ? chalk2.cyan(mask(value, this.opt.mask)) : chalk2.italic.dim("[hidden]");
         }
-        return this.opt.mask ? mask(value, this.opt.mask) : chalk.italic.dim("[input is hidden] ");
+        return this.opt.mask ? mask(value, this.opt.mask) : chalk2.italic.dim("[input is hidden] ");
       }
       getSpinningValue(value) {
         return this.getMaskedValue(value);
@@ -132438,7 +132470,7 @@ var require_main = __commonJS({
 var require_editor = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.2.2/node_modules/inquirer/lib/prompts/editor.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { editAsync } = require_main();
     var Base = require_base3();
     var observe2 = require_events();
@@ -132461,12 +132493,12 @@ var require_editor = __commonJS({
         let bottomContent = "";
         let message = this.getQuestion();
         if (this.status === "answered") {
-          message += chalk.dim("Received");
+          message += chalk2.dim("Received");
         } else {
-          message += chalk.dim("Press <enter> to launch your preferred editor.");
+          message += chalk2.dim("Press <enter> to launch your preferred editor.");
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -133010,12 +133042,12 @@ var require_node7 = __commonJS({
 var require_separator2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.1.3/node_modules/inquirer/lib/objects/separator.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var figures = require_figures();
     var Separator = class {
       constructor(line) {
         this.type = "separator";
-        this.line = chalk.dim(line || new Array(15).join(figures.line));
+        this.line = chalk2.dim(line || new Array(15).join(figures.line));
       }
       toString() {
         return this.line;
@@ -134004,7 +134036,7 @@ var require_base4 = __commonJS({
       defaults: require_defaults2(),
       clone: require_clone()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var runAsync = require_run_async();
     var { filter, flatMap, share, take, takeUntil } = require_operators();
     var Choices = require_choices2();
@@ -134022,7 +134054,7 @@ var require_base4 = __commonJS({
           filteringText: "",
           when: () => true,
           suffix: "",
-          prefix: chalk.green("?")
+          prefix: chalk2.green("?")
         });
         if (!this.opt.name) {
           this.throwParamError("name");
@@ -134095,12 +134127,12 @@ var require_base4 = __commonJS({
         return value;
       }
       getQuestion() {
-        let message = (this.opt.prefix ? this.opt.prefix + " " : "") + chalk.bold(this.opt.message) + this.opt.suffix + chalk.reset(" ");
+        let message = (this.opt.prefix ? this.opt.prefix + " " : "") + chalk2.bold(this.opt.message) + this.opt.suffix + chalk2.reset(" ");
         if (this.opt.default != null && this.status !== "touched" && this.status !== "answered") {
           if (this.opt.type === "password") {
-            message += chalk.italic.dim("[hidden] ");
+            message += chalk2.italic.dim("[hidden] ");
           } else {
-            message += chalk.dim("(" + this.opt.default + ") ");
+            message += chalk2.dim("(" + this.opt.default + ") ");
           }
         }
         return message;
@@ -134195,7 +134227,7 @@ var require_paginator2 = __commonJS({
       sum: require_sum(),
       flatten: require_flatten()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var Paginator = class {
       constructor(screen, options = {}) {
         const { isInfinite = true } = options;
@@ -134216,7 +134248,7 @@ var require_paginator2 = __commonJS({
         }
         const visibleLines = this.isInfinite ? this.getInfiniteLines(lines, active, pageSize) : this.getFiniteLines(lines, active, pageSize);
         this.lastIndex = active;
-        return visibleLines.join("\n") + "\n" + chalk.dim("(Move up and down to reveal more choices)");
+        return visibleLines.join("\n") + "\n" + chalk2.dim("(Move up and down to reveal more choices)");
       }
       getInfiniteLines(lines, active, pageSize) {
         if (this.pointer === void 0) {
@@ -134277,7 +134309,7 @@ var require_list3 = __commonJS({
       findIndex: require_findIndex2(),
       isString: require_isString()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var figures = require_figures();
     var cliCursor = require_cli_cursor();
     var runAsync = require_run_async();
@@ -134329,10 +134361,10 @@ var require_list3 = __commonJS({
       render() {
         let message = this.getQuestion();
         if (this.firstRender) {
-          message += chalk.dim("(Use arrow keys)");
+          message += chalk2.dim("(Use arrow keys)");
         }
         if (this.status === "answered") {
-          message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
+          message += chalk2.cyan(this.opt.choices.getChoice(this.selected).short);
         } else {
           const choicesStr = listRender(this.opt.choices, this.selected);
           const indexPosition = this.opt.choices.indexOf(
@@ -134401,7 +134433,7 @@ var require_list3 = __commonJS({
         const isSelected = i - separatorOffset === pointer;
         let line = (isSelected ? figures.pointer + " " : "  ") + choice.name;
         if (isSelected) {
-          line = chalk.cyan(line);
+          line = chalk2.cyan(line);
         }
         output2 += line + " \n";
       });
@@ -134415,7 +134447,7 @@ var require_list3 = __commonJS({
 var require_input2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.1.3/node_modules/inquirer/lib/prompts/input.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base4();
     var observe2 = require_events2();
@@ -134445,10 +134477,10 @@ var require_input2 = __commonJS({
         if (transformer) {
           message += transformer(appendContent, this.answers, { isFinal });
         } else {
-          message += isFinal ? chalk.cyan(appendContent) : appendContent;
+          message += isFinal ? chalk2.cyan(appendContent) : appendContent;
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -134521,7 +134553,7 @@ var require_confirm2 = __commonJS({
       extend: require_extend(),
       isBoolean: require_isBoolean()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { take, takeUntil } = require_operators();
     var Base = require_base4();
     var observe2 = require_events2();
@@ -134554,7 +134586,7 @@ var require_confirm2 = __commonJS({
       render(answer) {
         let message = this.getQuestion();
         if (typeof answer === "boolean") {
-          message += chalk.cyan(answer ? "Yes" : "No");
+          message += chalk2.cyan(answer ? "Yes" : "No");
         } else {
           message += this.rl.line;
         }
@@ -134585,7 +134617,7 @@ var require_rawlist2 = __commonJS({
       isNumber: require_isNumber(),
       findIndex: require_findIndex2()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base4();
     var Separator = require_separator2();
@@ -134640,7 +134672,7 @@ var require_rawlist2 = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (this.status === "answered") {
-          message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
+          message += chalk2.cyan(this.opt.choices.getChoice(this.selected).short);
         } else {
           const choicesStr = renderChoices(this.opt.choices, this.selected);
           message += "\n" + this.paginator.paginate(choicesStr, this.selected, this.opt.pageSize);
@@ -134648,7 +134680,7 @@ var require_rawlist2 = __commonJS({
         }
         message += this.rl.line;
         if (error) {
-          bottomContent = "\n" + chalk.red(">> ") + error;
+          bottomContent = "\n" + chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -134706,7 +134738,7 @@ var require_rawlist2 = __commonJS({
         const index = i - separatorOffset;
         let display = index + 1 + ") " + choice.name;
         if (index === pointer) {
-          display = chalk.cyan(display);
+          display = chalk2.cyan(display);
         }
         output2 += display;
       });
@@ -134881,7 +134913,7 @@ var require_expand3 = __commonJS({
       isNumber: require_isNumber(),
       findIndex: require_findIndex2()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base4();
     var Separator = require_separator2();
@@ -134924,7 +134956,7 @@ var require_expand3 = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (this.status === "answered") {
-          message += chalk.cyan(this.answer);
+          message += chalk2.cyan(this.answer);
         } else if (this.status === "expanded") {
           const choicesStr = renderChoices(this.opt.choices, this.selectedKey);
           message += this.paginator.paginate(choicesStr, this.selectedKey, this.opt.pageSize);
@@ -134932,10 +134964,10 @@ var require_expand3 = __commonJS({
         }
         message += this.rl.line;
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         if (hint) {
-          bottomContent = chalk.cyan(">> ") + hint;
+          bottomContent = chalk2.cyan(">> ") + hint;
         }
         this.screen.render(message, bottomContent);
       }
@@ -134959,7 +134991,7 @@ var require_expand3 = __commonJS({
           }
           let choiceStr = choice.key + ") " + choice.name;
           if (this.selectedKey === choice.key) {
-            choiceStr = chalk.cyan(choiceStr);
+            choiceStr = chalk2.cyan(choiceStr);
           }
           output2 += choiceStr;
         });
@@ -135048,7 +135080,7 @@ var require_expand3 = __commonJS({
         }
         let choiceStr = choice.key + ") " + choice.name;
         if (pointer === choice.key) {
-          choiceStr = chalk.cyan(choiceStr);
+          choiceStr = chalk2.cyan(choiceStr);
         }
         output2 += choiceStr;
       });
@@ -135067,7 +135099,7 @@ var require_checkbox2 = __commonJS({
       map: require_map2(),
       isString: require_isString()
     };
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var cliCursor = require_cli_cursor();
     var figures = require_figures();
     var { map: map2, takeUntil } = require_operators();
@@ -135116,10 +135148,10 @@ var require_checkbox2 = __commonJS({
         let message = this.getQuestion();
         let bottomContent = "";
         if (!this.spaceKeyPressed) {
-          message += "(Press " + chalk.cyan.bold("<space>") + " to select, " + chalk.cyan.bold("<a>") + " to toggle all, " + chalk.cyan.bold("<i>") + " to invert selection)";
+          message += "(Press " + chalk2.cyan.bold("<space>") + " to select, " + chalk2.cyan.bold("<a>") + " to toggle all, " + chalk2.cyan.bold("<i>") + " to invert selection)";
         }
         if (this.status === "answered") {
-          message += chalk.cyan(this.selection.join(", "));
+          message += chalk2.cyan(this.selection.join(", "));
         } else {
           const choicesStr = renderChoices(this.opt.choices, this.pointer);
           const indexPosition = this.opt.choices.indexOf(
@@ -135142,7 +135174,7 @@ var require_checkbox2 = __commonJS({
           message += "\n" + this.paginator.paginate(choicesStr, realIndexPosition, this.opt.pageSize);
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -135226,7 +135258,7 @@ var require_checkbox2 = __commonJS({
         } else {
           const line = getCheckbox(choice.checked) + " " + choice.name;
           if (i - separatorOffset === pointer) {
-            output2 += chalk.cyan(figures.pointer + line);
+            output2 += chalk2.cyan(figures.pointer + line);
           } else {
             output2 += " " + line;
           }
@@ -135236,7 +135268,7 @@ var require_checkbox2 = __commonJS({
       return output2.replace(/\n$/, "");
     }
     function getCheckbox(checked) {
-      return checked ? chalk.green(figures.radioOn) : figures.radioOff;
+      return checked ? chalk2.green(figures.radioOn) : figures.radioOff;
     }
     module2.exports = CheckboxPrompt;
   }
@@ -135246,7 +135278,7 @@ var require_checkbox2 = __commonJS({
 var require_password2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.1.3/node_modules/inquirer/lib/prompts/password.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { map: map2, takeUntil } = require_operators();
     var Base = require_base4();
     var observe2 = require_events2();
@@ -135279,15 +135311,15 @@ var require_password2 = __commonJS({
           message += this.getMaskedValue(this.rl.line || "");
         }
         if (error) {
-          bottomContent = "\n" + chalk.red(">> ") + error;
+          bottomContent = "\n" + chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
       getMaskedValue(value) {
         if (this.status === "answered") {
-          return this.opt.mask ? chalk.cyan(mask(value, this.opt.mask)) : chalk.italic.dim("[hidden]");
+          return this.opt.mask ? chalk2.cyan(mask(value, this.opt.mask)) : chalk2.italic.dim("[hidden]");
         }
-        return this.opt.mask ? mask(value, this.opt.mask) : chalk.italic.dim("[input is hidden] ");
+        return this.opt.mask ? mask(value, this.opt.mask) : chalk2.italic.dim("[input is hidden] ");
       }
       getSpinningValue(value) {
         return this.getMaskedValue(value);
@@ -135323,7 +135355,7 @@ var require_password2 = __commonJS({
 var require_editor2 = __commonJS({
   "../../../../node_modules/.pnpm/inquirer@8.1.3/node_modules/inquirer/lib/prompts/editor.js"(exports, module2) {
     "use strict";
-    var chalk = require_chalk2();
+    var chalk2 = require_chalk2();
     var { editAsync } = require_main();
     var Base = require_base4();
     var observe2 = require_events2();
@@ -135346,12 +135378,12 @@ var require_editor2 = __commonJS({
         let bottomContent = "";
         let message = this.getQuestion();
         if (this.status === "answered") {
-          message += chalk.dim("Received");
+          message += chalk2.dim("Received");
         } else {
-          message += chalk.dim("Press <enter> to launch your preferred editor.");
+          message += chalk2.dim("Press <enter> to launch your preferred editor.");
         }
         if (error) {
-          bottomContent = chalk.red(">> ") + error;
+          bottomContent = chalk2.red(">> ") + error;
         }
         this.screen.render(message, bottomContent);
       }
@@ -136193,7 +136225,7 @@ var ZH_LOCALE = {
 var EN_LOCALE = {
   solution: {
     self: "Please select the solution you want to create",
-    mwa: "MWA Solution",
+    mwa: "Web App Solution",
     module: "Module Solution",
     monorepo: "Monorepo Solution",
     custom: "Custom Solution",
@@ -136204,10 +136236,10 @@ var EN_LOCALE = {
   },
   sub_solution: {
     self: "Please select the solution you want to create",
-    mwa: "MWA Solution",
-    mwa_test: "MWA Solution(Test)",
+    mwa: "Web App Solution",
+    mwa_test: "Web App Solution (Test)",
     module: "Module Solution",
-    inner_module: "Module Solution(Inner)",
+    inner_module: "Module Solution (Inner)",
     monorepo: "Monorepo Solution"
   },
   action: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/entry-generator",
-  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/modern-js-dev/modern.js/issues",
   "repository": "modern-js-dev/modern.js",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.4",
+  "version": "3.0.6",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -27,12 +27,12 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-utils": "3.0.4",
-    "@modern-js/utils": "2.2.0",
-    "@modern-js/plugin-i18n": "2.2.0",
-    "@modern-js/generator-common": "3.0.4",
-    "@scripts/build": "2.2.0",
-    "@scripts/jest-config": "2.2.0"
+    "@modern-js/generator-utils": "3.0.6",
+    "@modern-js/plugin-i18n": "2.4.0",
+    "@modern-js/utils": "2.4.0",
+    "@modern-js/generator-common": "3.0.6",
+    "@scripts/jest-config": "2.4.0",
+    "@scripts/build": "2.4.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,136 @@
+import path from 'path';
+import { merge } from '@modern-js/utils/lodash';
+import { fs, getPackageObj, isTsProject } from '@modern-js/generator-utils';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import {
+  i18n as commonI18n,
+  getEntrySchema,
+} from '@modern-js/generator-common';
+import { isEmptySource, isSingleEntry } from './utils';
+import { i18n, localeKeys } from './locale';
+
+const handleInput = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+) => {
+  const appDir = context.materials.default.basePath;
+
+  const { entriesDir } = context.config;
+
+  await fs.ensureDir(path.join(appDir, entriesDir));
+
+  const analysisInfo = {
+    isEmptySrc: isEmptySource(appDir, entriesDir),
+    isSingleEntry: isSingleEntry(appDir, entriesDir),
+    isTsProject: isTsProject(appDir),
+  };
+
+  generator.logger.debug('analysisInfo:', analysisInfo);
+
+  const config = { ...context.config, ...analysisInfo };
+  const ans = await appApi.getInputBySchemaFunc(getEntrySchema, config);
+
+  return ans;
+};
+
+const refactorSingleEntry = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+) => {
+  const pkgObj = await getPackageObj(context);
+  const pkgName = pkgObj.name;
+
+  const { entriesDir } = context.config;
+
+  const oldFilePath = path.join(context.materials.default.basePath, entriesDir);
+  const oldFiles = fs
+    .readdirSync(oldFilePath)
+    .filter(filePath => {
+      if (fs.statSync(path.join(oldFilePath, filePath)).isDirectory()) {
+        const files = fs.readdirSync(path.join(oldFilePath, filePath));
+        return files.length;
+      }
+      return (
+        filePath !== '.eslintrc.json' &&
+        filePath !== '.eslintrc.js' &&
+        filePath !== 'modern-app-env.d.ts'
+      );
+    })
+    .map(file =>
+      path.join(context.materials.default.basePath, entriesDir, file),
+    );
+
+  // create new dir in entriesDir and move code to that dir
+  fs.mkdirpSync(
+    path.join(context.materials.default.basePath, entriesDir, pkgName),
+  );
+  oldFiles.forEach(file => {
+    generator.logger.debug(
+      `rename ${file} to ${file.replace(
+        entriesDir,
+        path.join(entriesDir, pkgName),
+      )}`,
+    );
+    fs.renameSync(
+      file,
+      file.replace(entriesDir, path.join(entriesDir, pkgName)),
+    );
+  });
+};
+
+export const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+) => {
+  const ans = await handleInput(context, generator, appApi);
+
+  if (ans.isSingleEntry) {
+    generator.logger.debug(
+      'current is single entry, refactoring to multi entry',
+    );
+    await refactorSingleEntry(context, generator);
+  }
+
+  const entryName = (ans.name as string) || '';
+  const fileExtra = ans.isTsProject ? 'tsx' : 'jsx';
+  const targetPath = path.join(context.config.entriesDir, entryName);
+
+  await appApi.forgeTemplate(`templates/**/*`, undefined, resourceKey =>
+    resourceKey
+      .replace('templates', targetPath)
+      .replace('.handlebars', `.${fileExtra}`),
+  );
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  const appApi = new AppAPI(context, generator);
+
+  const { locale } = context.config;
+  commonI18n.changeLanguage({ locale });
+  appApi.i18n.changeLanguage({ locale });
+  i18n.changeLanguage({ locale });
+
+  if (!(await appApi.checkEnvironment())) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`start run @modern-js/entry-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  merge(context.config, { entriesDir: context.config.entriesDir || 'src' });
+
+  await handleTemplateFile(context, generator, appApi);
+
+  if (!context.config.isEmptySrc) {
+    appApi.showSuccessInfo(
+      i18n.t(localeKeys.success, { name: context.config.name }),
+    );
+  }
+
+  generator.logger.debug(`forge @modern-js/entry-generator succeed `);
+};