gant-core 0.1.30 → 0.1.32

package/lib/cli/index.js

@@ -6006,10 +6006,10 @@ const defineConfig = (config = defaultConfig) => {
 };
 
 const DEFAULT_CONFIG_FILES = [
-    'config/config.ts',
-    'config/config.js',
-    'config.ts',
-    'config.js',
+    "config/config.ts",
+    "config/config.js",
+    "config.ts",
+    "config.js",
 ];
 class Config {
     opts;
@@ -6030,10 +6030,10 @@ class Config {
         });
         this.mainConfigFile && this.configFiles.push(this.mainConfigFile);
         const fileArray = [this.opts.cwd];
-        const packages = get$3(userConfig, 'packages', {});
+        const packages = get$3(userConfig, "packages", {});
         const alias = {
-            '@gant': path$5.resolve(this.opts.cwd, 'src/.gant'),
-            [userConfig.name || '@@']: path$5.resolve(this.opts.cwd),
+            "@gant": path$5.resolve(this.opts.cwd, "src/.gant"),
+            [userConfig.name || "@@"]: path$5.resolve(this.opts.cwd),
             ...packages,
         };
         let tempConfig = {
@@ -6057,7 +6057,12 @@ class Config {
                     cwd: packagePath,
                     mainConfigFile: configFile,
                 });
-                tempConfig = mergeConfig$1(tempConfig, packageConfig);
+                tempConfig = mergeConfig$1(tempConfig, pick(packageConfig, [
+                    "routes",
+                    "microServiceMap",
+                    "setting",
+                    "define",
+                ]));
             });
         }
         return {
@@ -6083,7 +6088,7 @@ class Config {
             config = getJavascriptfile(getAbsFile(opts.mainConfigFile, opts.cwd));
         }
         catch (error) {
-            console.log('getUserConfig Error :', error);
+            console.log("getUserConfig Error :", error);
         }
         return config;
     }
@@ -6175,7 +6180,7 @@ const generateRoutes = (rootPath, _routes, mpas) => {
 };
 
 const generateTsConfig = (rootPath, options) => {
-    const { packages, name, cwd, vue } = options;
+    const { packages = {}, name, cwd, vue } = options;
     const currentPath = path$5.resolve(cwd);
     const paths = {
         [`${name}/*`]: [`${currentPath}/*`],
@@ -6183,7 +6188,7 @@ const generateTsConfig = (rootPath, options) => {
         "@gant": [path$5.resolve(currentPath, "src/.gant")],
     };
     const includes = [currentPath];
-    Object.keys(packages).map((name) => {
+    keys$6(packages).map((name) => {
         includes.push(packages[name]);
         paths[`${name}/*`] = [`${packages[name]}/*`];
         paths[`${name}`] = [`${packages[name]}`];
@@ -6216,15 +6221,20 @@ const generateTsConfig = (rootPath, options) => {
     jsonObj.include = include;
     writeFileToJSON(path$5.resolve(rootPath, "tsconfig.json"), JSON.stringify(jsonObj));
     writeFileToJS(path$5.resolve(rootPath, "types.d.ts"), typesString);
-    Object.keys(packages).map((name) => {
-        const itemDirPath = path$5.resolve(packages[name], "src/.gant");
-        if (fs$6.existsSync(itemDirPath)) {
-            fs$6.rmdirSync(itemDirPath, { recursive: true });
-        }
-        fs$6.mkdirSync(itemDirPath, { recursive: true });
-        writeFileToJSON(path$5.resolve(itemDirPath, "tsconfig.json"), JSON.stringify(jsonObj));
-        writeFileToJS(path$5.resolve(itemDirPath, "types.d.ts"), typesString);
-    });
+    try {
+        Object.keys(packages).map((name) => {
+            const itemDirPath = path$5.resolve(packages[name], "src/.gant");
+            if (fs$6.existsSync(itemDirPath)) {
+                fs$6.rmdirSync(itemDirPath, { recursive: true });
+            }
+            fs$6.mkdirSync(itemDirPath, { recursive: true });
+            writeFileToJSON(path$5.resolve(itemDirPath, "tsconfig.json"), JSON.stringify(jsonObj));
+            writeFileToJS(path$5.resolve(itemDirPath, "types.d.ts"), typesString);
+        });
+    }
+    catch (error) {
+        console.error("创建配置文件错误：", error);
+    }
 };
 
 var generateI18n = (userConfig, cwd) => {
@@ -6252,9 +6262,9 @@ var generateI18n = (userConfig, cwd) => {
 
 const generateGant = (userConfig, cwd, vue) => {
     // 不是库模式，创建.gant临时文件
-    const tempPath = path$5.resolve(cwd, 'src/.gant');
-    let content = '';
-    let AppContent = '';
+    const tempPath = path$5.resolve(cwd, "src/.gant");
+    let content = "";
+    let AppContent = "";
     generateDir(tempPath);
     //生成路由文件
     const resRoutes = generateRoutes(tempPath, userConfig.routes, userConfig.mpas);
@@ -6263,7 +6273,7 @@ const generateGant = (userConfig, cwd, vue) => {
         packages: userConfig.packages,
         name: userConfig.name,
         cwd,
-        vue
+        vue,
     });
     //生成index.ts
     if (resRoutes) {
@@ -6272,12 +6282,12 @@ const generateGant = (userConfig, cwd, vue) => {
     // 生成 I18n
     generateI18n(userConfig, cwd);
     //app复制到前置执行
-    let indexString = fs$6.readFileSync(path$5.resolve(__dirname, './template/core.txt'), 'utf-8');
+    let indexString = fs$6.readFileSync(path$5.resolve(__dirname, "./template/core.txt"), "utf-8");
     const packagesPaths = [...values(userConfig.packages), cwd];
     //复制public 并前置项目模块中的app文件
-    const APP_CONFIG_FILES = ['app.ts', 'app.tsx', 'app.js'];
+    const APP_CONFIG_FILES = ["app.ts", "app.tsx", "app.js"];
     packagesPaths.map((packagePath) => {
-        copyFolder(path$5.resolve(packagePath, 'public'), path$5.resolve(tempPath, 'public'));
+        copyFolder(path$5.resolve(packagePath, "public"), path$5.resolve(tempPath, "public"));
         for (const fileName of APP_CONFIG_FILES) {
             const appPath = path$5.resolve(packagePath, fileName);
             if (fs$6.existsSync(appPath))
@@ -6286,9 +6296,9 @@ const generateGant = (userConfig, cwd, vue) => {
         return packagePath;
     });
     content += indexString;
-    writeFileToJS(path$5.resolve(tempPath, 'index.ts'), content);
+    writeFileToJS(path$5.resolve(tempPath, "index.ts"), content);
     if (!!AppContent)
-        writeFileToJS(path$5.resolve(tempPath, 'app.ts'), AppContent);
+        writeFileToJS(path$5.resolve(tempPath, "app.ts"), AppContent);
 };
 
 class CopyFolderPlugin {
@@ -48723,7 +48733,7 @@ const createCwdConfig = (cwd, name, vue) => {
 };
 
 var name = "gant-core";
-var version = "0.1.30";
+var version = "0.1.31";
 var description = "";
 var main = "lib/index.js";
 var bin = {