@modern-js/repo-generator 3.2.1 → 3.2.2

package/dist/index.js

@@ -124142,8 +124142,6 @@ var require_chainId2 = __commonJS({
         STYLE: "style-loader",
         /** postcss-loader */
         POSTCSS: "postcss",
-        /** markdown-loader */
-        MARKDOWN: "markdown",
         /** ignore-css-loader */
         IGNORE_CSS: "ignore-css",
         /** css-modules-typescript-loader */
@@ -124224,7 +124222,9 @@ var require_chainId2 = __commonJS({
         /** HtmlAsyncChunkPlugin */
         HTML_ASYNC_CHUNK: "html-async-chunk",
         /** SWC_POLYFILL_CHECKER */
-        SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin"
+        SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin",
+        /** RouterPlugin */
+        ROUTER_MANIFEST: "route-plugin"
       },
       /** Predefined minimizers */
       MINIMIZER: {
@@ -124680,12 +124680,11 @@ var require_config4 = __commonJS({
     var _constants = require_constants3();
     var _type = require_type2();
     var isSSR = (config) => {
-      var _server, _server1;
       const { server } = config;
-      if ((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) {
+      if (server === null || server === void 0 ? void 0 : server.ssr) {
         return true;
       }
-      if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && !(0, _type.isEmpty)(server.ssrByEntries)) {
+      if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && !(0, _type.isEmpty)(server.ssrByEntries)) {
         for (const name of Object.keys(server.ssrByEntries)) {
           if (server.ssrByEntries[name]) {
             return true;
@@ -124695,29 +124694,28 @@ var require_config4 = __commonJS({
       return false;
     };
     var isUseSSRBundle = (config) => {
-      var _output;
       const { output: output2 } = config;
-      if ((_output = output2) === null || _output === void 0 ? void 0 : _output.ssg) {
+      if (output2 === null || output2 === void 0 ? void 0 : output2.ssg) {
         return true;
       }
       return isSSR(config);
     };
     var isServiceWorker = (config) => {
-      var _deploy_worker, _deploy, _output;
+      var _deploy_worker;
       const { output: output2, deploy } = config;
-      if (((_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && (((_output = output2) === null || _output === void 0 ? void 0 : _output.ssg) || isSSR(config))) {
+      if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output2 === null || output2 === void 0 ? void 0 : output2.ssg) || isSSR(config))) {
         return true;
       }
       return false;
     };
     var isRouterV5 = (config) => {
-      var _config_runtime, _config_runtime_router, _config_runtime1, _config;
-      return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && ((_config = config) === null || _config === void 0 ? void 0 : (_config_runtime1 = _config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
+      var _config_runtime, _config_runtime_router, _config_runtime1;
+      return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
     };
     var isSSGEntry = (config, entryName, entrypoints) => {
-      var _config_source, _ssgConfig, _ssgConfig1;
+      var _config_source;
       const ssgConfig = config.output.ssg;
-      const useSSG = isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
+      const useSSG = isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
       return useSSG;
     };
     var isSingleEntry = (entrypoints, mainEntryName = _constants.MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
@@ -125296,9 +125294,14 @@ var require_logger3 = __commonJS({
         label: "info",
         level: "info"
       },
+      ready: {
+        color: "green",
+        label: "ready",
+        level: "info"
+      },
       success: {
         color: "green",
-        label: "Success",
+        label: "success",
         level: "info"
       },
       warn: {
@@ -125478,7 +125481,7 @@ var require_alias2 = __commonJS({
     };
     var mergeAlias = (alias) => (0, _applyOptionsChain.applyOptionsChain)({}, alias);
     var getAliasConfig = (aliasOption, option) => {
-      var _tsconfig_compilerOptions, _tsconfig, _tsconfig_compilerOptions1, _tsconfig1;
+      var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
       const isTsProject = _fs.default.existsSync(option.tsconfigPath);
       const alias = mergeAlias(aliasOption);
       if (!isTsProject) {
@@ -125490,12 +125493,12 @@ var require_alias2 = __commonJS({
         };
       }
       const tsconfig = (0, _get.readTsConfigByFile)(option.tsconfigPath);
-      const baseUrl = (_tsconfig = tsconfig) === null || _tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = _tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
+      const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
       return {
         absoluteBaseUrl: baseUrl ? _path.default.join(option.appDirectory, baseUrl) : option.appDirectory,
         paths: {
           ...alias,
-          ...(_tsconfig1 = tsconfig) === null || _tsconfig1 === void 0 ? void 0 : (_tsconfig_compilerOptions1 = _tsconfig1.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
+          ...tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
         },
         isTsPath: true,
         isTsProject
@@ -125890,7 +125893,7 @@ var require_port2 = __commonJS({
         if (strictPort) {
           throw new Error(`Port "${original}" is occupied, please choose another one.`);
         } else if (!slient) {
-          _logger.logger.info(`Something is already running on port ${original}. ${_compiled.chalk.yellow(`Use port ${port} instead.`)}`);
+          _logger.logger.info(`Port ${original} is in use. ${_compiled.chalk.yellow(`using port ${port}.`)}`);
         }
       }
       return port;
@@ -125942,10 +125945,7 @@ var require_prettyInstructions2 = __commonJS({
     var getAddressUrls = (protocol = "http", port, host) => {
       const LOCAL_LABEL = "Local:  ";
       const NETWORK_LABEL = "Network:  ";
-      const isLocalhost = (url) => {
-        var _url;
-        return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
-      };
+      const isLocalhost = (url) => url === null || url === void 0 ? void 0 : url.includes("localhost");
       if (host && host !== _constants.DEFAULT_DEV_HOST) {
         return [
           {
@@ -125976,7 +125976,7 @@ var require_prettyInstructions2 = __commonJS({
       const isHttps = (0, _is.isDev)() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
       const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
       const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
-      let message = "App running at:\n\n";
+      let message = "\n";
       if ((0, _is.isSingleEntry)(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
         message += urls.map(({ label, url }) => `  ${_compiled.chalk.bold(`> ${label.padEnd(10)}`)}${_compiled.chalk.cyanBright(normalizeUrl(`${url}/${routes[0].urlPath}`))}
 `).join("");
@@ -126038,9 +126038,8 @@ var require_require2 = __commonJS({
     });
     var _fs = require_fs2();
     var compatRequire = (filePath, interop = true) => {
-      var _mod;
       const mod = require(filePath);
-      const rtnESMDefault = interop && ((_mod = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
+      const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
       return rtnESMDefault ? mod.default : mod;
     };
     var dynamicImport = new Function("modulePath", "return import(modulePath)");
@@ -145771,18 +145770,12 @@ var getSolutionSchema = (extra = {}) => {
         type: "string",
         title: extra.isMonorepo ? i18n2.t(localeKeys2.sub_solution.self) : i18n2.t(localeKeys2.solution.self),
         enum: (() => {
-          var _extra, _extra1, _extra_customPlugin_custom, _extra_customPlugin, _extra2;
-          const items = (((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.solutions) || Object.values(((_extra1 = extra) === null || _extra1 === void 0 ? void 0 : _extra1.isMonorepo) ? SubSolution : Solution)).filter((solution) => {
-            var _extra3;
-            return !(((_extra3 = extra) === null || _extra3 === void 0 ? void 0 : _extra3.isSubProject) && solution === Solution.Monorepo);
-          }).map((solution) => {
-            var _extra3;
-            return {
-              value: solution,
-              label: ((_extra3 = extra) === null || _extra3 === void 0 ? void 0 : _extra3.isMonorepo) ? SubSolutionText[solution]() : SolutionText[solution]()
-            };
-          });
-          if ((_extra2 = extra) === null || _extra2 === void 0 ? void 0 : (_extra_customPlugin = _extra2.customPlugin) === null || _extra_customPlugin === void 0 ? void 0 : (_extra_customPlugin_custom = _extra_customPlugin.custom) === null || _extra_customPlugin_custom === void 0 ? void 0 : _extra_customPlugin_custom.length) {
+          var _extra_customPlugin_custom, _extra_customPlugin;
+          const items = ((extra === null || extra === void 0 ? void 0 : extra.solutions) || Object.values((extra === null || extra === void 0 ? void 0 : extra.isMonorepo) ? SubSolution : Solution)).filter((solution) => !((extra === null || extra === void 0 ? void 0 : extra.isSubProject) && solution === Solution.Monorepo)).map((solution) => ({
+            value: solution,
+            label: (extra === null || extra === void 0 ? void 0 : extra.isMonorepo) ? SubSolutionText[solution]() : SolutionText[solution]()
+          }));
+          if (extra === null || extra === void 0 ? void 0 : (_extra_customPlugin = extra.customPlugin) === null || _extra_customPlugin === void 0 ? void 0 : (_extra_customPlugin_custom = _extra_customPlugin.custom) === null || _extra_customPlugin_custom === void 0 ? void 0 : _extra_customPlugin_custom.length) {
             return [
               ...items,
               {
@@ -145798,8 +145791,7 @@ var getSolutionSchema = (extra = {}) => {
   };
 };
 var getScenesSchema = (extra = {}) => {
-  var _extra, _extra1, _extra2, _extra3, _extra4, _extra5, _extra6;
-  const hasPlugin = ((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.customPlugin) && extra.customPlugin[((_extra1 = extra) === null || _extra1 === void 0 ? void 0 : _extra1.isMonorepoSubProject) ? getSolutionNameFromSubSolution((_extra2 = extra) === null || _extra2 === void 0 ? void 0 : _extra2.solution) : (_extra3 = extra) === null || _extra3 === void 0 ? void 0 : _extra3.solution] && extra.customPlugin[((_extra4 = extra) === null || _extra4 === void 0 ? void 0 : _extra4.isMonorepoSubProject) ? getSolutionNameFromSubSolution((_extra5 = extra) === null || _extra5 === void 0 ? void 0 : _extra5.solution) : (_extra6 = extra) === null || _extra6 === void 0 ? void 0 : _extra6.solution].length > 0;
+  const hasPlugin = (extra === null || extra === void 0 ? void 0 : extra.customPlugin) && extra.customPlugin[(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution] && extra.customPlugin[(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution].length > 0;
   return {
     type: "object",
     properties: hasPlugin ? {
@@ -145807,17 +145799,15 @@ var getScenesSchema = (extra = {}) => {
         type: "string",
         title: i18n2.t(localeKeys2.scenes.self),
         enum: (() => {
-          var _extra7, _extra12, _extra22, _extra32, _extra42;
-          const solution = ((_extra7 = extra) === null || _extra7 === void 0 ? void 0 : _extra7.isMonorepoSubProject) ? getSolutionNameFromSubSolution((_extra12 = extra) === null || _extra12 === void 0 ? void 0 : _extra12.solution) : (_extra22 = extra) === null || _extra22 === void 0 ? void 0 : _extra22.solution;
-          const items = (((_extra32 = extra) === null || _extra32 === void 0 ? void 0 : _extra32.customPlugin) ? ((_extra42 = extra) === null || _extra42 === void 0 ? void 0 : _extra42.customPlugin[solution]) || [] : []).map((plugin) => ({
+          const solution = (extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution;
+          const items = ((extra === null || extra === void 0 ? void 0 : extra.customPlugin) ? (extra === null || extra === void 0 ? void 0 : extra.customPlugin[solution]) || [] : []).map((plugin) => ({
             value: plugin.key,
             label: extra.locale === "zh" ? plugin.name_zh || plugin.name : plugin.name
           }));
           if (solution && solution !== "custom") {
-            var _extra52;
             items.unshift({
               value: solution,
-              label: `${((_extra52 = extra) === null || _extra52 === void 0 ? void 0 : _extra52.isMonorepoSubProject) ? SubSolutionText[solution]() : SolutionText[solution]()}(${i18n2.t(localeKeys2.solution.default)})`
+              label: `${(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? SubSolutionText[solution]() : SolutionText[solution]()}(${i18n2.t(localeKeys2.solution.default)})`
             });
           }
           return items;
@@ -145873,14 +145863,10 @@ var PackageManagerName = {
   [PackageManager.Npm]: "npm"
 };
 var getPackageManagerSchema = (extra = {}) => {
-  var _extra, _extra1;
   return {
     type: "string",
     title: i18n2.t(localeKeys2.packageManager.self),
-    enum: Object.values(PackageManager).filter((packageManager) => {
-      var _extra2;
-      return ((_extra2 = extra) === null || _extra2 === void 0 ? void 0 : _extra2.solution) === "monorepo" ? packageManager !== PackageManager.Npm : true;
-    }).map((packageManager) => ({
+    enum: Object.values(PackageManager).filter((packageManager) => (extra === null || extra === void 0 ? void 0 : extra.solution) === "monorepo" ? packageManager !== PackageManager.Npm : true).map((packageManager) => ({
       value: packageManager,
       label: PackageManagerName[packageManager]
     })),
@@ -145889,7 +145875,7 @@ var getPackageManagerSchema = (extra = {}) => {
         dependencies: [],
         fulfill: {
           state: {
-            visible: !((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.isMonorepoSubProject) && !((_extra1 = extra) === null || _extra1 === void 0 ? void 0 : _extra1.isSubProject)
+            visible: !(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) && !(extra === null || extra === void 0 ? void 0 : extra.isSubProject)
           }
         }
       }
@@ -145899,16 +145885,15 @@ var getPackageManagerSchema = (extra = {}) => {
 
 // ../../generator-common/dist/esm-node/common/packageName.js
 var getPackageNameSchema = (extra = {}) => {
-  var _extra, _extra1, _extra2;
   return {
     type: "string",
-    title: ((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.isMonorepoSubProject) ? i18n2.t(localeKeys2.packageName.sub_name) : i18n2.t(localeKeys2.packageName.self),
+    title: (extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? i18n2.t(localeKeys2.packageName.sub_name) : i18n2.t(localeKeys2.packageName.self),
     "x-reactions": [
       {
         dependencies: [],
         fulfill: {
           state: {
-            visible: Boolean((_extra1 = extra) === null || _extra1 === void 0 ? void 0 : _extra1.isMonorepoSubProject) || !((_extra2 = extra) === null || _extra2 === void 0 ? void 0 : _extra2.isMwa)
+            visible: Boolean(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) || !(extra === null || extra === void 0 ? void 0 : extra.isMwa)
           }
         }
       }
@@ -145925,7 +145910,6 @@ var getPackageNameSchema = (extra = {}) => {
 // ../../generator-common/dist/esm-node/common/packagePath.js
 var PackagePathRegex = new RegExp("^[a-z0-9-_]+[a-z0-9-/_]*$");
 var getPackagePathSchema = (extra) => {
-  var _extra;
   return {
     type: "string",
     title: i18n2.t(localeKeys2.packagePath.self),
@@ -145937,7 +145921,7 @@ var getPackagePathSchema = (extra) => {
         fulfill: {
           state: {
             value: "{{$deps[0]}}",
-            visible: Boolean((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.isMonorepoSubProject)
+            visible: Boolean(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject)
           }
         }
       }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.1",
+  "version": "3.2.2",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -29,16 +29,16 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-plugin": "3.2.1",
-    "@modern-js/module-generator": "3.2.1",
-    "@modern-js/monorepo-generator": "3.2.1",
-    "@modern-js/mwa-generator": "3.2.1",
-    "@modern-js/utils": "2.35.0",
-    "@modern-js/generator-utils": "3.2.1",
-    "@modern-js/generator-common": "3.2.1",
-    "@modern-js/base-generator": "3.2.1",
-    "@scripts/jest-config": "2.35.0",
-    "@scripts/build": "2.35.0"
+    "@modern-js/generator-utils": "3.2.2",
+    "@modern-js/module-generator": "3.2.2",
+    "@modern-js/monorepo-generator": "3.2.2",
+    "@modern-js/mwa-generator": "3.2.2",
+    "@modern-js/utils": "2.35.1",
+    "@modern-js/generator-plugin": "3.2.2",
+    "@modern-js/generator-common": "3.2.2",
+    "@modern-js/base-generator": "3.2.2",
+    "@scripts/jest-config": "2.35.1",
+    "@scripts/build": "2.35.1"
   },
   "sideEffects": false,
   "publishConfig": {