@_tc/template-core 0.0.1-bate.18 → 0.0.1-bate.19

package/cjs/app/extend/render-view.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const paths_1 = require("../../packages/core/paths");
 const nunjucks_1 = __importDefault(require("nunjucks"));
+const path_1 = __importDefault(require("path"));
 exports.default = (app) => {
-    const viewsPath = app.config.viewsPath ?? "views";
+    const viewsPath = path_1.default.join((0, paths_1.getAppPath)(app, 'frame'), "./app/public");
     const env = nunjucks_1.default.configure(viewsPath, {
         autoescape: true,
         throwOnUndefined: false,

package/cjs/bundler/utils.js

@@ -108,8 +108,9 @@ function entries() {
     return input;
 }
 function outDir() {
-    // 为了保持代码 能见性 输出地址应该为 runPath/app/public/dist
-    return path_1.default.join(runPath, "./app/public/dist");
+    // // 为了保持代码 能见性 输出地址应该为 runPath/app/public/dist
+    // 放在框架路径比较保险
+    return path_1.default.join(frameNodePath, "./app/public/dist");
 }
 const watchFiles = async (callback) => {
     const chokidar = await Promise.resolve().then(() => __importStar(require("chokidar")));
@@ -150,7 +151,13 @@ function flattenHtmlPlugin(suffix = ".html") {
             const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
             for (const file of htmlFiles) {
                 const src = path_1.default.join(feDir, file);
-                const fileName = path_1.default.basename(file, ".html") + suffix;
+                let fileOName = path_1.default.basename(file, ".html");
+                // 如果文件名没有 entry 补上后缀
+                const entrySuffix = ".entry";
+                if (fileOName.indexOf(entrySuffix) === -1) {
+                    fileOName = fileOName + entrySuffix;
+                }
+                const fileName = fileOName + suffix;
                 const dest = path_1.default.join(feDir, fileName);
                 if (src !== dest) {
                     (0, fs_1.copyFileSync)(src, dest);
@@ -187,7 +194,7 @@ const VBuildFE = async (input) => {
         configFile: false,
         plugins: [
             (await Promise.resolve().then(() => __importStar(require("@vitejs/plugin-react")))).default(),
-            flattenHtmlPlugin('.tpl'),
+            flattenHtmlPlugin(".tpl"),
         ],
         build: {
             outDir: outDir(),

package/esm/app/extend/render-view.js

@@ -1,6 +1,8 @@
+import { getAppPath } from "../../packages/core/paths";
 import nunjucks from "nunjucks";
+import path from "path";
 export default (app) => {
-    const viewsPath = app.config.viewsPath ?? "views";
+    const viewsPath = path.join(getAppPath(app, 'frame'), "./app/public");
     const env = nunjucks.configure(viewsPath, {
         autoescape: true,
         throwOnUndefined: false,

package/esm/bundler/utils.js

@@ -67,8 +67,9 @@ export function entries() {
     return input;
 }
 export function outDir() {
-    // 为了保持代码 能见性 输出地址应该为 runPath/app/public/dist
-    return path.join(runPath, "./app/public/dist");
+    // // 为了保持代码 能见性 输出地址应该为 runPath/app/public/dist
+    // 放在框架路径比较保险
+    return path.join(frameNodePath, "./app/public/dist");
 }
 export const watchFiles = async (callback) => {
     const chokidar = await import("chokidar");
@@ -108,7 +109,13 @@ function flattenHtmlPlugin(suffix = ".html") {
             const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
             for (const file of htmlFiles) {
                 const src = path.join(feDir, file);
-                const fileName = path.basename(file, ".html") + suffix;
+                let fileOName = path.basename(file, ".html");
+                // 如果文件名没有 entry 补上后缀
+                const entrySuffix = ".entry";
+                if (fileOName.indexOf(entrySuffix) === -1) {
+                    fileOName = fileOName + entrySuffix;
+                }
+                const fileName = fileOName + suffix;
                 const dest = path.join(feDir, fileName);
                 if (src !== dest) {
                     copyFileSync(src, dest);
@@ -145,7 +152,7 @@ export const VBuildFE = async (input) => {
         configFile: false,
         plugins: [
             (await import("@vitejs/plugin-react")).default(),
-            flattenHtmlPlugin('.tpl'),
+            flattenHtmlPlugin(".tpl"),
         ],
         build: {
             outDir: outDir(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.18",
+  "version": "0.0.1-bate.19",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",