pug-site-core 1.0.7 → 1.0.9

package/index.js

@@ -17,3 +17,38 @@ export const pugSiteCore = {
   buildStatic,
   translateLanguageData
 };
+
+let curCmd = process.env.npm_lifecycle_event;
+
+try {
+  switch (curCmd) {
+    case "getFun":
+      await generateGetDataFn();
+      break;
+    case "getData":
+      await generateGetDataFn();
+      const args = process.argv.slice(2);
+      await fetchDataToJsonFile(args);
+      break;
+    case "dev":
+      startDevServer();
+      break;
+    case "compileFn":
+      await compilePagesPugToFn();
+      break;
+    case "buildFn":
+      await buildFn();
+      break;
+    case "buildStatic":
+      await buildStatic();
+      break;
+    case "lang":
+      await translateLanguageData();
+      break;
+    default:
+      console.log(`未知的命令: ${curCmd}`);
+  }
+} catch (error) {
+  console.error(`执行命令 ${curCmd} 时发生错误:`, error);
+  process.exit(1);
+}

package/lib/devServer.js

@@ -2,7 +2,6 @@ import express from "express";
 import useragent from "express-useragent";
 import ip from "ip";
 import fse from "fs-extra";
-import path from "path";
 import _ from "lodash";
 import {
   getCompilePugFilter,
@@ -13,13 +12,11 @@ import {
 } from "./utils.js";
 import http from "http";
 import WebSocket, { WebSocketServer } from "ws";
-import { pathToFileURL, fileURLToPath } from "url";
 import { Worker } from "worker_threads";
+import { paths } from "./paths.js";
 
-const projectRoot = process.cwd();
-const configPath = pathToFileURL(path.resolve(projectRoot, "config.js")).href;
-const { config } = await import(configPath);
-const pagsTemplatePath = path.join(projectRoot, "/template/pages");
+const { config } = await import(paths.config);
+const pagsTemplatePath = paths.template.pages;
 const localIp = ip.address();
 const port = await getIdleProt(config.devServer.port, localIp);
 process.env._port = port;
@@ -47,12 +44,9 @@ function setupMiddleware(app) {
   app.use(useragent.express());
   app.set("views", config.templatePath);
   app.set("view engine", "pug");
-  app.use(
-    "/static",
-    express.static(path.join(projectRoot, "/template/static"))
-  );
-  app.use(express.static(path.join(projectRoot, "public")));
-  app.locals.basedir = path.join(projectRoot, "/template");
+  app.use("/static", express.static(paths.template.static));
+  app.use(express.static(paths.public));
+  app.locals.basedir = paths.template.root;
 }
 
 function setupRoutes(app, wss) {
@@ -89,10 +83,10 @@ function setupRoutes(app, wss) {
         if (lastPath.endsWith(".html")) {
           lastPath = lastPath.slice(0, -5);
         } else {
-          lastPath = path.join(lastPath, "index");
+          lastPath = lastPath + "/index";
         }
         jsonDataPath =
-          path.join(projectRoot, "jsonData", language, lastPath) + ".json";
+          paths.resolveRoot("jsonData", language, lastPath) + ".json";
         if (fse.pathExistsSync(jsonDataPath)) {
           data = await fse.readJSON(jsonDataPath);
         } else {
@@ -104,7 +98,8 @@ function setupRoutes(app, wss) {
           if (data) {
             lastPath = pagesPathFilter(data._template[0]).replace(".pug", "");
           }
-          pugPath = path.join(pagsTemplatePath, element, lastPath) + ".pug";
+          pugPath =
+            paths.resolveRoot(pagsTemplatePath, element, lastPath) + ".pug";
           if (fse.pathExistsSync(pugPath)) {
             break;
           }
@@ -112,7 +107,7 @@ function setupRoutes(app, wss) {
       } else {
         for (let index = 0; index < otherPath.length; index++) {
           const element = otherPath[index];
-          pugPath = path.join(
+          pugPath = paths.resolveRoot(
             pagsTemplatePath,
             element,
             findPageInfoObj.pugPath
@@ -130,19 +125,16 @@ function setupRoutes(app, wss) {
         );
         let commonData = {};
         if (config.langChangeUpdateCommon) {
-          const getDataPath = pathToFileURL(
-            path.resolve(projectRoot, "getData.js")
-          ).href;
           commonData = await (
-            await import(getDataPath)
+            await import(paths.getData)
           )["get_common_data"](language);
           await fse.writeJSON(
-            path.join(projectRoot, "jsonData", language, "_common.json"),
+            paths.resolveRoot("jsonData", language, "_common.json"),
             commonData
           );
         } else {
           commonData = await fse.readJSON(
-            path.join(projectRoot, "jsonData", language, "_common.json")
+            paths.resolveRoot("jsonData", language, "_common.json")
           );
         }
         let _refreshScript = `<script>const ws=new WebSocket('ws://${localIp}:${port}');ws.onmessage=function(event){if(event.data==='refresh'){console.log('Refreshing page...');location.reload()}}</script>`;
@@ -193,10 +185,7 @@ async function matchFileMapTable(reqPath, language, device) {
   for (let index = 0; index < fileMapTable.length; index++) {
     const obj = fileMapTable[index];
     if (obj.devMatchFn(reqPath, device)) {
-      const getDataPath = pathToFileURL(
-        path.resolve(projectRoot, "getData.js")
-      ).href;
-      const getData = await import(getDataPath);
+      const getData = await import(paths.getData);
       let data = await getData[obj.getDataFn](language);
       if (Array.isArray(data)) {
         let name = obj.outPutPath.split("/").pop().replace(/\..*$/, "");
@@ -230,9 +219,5 @@ export async function startDevServer() {
 
   server.listen(port);
 
-  // 获取当前文件的目录路径
-  const currentDir = path.dirname(fileURLToPath(import.meta.url));
-  // 构建 watchFile.js 的完整路径
-  const watchFilePath = path.join(currentDir, "watchFile.js");
-  new Worker(watchFilePath);
+  new Worker(paths.lib + "/watchFile.js");
 }

package/lib/generate.js

@@ -1,6 +1,5 @@
 import fse from "fs-extra";
 import pug from "pug";
-import path from "path";
 import {
   getPagesPugFilePathArr,
   getCompilePugFilter,
@@ -13,14 +12,9 @@ import {
 import _ from "lodash";
 import async from "async";
 import UglifyJS from "uglify-js";
-import { pathToFileURL, fileURLToPath } from "url";
-
-const projectRoot = process.cwd();
-const configPath = pathToFileURL(path.resolve(projectRoot, "config.js")).href;
-const { config } = await import(configPath);
-
-const pugRootPath = path.join(projectRoot, "template/pages");
+import { paths } from "./paths.js";
 
+const { config } = await import(paths.config);
 /**
  * 将pages目录下的pug模板编译为JS函数
  * @param {string} pugPath - 指定编译的pug文件路径(相对于/template/pages)
@@ -31,16 +25,15 @@ export async function compilePagesPugToFn(pugPath) {
   try {
     // 获取所有需要编译的pug文件路径
     const pagesPugFilePathArr = await getPagesPugFilePathArr();
-    const fnRootPath = path.join(projectRoot, "/pagesPugFn");
 
-    // 获取当前文件的目录路径
-    const currentDir = path.dirname(fileURLToPath(import.meta.url));
     // 读取pug运行时代码作为基础代码
-    const pugRuntimePath = path.join(currentDir, "pugRuntime.js");
-    const lastPugFnStr = await fse.readFile(pugRuntimePath, "utf8");
+    const lastPugFnStr = await fse.readFile(paths.pugRuntime, "utf8");
 
     // 验证指定路径是否存在
-    if (pugPath && !fse.pathExistsSync(path.join(pugRootPath, pugPath))) {
+    if (
+      pugPath &&
+      !fse.pathExistsSync(paths.resolveRoot(paths.template.pages, pugPath))
+    ) {
       throw new Error("路径不存在! 注意路径前面会自动拼接/template/pages");
     }
 
@@ -54,14 +47,14 @@ export async function compilePagesPugToFn(pugPath) {
       ),
       10, // 限制并发数为10
       async (fileName) => {
-        const filePath = path.join(pugRootPath, fileName);
+        const filePath = paths.resolveRoot(paths.template.pages, fileName);
         const funName = fileName.split(pathSymbol).join("_").slice(0, -4);
 
         // 读取并编译pug文件
         const pugValue = await fse.readFile(filePath, "utf8");
         const fnStr = pug.compileClient(pugValue, {
           filename: filePath,
-          basedir: path.join(projectRoot, "/template"),
+          basedir: paths.template.root,
           compileDebug: true,
           name: funName,
           filters: getCompilePugFilter()
@@ -93,7 +86,7 @@ export async function compilePagesPugToFn(pugPath) {
     }
 
     // 写入最终文件
-    const outputPath = path.join(fnRootPath, "index.js");
+    const outputPath = paths.resolveRoot("pagesPugFn", "index.js");
     await fse.ensureFile(outputPath);
     await fse.writeFile(outputPath, result.code);
   } catch (error) {
@@ -109,7 +102,7 @@ export async function compilePagesPugToFn(pugPath) {
  */
 export async function generateGetDataFn() {
   try {
-    const getDataPath = path.join(projectRoot, "getData.js");
+    const getDataPath = paths.resolveRoot("getData.js");
     const getDataFile = await fse.readFile(getDataPath, "utf8");
     const pagesPugFilePathArr = await getPagesPugFilePathArr(true);
 
@@ -146,7 +139,7 @@ export async function generateGetDataFn() {
  */
 export async function fetchDataToJsonFile(args) {
   try {
-    const JsonRootPath = path.join(projectRoot, "/jsonData");
+    const JsonRootPath = paths.resolveRoot("jsonData");
 
     // 解析过滤参数
     let filterFun = [];
@@ -168,10 +161,7 @@ export async function fetchDataToJsonFile(args) {
       await fse.remove(JsonRootPath);
     }
 
-    const getDataPath = pathToFileURL(
-      path.resolve(projectRoot, "getData.js")
-    ).href;
-    const getData = await import(getDataPath);
+    const getData = await import(paths.getData);
     let arrPagesPugFilePathArr = await getPagesPugFilePathArr();
     let pagesPugFilePathArr = await getPagesPugFilePathArr(true);
     let filterFinishArr = arrPagesPugFilePathArr.filter(
@@ -191,7 +181,7 @@ export async function fetchDataToJsonFile(args) {
 
         // 清空指定语言的数据目录
         if (filterLang.includes(language) && !filterFun.length) {
-          await fse.remove(path.join(JsonRootPath, language));
+          await fse.remove(paths.resolveRoot("jsonData", language));
         }
 
         // 处理公共数据
@@ -200,7 +190,7 @@ export async function fetchDataToJsonFile(args) {
           const commonData = await getData[commonFuncName](language);
           console.log(language, commonFuncName, "开始写入json文件");
           await fse.outputJSON(
-            path.join(JsonRootPath, language, "_common.json"),
+            paths.resolveRoot("jsonData", language, "_common.json"),
             commonData
           );
         }
@@ -260,8 +250,8 @@ export async function fetchDataToJsonFile(args) {
                           `命名但是${index}下标中对象属性不存在`
                       );
                     }
-                    jsonFilePath = path.join(
-                      JsonRootPath,
+                    jsonFilePath = paths.resolveRoot(
+                      "jsonData",
                       language,
                       outPutPath.replace(name, fileName)
                     );
@@ -269,12 +259,20 @@ export async function fetchDataToJsonFile(args) {
                     await fse.outputJson(jsonFilePath, dataItem);
                   }
                 } else {
-                  jsonFilePath = path.join(JsonRootPath, language, outPutPath);
+                  jsonFilePath = paths.resolveRoot(
+                    "jsonData",
+                    language,
+                    outPutPath
+                  );
                   await fse.remove(jsonFilePath);
                   await fse.outputJson(jsonFilePath, data);
                 }
               } else if (typeof data === "object") {
-                jsonFilePath = path.join(JsonRootPath, language, outPutPath);
+                jsonFilePath = paths.resolveRoot(
+                  "jsonData",
+                  language,
+                  outPutPath
+                );
                 await fse.remove(jsonFilePath);
                 await fse.outputJson(jsonFilePath, data);
               }
@@ -308,15 +306,15 @@ export async function fetchDataToJsonFile(args) {
               }
               let lastJsonFilePath;
               if (item.page_name && item.page_name.length > 0) {
-                lastJsonFilePath = path.join(
-                  JsonRootPath,
+                lastJsonFilePath = paths.resolveRoot(
+                  "jsonData",
                   language,
                   ...jsonFilePath.slice(0, -1),
                   item.page_name
                 );
               } else {
                 lastJsonFilePath =
-                  path.join(JsonRootPath, language, ...jsonFilePath) +
+                  paths.resolveRoot("jsonData", language, ...jsonFilePath) +
                   "_" +
                   ++index +
                   ".json";
@@ -324,7 +322,11 @@ export async function fetchDataToJsonFile(args) {
               let templateArr = filterFinishArr.filter(
                 (item) => pagesPathFilter(item) === fileName
               );
-              if (fse.pathExistsSync(path.join(pugRootPath, fileName))) {
+              if (
+                fse.pathExistsSync(
+                  paths.resolveRoot(paths.template.pages, fileName)
+                )
+              ) {
                 templateArr.unshift(fileName);
               }
               item._template = templateArr;
@@ -334,20 +336,25 @@ export async function fetchDataToJsonFile(args) {
           } else if (data && typeof data === "object" && !Array.isArray(data)) {
             console.log(language, funName, "开始写入json文件");
             if (data.page_name && data.page_name.length > 0) {
-              jsonFilePath = path.join(
-                JsonRootPath,
+              jsonFilePath = paths.resolveRoot(
+                "jsonData",
                 language,
                 ...jsonFilePath.slice(0, -1),
                 data.page_name
               );
             } else {
               jsonFilePath =
-                path.join(JsonRootPath, language, ...jsonFilePath) + ".json";
+                paths.resolveRoot("jsonData", language, ...jsonFilePath) +
+                ".json";
             }
             let templateArr = filterFinishArr.filter(
               (item) => pagesPathFilter(item) === fileName
             );
-            if (fse.pathExistsSync(path.join(pugRootPath, fileName))) {
+            if (
+              fse.pathExistsSync(
+                paths.resolveRoot(paths.template.pages, fileName)
+              )
+            ) {
               templateArr.unshift(fileName);
             }
             data._template = templateArr;
@@ -366,7 +373,7 @@ export async function fetchDataToJsonFile(args) {
 }
 
 export async function buildFn() {
-  const jsonDataPath = path.join(projectRoot, "jsonData");
+  const jsonDataPath = paths.resolveRoot("jsonData");
   if (!fse.pathExistsSync(jsonDataPath)) {
     return Promise.reject(
       jsonDataPath,
@@ -375,36 +382,33 @@ export async function buildFn() {
   }
   console.log("开始打包...");
   let starTime = Date.now();
-  let outputPath = path.join(projectRoot, config.fnOutput);
+  let outputPath = paths.resolveRoot(config.fnOutput);
   await fse.remove(outputPath);
   await sleep(0);
   await compilePagesPugToFn();
   await fse.copy(
-    path.join(projectRoot, "pagesPugFn/index.js"),
-    path.join(outputPath, "page/pages.js")
+    paths.resolveRoot("pagesPugFn/index.js"),
+    paths.resolveRoot(outputPath, "page/pages.js")
   );
 
-  const routerPath = path.join(projectRoot, "router.js");
+  const routerPath = paths.resolveRoot("router.js");
   if (!fse.pathExistsSync(routerPath)) {
     return Promise.reject("router.js文件不存在!");
   }
 
-  await fse.copy(routerPath, path.join(outputPath, "page/router.js"));
-  await fse.copy(
-    path.join(projectRoot, "public"),
-    path.join(outputPath, "page")
-  );
+  await fse.copy(routerPath, paths.resolveRoot(outputPath, "page/router.js"));
+  await fse.copy(paths.public, paths.resolveRoot(outputPath, "page"));
 
   let totalCommonData = {};
   totalCommonData.langCommon = config.commonData;
   await async.each(config.languageList, async (lang) => {
     let commonData = await fse.readJSON(
-      path.join(jsonDataPath, lang, "_common.json")
+      paths.resolveRoot("jsonData", lang, "_common.json")
     );
     totalCommonData[lang] = commonData;
   });
 
-  await fse.copy(path.join(jsonDataPath), path.join(outputPath, "data"), {
+  await fse.copy(jsonDataPath, paths.resolveRoot(outputPath, "data"), {
     filter: (src, dest) => {
       // 排除_common.json 文件
       return !src.endsWith("_common.json");
@@ -412,8 +416,8 @@ export async function buildFn() {
   });
 
   await fse.copy(
-    path.join(projectRoot, "/template/static"),
-    path.join(outputPath, "page/static"),
+    paths.template.static,
+    paths.resolveRoot(outputPath, "page/static"),
     {
       filter: (src, dest) => {
         //根目录必须要返回true
@@ -423,7 +427,7 @@ export async function buildFn() {
         if (config.buildStaticDirArr && config.buildStaticDirArr.length > 0) {
           return !!config.buildStaticDirArr.find((item) => {
             return src.startsWith(
-              path.join(projectRoot, "/template/static", item)
+              paths.resolveRoot(paths.template.static, item)
             );
           });
         }
@@ -433,14 +437,14 @@ export async function buildFn() {
   );
 
   await fse.writeJSON(
-    path.join(outputPath, "page", "common") + ".json",
+    paths.resolveRoot(outputPath, "page", "common") + ".json",
     totalCommonData
   );
 
   if (config.obfuscateJavaScript) {
     console.log("开始混淆js文件...");
     const startTime = Date.now();
-    await obfuscateJavaScript(path.join(outputPath, "page", "static"));
+    await obfuscateJavaScript(paths.resolveRoot(outputPath, "page", "static"));
     const costTime = (Date.now() - startTime) / 1000;
     console.log("混淆js文件耗时:", costTime, "s");
   }
@@ -450,7 +454,7 @@ export async function buildFn() {
 
 //html文件打包 不维护了
 export async function buildStatic() {
-  let jsonDataPath = path.join(projectRoot, "jsonData");
+  let jsonDataPath = paths.resolveRoot("jsonData");
 
   if (!fse.pathExistsSync(jsonDataPath)) {
     return Promise.reject(
@@ -459,14 +463,14 @@ export async function buildStatic() {
   }
   console.log("开始打包...");
   let starTime = Date.now();
-  let distOutputPath = path.join(projectRoot, config.staticOutput);
+  let distOutputPath = paths.resolveRoot(config.staticOutput);
   await fse.remove(distOutputPath);
   await sleep(0);
-  await fse.copy(path.join(projectRoot, "public"), distOutputPath);
+  await fse.copy(paths.public, distOutputPath);
 
   await fse.copy(
-    path.join(projectRoot, "/template/static"),
-    path.join(distOutputPath, "static"),
+    paths.template.static,
+    paths.resolveRoot(distOutputPath, "static"),
     {
       filter: (src, dest) => {
         //根目录必须要返回true
@@ -476,7 +480,7 @@ export async function buildStatic() {
         if (config.buildStaticDirArr && config.buildStaticDirArr.length > 0) {
           return !!config.buildStaticDirArr.find((item) => {
             return src.startsWith(
-              path.join(projectRoot, "/template/static", item)
+              paths.resolveRoot(paths.template.static, item)
             );
           });
         }
@@ -486,18 +490,12 @@ export async function buildStatic() {
   );
 
   await compilePagesPugToFn();
-  const pagesPugFnPath = pathToFileURL(
-    path.resolve(projectRoot, "pagesPugFn/index.js")
-  ).href;
-  let PagesPugToFn = await import(pagesPugFnPath);
-  const getDataPath = pathToFileURL(
-    path.resolve(projectRoot, "getData.js")
-  ).href;
-  const getData = await import(getDataPath);
+  let PagesPugToFn = await import(paths.pagesPugFn);
+  const getData = await import(paths.getData);
 
   const fileMapTable = config.fileMapTable;
   await async.each(config.languageList, async (lang) => {
-    let langDataPath = path.join(jsonDataPath, lang);
+    let langDataPath = paths.resolveRoot(jsonDataPath, lang);
     if (!fse.pathExistsSync(langDataPath)) {
       console.log(
         `注意配置了${lang}语言但${langDataPath}中没有生成${lang}语言的数据!`
@@ -505,7 +503,7 @@ export async function buildStatic() {
       return;
     }
     let commonData = await fse.readJSON(
-      path.join(projectRoot, "jsonData", lang, "_common.json")
+      paths.resolveRoot("jsonData", lang, "_common.json")
     );
     commonData = _.merge(commonData, config.commonData);
 
@@ -531,8 +529,8 @@ export async function buildStatic() {
             pugPathPreArr = obj.deviceList;
           }
           await async.each(pugPathPreArr, async (devicePrefix) => {
-            let pugPath = path.join(
-              pugRootPath,
+            let pugPath = paths.resolveRoot(
+              paths.template.pages,
               langPrefix,
               devicePrefix,
               obj.pugPath.split("/").join(pathSymbol)
@@ -574,14 +572,14 @@ export async function buildStatic() {
                         `命名但是${index}下标中对象${property}属性为:${fileName}`
                     );
                   }
-                  htmlPath = path.join(
+                  htmlPath = paths.resolveRoot.join(
                     distOutputPath,
                     lang,
                     devicePrefix,
                     outPutPath.replace(name, fileName)
                   );
                   html = pug.compileFile(pugPath, {
-                    basedir: path.join(projectRoot, "/template"),
+                    basedir: paths.template.root,
                     compileDebug: true,
                     filters: getCompilePugFilter()
                   })({
@@ -593,15 +591,14 @@ export async function buildStatic() {
                   await fse.writeFile(htmlPath, html);
                 }
               } else {
-                htmlPath = path.join(
-                  projectRoot,
-                  "template",
+                htmlPath = paths.resolveRoot(
+                  paths.template.root,
                   lang,
                   devicePrefix,
                   outPutPath
                 );
                 html = pug.compileFile(pugPath, {
-                  basedir: path.join(projectRoot, "/template"),
+                  basedir: paths.template.root,
                   compileDebug: true,
                   filters: getCompilePugFilter()
                 })({
@@ -613,14 +610,14 @@ export async function buildStatic() {
                 await fse.writeFile(htmlPath, html);
               }
             } else if (typeof data === "object") {
-              htmlPath = path.join(
+              htmlPath = paths.resolveRoot(
                 distOutputPath,
                 lang,
                 devicePrefix,
                 outPutPath
               );
               html = pug.compileFile(pugPath, {
-                basedir: path.join(projectRoot, "/template"),
+                basedir: paths.template.root,
                 compileDebug: true,
                 filters: getCompilePugFilter()
               })({
@@ -637,12 +634,14 @@ export async function buildStatic() {
     }
 
     let pagesAllJsonFileName = (
-      await fse.readdir(path.join(langDataPath), {
+      await fse.readdir(langDataPath, {
         recursive: true
       })
     ).filter((fileName) => fileName.endsWith(".json"));
     await async.eachLimit(pagesAllJsonFileName, 64, async (jsonFileName) => {
-      let data = await fse.readJSON(path.join(langDataPath, jsonFileName));
+      let data = await fse.readJSON(
+        paths.resolveRoot(langDataPath, jsonFileName)
+      );
       let pugTemplateArr = data._template;
       if (!pugTemplateArr) {
         return;
@@ -685,7 +684,7 @@ export async function buildStatic() {
             pathSymbol +
             data.page_name;
         }
-        let htmlPath = path.join(
+        let htmlPath = paths.resolveRoot(
           distOutputPath,
           lang,
           pugTemplate.replace(/\..*$/, ".html")

package/lib/paths.js

@@ -0,0 +1,38 @@
+import path from "path";
+import { pathToFileURL, fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const projectRoot = process.cwd();
+
+export const paths = {
+  // 项目根目录相关
+  projectRoot,
+  lib: __dirname,
+  config: pathToFileURL(path.resolve(projectRoot, "config.js")).href,
+  getData: pathToFileURL(path.resolve(projectRoot, "getData.js")).href,
+  pagesPugFn: pathToFileURL(path.resolve(projectRoot, "pagesPugFn/index.js"))
+    .href,
+  // 模板相关路径
+  template: {
+    root: path.join(projectRoot, "template"),
+    pages: path.join(projectRoot, "template/pages"),
+    static: path.join(projectRoot, "template/static")
+  },
+
+  // 公共资源
+  public: path.join(projectRoot, "public"),
+
+  // 运行时相关
+  pugRuntime: path.join(__dirname, "pugRuntime.js"),
+
+  // 工具函数
+  resolveRoot: (...args) => {
+    if (args[0].startsWith(projectRoot)) {
+      return path.join(...args);
+    }
+    return path.join(projectRoot, ...args);
+  }
+};
+
+export default paths;

package/lib/utils.js

@@ -2,12 +2,9 @@ import fse from "fs-extra";
 import path from "path";
 import tcpPortUsed from "tcp-port-used";
 import JavaScriptObfuscator from "javascript-obfuscator";
-import { pathToFileURL } from "url";
+import { paths } from "./paths.js";
 
-// 获取当前模块的目录名
-const __dirname = process.cwd();
-const configPath = pathToFileURL(path.resolve(__dirname, "config.js")).href;
-const { config } = await import(configPath);
+const { config } = await import(paths.config);
 
 // 根据操作系统设置路径分隔符
 export const pathSymbol = process.platform.startsWith("win") ? "\\" : "/";
@@ -19,7 +16,7 @@ export const pathSymbol = process.platform.startsWith("win") ? "\\" : "/";
  */
 export async function getPagesPugFilePathArr(isFilter) {
   let pagesPugFilePathArr = (
-    await fse.readdir(path.join(__dirname, "/template/pages"), {
+    await fse.readdir(paths.template.pages, {
       recursive: true
     })
   ).filter((fileName) => fileName.endsWith(".pug"));

package/lib/watchFile.js

@@ -1,9 +1,7 @@
 import chokidar from "chokidar";
-import path from "path";
 import { exec } from "child_process";
 import { debounce } from "./utils.js";
-
-const projectRoot = process.cwd();
+import { paths } from "./paths.js";
 
 /**
  * 更改/template刷新网页
@@ -13,8 +11,7 @@ function watchTemplate() {
     exec(`curl http://${process.env._localIp}:${process.env._port}/_refresh`);
   }, 300);
 
-  // 使用 path.join 来确保跨平台兼容性
-  let watch = chokidar.watch(path.join(projectRoot, "template"), {
+  let watch = chokidar.watch(paths.template.root, {
     persistent: true
     // ignored: [/node_modules/, /\.git/]
   });

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "pug-site-core",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "index.js",
   "type": "module",
-  "scripts": {},
+  "scripts": {
+    "dev": "nodemon --ext js --ignore node_modules/ --ignore template/ index.js",
+    "getData": "node index.js",
+    "getFun": "node index.js",
+    "compileFn": "node index.js",
+    "buildFn": "node index.js",
+    "buildStatic": "node index.js",
+    "lang": "node index.js",
+    "build": "npm run getData && npm run buildFn"
+  },
   "keywords": [],
   "author": "xy",
   "dependencies": {
@@ -24,10 +33,11 @@
     "pug": "^3.0.3",
     "tcp-port-used": "^1.0.2",
     "uglify-js": "^3.19.3",
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "axios": "^1.7.7"
   },
   "license": "ISC",
-  "description": "指令修复",
+  "description": "增加指令以及调用逻辑",
   "files": [
     "lib/",
     "index.js"