@_tc/template-core 0.0.1-bate.13 → 0.0.1-bate.14

package/cjs/bundler/dev.js

@@ -1,43 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dev = dev;
-const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 async function dev() {
     // 获取入口
@@ -48,21 +11,5 @@ async function dev() {
     }
     await (0, utils_1.VBuildFE)(input);
     // 监听文件变化
-    const chokidar = await Promise.resolve().then(() => __importStar(require("chokidar")));
-    const watcher = chokidar.watch(path_1.default.resolve("src"), {
-        ignored: /(^|[\/\\])\../,
-        persistent: true,
-        ignoreInitial: true,
-    });
-    let building = false;
-    watcher.on("change", async (filePath) => {
-        if (building)
-            return;
-        building = true;
-        console.log(`changed: ${filePath}`);
-        await (0, utils_1.VBuildFE)(input);
-        console.log("rebuild done");
-        building = false;
-    });
-    console.log("watching src/...");
+    (0, utils_1.watchFiles)(async () => (0, utils_1.VBuildFE)(input));
 }

package/cjs/bundler/utils.d.ts

@@ -1,7 +1,9 @@
 /**
  *
  * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
+ * 生成入口
  */
-export declare function entries(root?: string): Record<string, string>;
+export declare function entries(): Record<string, string>;
 export declare function outDir(): string;
+export declare const watchFiles: (callback?: () => Promise<any>) => Promise<void>;
 export declare const VBuildFE: (input: Record<string, string>) => Promise<void>;

package/cjs/bundler/utils.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VBuildFE = void 0;
+exports.VBuildFE = exports.watchFiles = void 0;
 exports.entries = entries;
 exports.outDir = outDir;
 const path_1 = __importDefault(require("path"));
@@ -44,17 +44,19 @@ const glob = __importStar(require("glob"));
 const vite_1 = require("vite");
 const utils_1 = require("../packages/utils");
 const fs_1 = require("fs");
+const base = process.cwd();
+// 瞄准输出后的产物路径
+const framePath = path_1.default.resolve(__dirname, "../../");
+const frameNodePath = path_1.default.resolve(__dirname, "../");
+const frameFEPath = path_1.default.resolve(framePath, "./fe/frontend");
+const runPath = path_1.default.resolve(base, ".");
+const runFEPath = path_1.default.resolve(runPath, "./frontend");
 /**
  *
  * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
+ * 生成入口
  */
