@modern-js/mwa-generator 3.7.2 → 3.7.3

package/dist/index.js

@@ -62,14 +62,6 @@
         if (typeof require !== "undefined") return require.apply(this, arguments);
         throw Error('Dynamic require of "' + x + '" is not supported');
     });
-    var __objRest = (source, exclude)=>{
-        var target = {};
-        for(var prop in source)if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0) target[prop] = source[prop];
-        if (source != null && __getOwnPropSymbols) for (var prop of __getOwnPropSymbols(source)){
-            if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop)) target[prop] = source[prop];
-        }
-        return target;
-    };
     var __commonJS = (cb, mod)=>function __require2() {
             return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = {
                 exports: {}
@@ -119,6 +111,13 @@
             module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithApiApp"];
         }
     });
+    // globals:@modern-js/codesmith-utils/lodash
+    var require_lodash = __commonJS({
+        "globals:@modern-js/codesmith-utils/lodash" (exports, module1) {
+            "use strict";
+            module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithLodashUtils"];
+        }
+    });
     // globals:@modern-js/plugin-i18n
     var require_plugin_i18n = __commonJS({
         "globals:@modern-js/plugin-i18n" (exports, module1) {
@@ -2418,25 +2417,11 @@
     });
     // src/index.ts
     var import_codesmith_api_app = __toESM(require_codesmith_api_app());
+    var import_lodash = __toESM(require_lodash());
     // ../../generator-common/dist/esm-node/locale/index.js
     var import_plugin_i18n = __toESM(require_plugin_i18n());
     // ../../generator-common/dist/esm-node/locale/en.js
     var EN_LOCALE = {
-        solution: {
-            self: "Please select the type of project you want to create:",
-            mwa: "Web App",
-            module: "Npm Module",
-            custom: "Custom Solution",
-            default: "Default"
-        },
-        scenes: {
-            self: "Please select the project scenario:"
-        },
-        sub_solution: {
-            self: "Please select the type of project you want to create:",
-            mwa: "Web App",
-            module: "Npm Module"
-        },
         action: {
             self: "Please select the operation you want:",
             function: {
@@ -2508,21 +2493,6 @@
     };
     // ../../generator-common/dist/esm-node/locale/zh.js
     var ZH_LOCALE = {
-        solution: {
-            self: "请选择你想创建的工程类型",
-            mwa: "Web 应用",
-            module: "Npm 模块",
-            custom: "自定义",
-            default: "默认"
-        },
-        scenes: {
-            self: "请选择项目场景"
-        },
-        sub_solution: {
-            self: "请选择你想创建的工程类型",
-            mwa: "Web 应用",
-            module: "Npm 模块"
-        },
         action: {
             self: "请选择你想要的操作",
             function: {
@@ -5536,6 +5506,12 @@ You can run the following command in the directory of the new project:
         en: EN_LOCALE3
     });
     // src/index.ts
+    var mergeDefaultConfig = (context)=>{
+        const { defaultSolution } = context.config;
+        if (defaultSolution) {
+            (0, import_lodash.merge)(context.config, MWADefaultConfig);
+        }
+    };
     var handleTemplateFile = (context, generator, appApi)=>__async(void 0, null, function*() {
             var _a, _b;
             (_a = generator.logger) == null ? void 0 : _a.timing(`🕐 Get Modern.js app-tools version`);
@@ -5556,35 +5532,15 @@ You can run the following command in the directory of the new project:
                 isMwa: true,
                 isEmptySrc: true
             });
-            const _c = context.config, { hasPlugin, generatorPlugin } = _c, extra = __objRest(_c, [
-                "hasPlugin",
-                "generatorPlugin"
-            ]);
             let ans = {};
-            if (hasPlugin) {
-                yield generatorPlugin.installPlugins(Solution.MWA, extra);
-                const schema2 = generatorPlugin.getInputSchema();
-                const inputValue = generatorPlugin.getInputValue();
-                const defaultConfig = generatorPlugin.getDefaultConfig();
-                context.config.gitCommitMessage = generatorPlugin.getGitMessage() || context.config.gitCommitMessage;
-                ans = yield appApi.getInputBySchema(schema2, "formily", __spreadValues(__spreadValues({}, context.config), defaultConfig), {
-                    packageName: (input)=>validatePackageName(input, packages, {
-                            isMonorepoSubProject
-                        }),
-                    packagePath: (input)=>validatePackagePath(input, _path.default.join(process.cwd(), projectDir), {
-                            isMwa: true
-                        })
-                }, __spreadValues({}, inputValue));
-            } else {
-                ans = yield appApi.getInputBySchemaFunc(getMWASchema, __spreadValues({}, context.config), {
-                    packageName: (input)=>validatePackageName(input, packages, {
-                            isMonorepoSubProject
-                        }),
-                    packagePath: (input)=>validatePackagePath(input, _path.default.join(process.cwd(), projectDir), {
-                            isMwa: true
-                        })
-                });
-            }
+            ans = yield appApi.getInputBySchemaFunc(getMWASchema, __spreadValues({}, context.config), {
+                packageName: (input)=>validatePackageName(input, packages, {
+                        isMonorepoSubProject
+                    }),
+                packagePath: (input)=>validatePackagePath(input, _path.default.join(process.cwd(), projectDir), {
+                        isMwa: true
+                    })
+            });
             generator.logger.debug(`💡 [Input Answer]: ${JSON.stringify(ans)}`);
             const { packageName, packagePath, language, packageManager } = ans;
             const { packagesInfo } = context.config;
@@ -5593,9 +5549,7 @@ You can run the following command in the directory of the new project:
             const dirname = _path.default.basename(generator.outputPath);
             yield appApi.runSubGenerator(getGeneratorPath(BaseGenerator, context.config.distTag, [
                 __dirname
-            ]), void 0, __spreadProps(__spreadValues({}, context.config), {
-                hasPlugin: false
-            }));
+            ]), void 0, __spreadValues({}, context.config));
             yield appApi.forgeTemplate("templates/base-template/**/*", void 0, (resourceKey)=>resourceKey.replace("templates/base-template/", projectPath).replace(".handlebars", ""), {
                 name: packageName || dirname,
                 isMonorepoSubProject,
@@ -5654,14 +5608,12 @@ You can run the following command in the directory of the new project:
             generator.logger.debug("💡 [Current Config]:", JSON.stringify(context.config));
             let projectPath = "";
             try {
+                mergeDefaultConfig(context);
                 ({ projectPath } = yield handleTemplateFile(context, generator, appApi));
             } catch (e) {
                 generator.logger.error(`🔴 [Handle MWA Template Error]:`, e);
                 process.exit(1);
             }
-            if (context.handleForged) {
-                yield context.handleForged(Solution.MWA, context, context.config.hasPlugin, projectPath);
-            }
             try {
                 yield appApi.runGitAndInstall(context.config.gitCommitMessage);
             } catch (e) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.7.2",
+  "version": "3.7.3",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -30,15 +30,15 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "3.7.2",
-    "@modern-js/dependence-generator": "3.7.2",
-    "@modern-js/entry-generator": "3.7.2",
-    "@modern-js/generator-common": "3.7.2",
-    "@modern-js/generator-utils": "3.7.2",
-    "@modern-js/packages-generator": "3.7.2",
-    "@modern-js/plugin-i18n": "2.60.6",
-    "@scripts/jest-config": "2.60.6",
-    "@scripts/build": "2.60.6"
+    "@modern-js/dependence-generator": "3.7.3",
+    "@modern-js/entry-generator": "3.7.3",
+    "@modern-js/generator-common": "3.7.3",
+    "@modern-js/generator-utils": "3.7.3",
+    "@modern-js/base-generator": "3.7.3",
+    "@modern-js/packages-generator": "3.7.3",
+    "@modern-js/plugin-i18n": "2.61.0",
+    "@scripts/build": "2.61.0",
+    "@scripts/jest-config": "2.61.0"
   },
   "sideEffects": false,
   "publishConfig": {