pug-site-core 3.0.10 → 3.0.12

package/lib/generate.js

@@ -447,10 +447,10 @@ export async function buildFn() {
 
   let totalCommonData = {};
   totalCommonData.langCommon = config.commonData;
+  let languageData = (await import(paths.languageData)).default
   await async.each(config.languageList, async (lang) => {
-    let commonData = await fse.readJSON(
-      paths.resolveRoot("jsonData", lang, "_common.json")
-    );
+    let commonData = await (await import(paths.getData))["get_common_data"](lang);
+    commonData.lang = _.merge(commonData.lang, languageData[lang]);
     totalCommonData[lang] = commonData;
   });
 
@@ -630,7 +630,8 @@ export async function buildStatic() {
       }
     } catch (error) {
       console.error(
-        `处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]:`, error
+        `处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]:`,
+        error
       );
       throw error;
     }
@@ -727,7 +728,8 @@ export async function buildStatic() {
         }
       } catch (error) {
         console.error(
-          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]:`,error
+          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]:`,
+          error
         );
         throw error;
       }
@@ -765,14 +767,6 @@ export async function buildStatic() {
           return;
         }
 
-        const html = generateHtml(
-          pagesPugToFn,
-          funName,
-          data,
-          pugTemplate,
-          commonData
-        );
-
         // 构建输出路径
         let finalPugTemplate = pugTemplate;
         if (data.page_name) {
@@ -788,6 +782,15 @@ export async function buildStatic() {
           finalPugTemplate.replace(/\.[^.]*$/, ".html")
         );
         console.log(htmlPath);
+
+        const html = generateHtml(
+          pagesPugToFn,
+          funName,
+          data,
+          pugTemplate,
+          commonData
+        );
+        
         const compressedHtml = await compressHtml(html, htmlPath);
         await fse.outputFile(htmlPath, compressedHtml);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -52,7 +52,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "修复语言数据打包失败的问题",
+  "description": "修改静态打包的log顺序",
   "files": [
     "lib/",
     "index.js"