-function entries(root) {
-    const base = root ? path_1.default.resolve(root) : process.cwd();
-    // 瞄准输出后的产物路径
-    const framePath = path_1.default.resolve(__dirname, "../../");
-    const frameNodePath = path_1.default.resolve(__dirname, "../");
-    const frameFEPath = path_1.default.resolve(framePath, "./fe/frontend");
-    const runFEPath = path_1.default.resolve(base, "./frontend");
+function entries() {
     console.log("frameFEPath: ", frameFEPath);
     console.log("runFEPath: ", runFEPath);
     /**
@@ -68,7 +70,6 @@ function entries(root) {
             .filter((fileName) => !fileName.includes(".d.ts"));
         return [...o, ...files];
     }, []);
-    console.log(files);
     const input = {};
     if (!files.length)
         return input;
@@ -80,9 +81,7 @@ function entries(root) {
     for (let index = 0; index < files.length; index++) {
         const filePath = files[index];
         const fileDIr = path_1.default.resolve(filePath, "../");
-        console.log(fileDIr);
         const fileHtml = glob.sync((0, utils_1.resolve)(fileDIr, "*.html"))[0];
-        console.log(fileHtml);
         if (!fileHtml) {
             if (!templateHtml) {
                 templateHtml = (0, fs_1.readFileSync)(path_1.default.resolve(frameNodePath, "./app/view/entry.tpl"), "utf-8");
@@ -90,7 +89,6 @@ function entries(root) {
             //
             const scriptStr = filePath.split(path_1.default.sep).at(-1);
             const content = templateHtml.replace(`<!-- {{InsertScript}} -->`, `<script type="module" src="./${scriptStr}"></script>`);
-            console.log(content);
             const htmlName = fileDIr.split(path_1.default.sep).at(-1);
             const htmlPath = path_1.default.join(fileDIr, htmlName + ".html");
             (0, fs_1.writeFileSync)(htmlPath, content);
@@ -110,8 +108,30 @@ function entries(root) {
     return input;
 }
 function outDir() {
-    return "dist";
+    // 为了保持代码 能见性 输出地址应该为 runPath/app/publish/dist
+    return path_1.default.join(runPath, "./app/publish/dist");
 }
+const watchFiles = async (callback) => {
+    const chokidar = await Promise.resolve().then(() => __importStar(require("chokidar")));
+    // 在实际使用时  只有使用方的文件会变化
+    const watcher = chokidar.watch(runFEPath, {
+        ignored: /(^|[\/\\])\../,
+        persistent: true,
+        ignoreInitial: true,
+    });
+    let building = false;
+    watcher.on("change", async (filePath) => {
+        if (building)
+            return;
+        building = true;
+        console.log(`changed: ${filePath}`);
+        await callback?.();
+        console.log("rebuild done");
+        building = false;
+    });
+    console.log(`watching ${runFEPath}/...`);
+};
+exports.watchFiles = watchFiles;
 const VBuildFE = async (input) => {
     // 根据入口构建
     await (0, vite_1.build)({

package/esm/bundler/dev.js

@@ -1,5 +1,4 @@
-import path from "path";
-import { entries, VBuildFE } from "./utils";
+import { entries, VBuildFE, watchFiles } from "./utils";
 export async function dev() {
     // 获取入口
     const input = entries();
@@ -9,21 +8,5 @@ export async function dev() {
     }
     await VBuildFE(input);
     // 监听文件变化
-    const chokidar = await import("chokidar");
-    const watcher = chokidar.watch(path.resolve("src"), {
-        ignored: /(^|[\/\\])\../,
-        persistent: true,
-        ignoreInitial: true,
-    });
-    let building = false;
-    watcher.on("change", async (filePath) => {
-        if (building)
-            return;
-        building = true;
-        console.log(`changed: ${filePath}`);
-        await VBuildFE(input);
-        console.log("rebuild done");
-        building = false;
-    });
-    console.log("watching src/...");
+    watchFiles(async () => VBuildFE(input));
 }

package/esm/bundler/utils.d.ts

@@ -1,8 +1,10 @@
 /**
  *
  * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
+ * 生成入口
  */
-export declare function entries(root?: string): Record<string, string>;
+export declare function entries(): Record<string, string>;
 export declare function outDir(): string;
+export declare const watchFiles: (callback?: () => Promise<any>) => Promise<void>;
 export declare const VBuildFE: (input: Record<string, string>) => Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/esm/bundler/utils.js

@@ -3,17 +3,19 @@ import * as glob from "glob";
 import { build } from "vite";
 import { resolve } from "../packages/utils";
 import { readFileSync, writeFileSync } from "fs";
+const base = process.cwd();
+// 瞄准输出后的产物路径
+const framePath = path.resolve(__dirname, "../../");
+const frameNodePath = path.resolve(__dirname, "../");
+const frameFEPath = path.resolve(framePath, "./fe/frontend");
+const runPath = path.resolve(base, ".");
+const runFEPath = path.resolve(runPath, "./frontend");
 /**
  *
  * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
+ * 生成入口
  */
-export function entries(root) {
-    const base = root ? path.resolve(root) : process.cwd();
-    // 瞄准输出后的产物路径
-    const framePath = path.resolve(__dirname, "../../");
-    const frameNodePath = path.resolve(__dirname, "../");
-    const frameFEPath = path.resolve(framePath, "./fe/frontend");
-    const runFEPath = path.resolve(base, "./frontend");
+export function entries() {
     console.log("frameFEPath: ", frameFEPath);
     console.log("runFEPath: ", runFEPath);
     /**
@@ -27,7 +29,6 @@ export function entries(root) {
             .filter((fileName) => !fileName.includes(".d.ts"));
         return [...o, ...files];
     }, []);
-    console.log(files);
     const input = {};
     if (!files.length)
         return input;
@@ -39,9 +40,7 @@ export function entries(root) {
     for (let index = 0; index < files.length; index++) {
         const filePath = files[index];
         const fileDIr = path.resolve(filePath, "../");
-        console.log(fileDIr);
         const fileHtml = glob.sync(resolve(fileDIr, "*.html"))[0];
-        console.log(fileHtml);
         if (!fileHtml) {
             if (!templateHtml) {
                 templateHtml = readFileSync(path.resolve(frameNodePath, "./app/view/entry.tpl"), "utf-8");
@@ -49,7 +48,6 @@ export function entries(root) {
             //
             const scriptStr = filePath.split(path.sep).at(-1);
             const content = templateHtml.replace(`<!-- {{InsertScript}} -->`, `<script type="module" src="./${scriptStr}"></script>`);
-            console.log(content);
             const htmlName = fileDIr.split(path.sep).at(-1);
             const htmlPath = path.join(fileDIr, htmlName + ".html");
             writeFileSync(htmlPath, content);
@@ -69,8 +67,29 @@ export function entries(root) {
     return input;
 }
 export function outDir() {
-    return "dist";
+    // 为了保持代码 能见性 输出地址应该为 runPath/app/publish/dist
+    return path.join(runPath, "./app/publish/dist");
 }
+export const watchFiles = async (callback) => {
+    const chokidar = await import("chokidar");
+    // 在实际使用时  只有使用方的文件会变化
+    const watcher = chokidar.watch(runFEPath, {
+        ignored: /(^|[\/\\])\../,
+        persistent: true,
+        ignoreInitial: true,
+    });
+    let building = false;
+    watcher.on("change", async (filePath) => {
+        if (building)
+            return;
+        building = true;
+        console.log(`changed: ${filePath}`);
+        await callback?.();
+        console.log("rebuild done");
+        building = false;
+    });
+    console.log(`watching ${runFEPath}/...`);
+};
 export const VBuildFE = async (input) => {
     // 根据入口构建
     await build({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.13",
+  "version": "0.0.1-bate.14",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -45,6 +45,7 @@
     "@types/node": ">=18.0.0",
     "@vitejs/plugin-react": "^4.3.4",
     "vite-plugin-html": "^3.2.2",
+    "chokidar": "^4.0.3",
     "koa": "^2.15.0",
     "koa-nunjucks-2": "^3.0.2",
     "koa-router": "^12.0.1",