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

package/cjs/app/controller/view.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getViewController = (app) => class ViewController {
     async renderPage(ctx) {
-        app.extends.renderView(`dist/entry.${ctx.params.page}`, ctx, {
+        app.extends.renderView(`dist/${ctx.params.page}.entry`, ctx, {
             projKey: ctx.query.proj_key,
             name: app.options?.name,
             env: app.envs.get(),

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/app/typings.d.ts

@@ -6,6 +6,7 @@ import type getDB from "./extend/db";
 import type getLogger from "./extend/logger";
 import type generateErrorMessage from "./extend/generateErrorMessage";
 import type parsingParamsOnUrl from "./extend/parsingParamsOnUrl";
+import renderView from "./extend/render-view";
 type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 type GetInstance<T extends (...args: never[]) => unknown> = T extends (...args: never[]) => infer R ? R extends new () => infer C ? C : R extends Promise<infer P> ? P extends new () => infer C2 ? C2 : never : never : never;
 declare module "../packages/core/index.js" {
@@ -23,7 +24,7 @@ declare module "../packages/core/index.js" {
             generateErrorMessage: ReturnType<typeof generateErrorMessage>;
             parsingParamsOnUrl: ReturnType<typeof parsingParamsOnUrl>;
             nunjucksEnv: import("nunjucks").Environment;
-            renderView: (view: string, ctx: import("koa").DefaultContext, context?: Record<string, unknown>) => void;
+            renderView: ReturnType<typeof renderView>;
         }
         interface IMiddlewaresAugmented {
             errorHandle: import("koa").Middleware;

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")));
@@ -138,7 +139,7 @@ exports.watchFiles = watchFiles;
  * 2. 获取输出目录下的html文件
  * 3. 移动内部的html 至 输出目录的根节点
  */
-function flattenHtmlPlugin() {
+function flattenHtmlPlugin(suffix = ".html") {
     return {
         name: "flatten-html",
         apply: "build",
@@ -150,7 +151,14 @@ function flattenHtmlPlugin() {
             const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
             for (const file of htmlFiles) {
                 const src = path_1.default.join(feDir, file);
-                const dest = path_1.default.join(feDir, path_1.default.basename(file));
+                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);
                     (0, fs_1.unlinkSync)(src);
@@ -186,18 +194,13 @@ const VBuildFE = async (input) => {
         configFile: false,
         plugins: [
             (await Promise.resolve().then(() => __importStar(require("@vitejs/plugin-react")))).default(),
-            flattenHtmlPlugin(),
+            flattenHtmlPlugin(".tpl"),
         ],
         build: {
             outDir: outDir(),
             emptyOutDir: true,
             rollupOptions: {
                 input,
-                output: {
-                    entryFileNames: "frontend/[name].js",
-                    chunkFileNames: "frontend/[name].js",
-                    assetFileNames: "frontend/[name].[ext]",
-                },
             },
         },
         resolve: {

package/esm/app/controller/view.js

@@ -1,6 +1,6 @@
 const getViewController = (app) => class ViewController {
     async renderPage(ctx) {
-        app.extends.renderView(`dist/entry.${ctx.params.page}`, ctx, {
+        app.extends.renderView(`dist/${ctx.params.page}.entry`, ctx, {
             projKey: ctx.query.proj_key,
             name: app.options?.name,
             env: app.envs.get(),

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/app/typings.d.ts

@@ -6,6 +6,7 @@ import type getDB from "./extend/db";
 import type getLogger from "./extend/logger";
 import type generateErrorMessage from "./extend/generateErrorMessage";
 import type parsingParamsOnUrl from "./extend/parsingParamsOnUrl";
+import renderView from "./extend/render-view";
 type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 type GetInstance<T extends (...args: never[]) => unknown> = T extends (...args: never[]) => infer R ? R extends new () => infer C ? C : R extends Promise<infer P> ? P extends new () => infer C2 ? C2 : never : never : never;
 declare module "../packages/core/index.js" {
@@ -23,7 +24,7 @@ declare module "../packages/core/index.js" {
             generateErrorMessage: ReturnType<typeof generateErrorMessage>;
             parsingParamsOnUrl: ReturnType<typeof parsingParamsOnUrl>;
             nunjucksEnv: import("nunjucks").Environment;
-            renderView: (view: string, ctx: import("koa").DefaultContext, context?: Record<string, unknown>) => void;
+            renderView: ReturnType<typeof renderView>;
         }
         interface IMiddlewaresAugmented {
             errorHandle: import("koa").Middleware;

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");
@@ -96,7 +97,7 @@ export const watchFiles = async (callback) => {
  * 2. 获取输出目录下的html文件
  * 3. 移动内部的html 至 输出目录的根节点
  */
-function flattenHtmlPlugin() {
+function flattenHtmlPlugin(suffix = ".html") {
     return {
         name: "flatten-html",
         apply: "build",
@@ -108,7 +109,14 @@ function flattenHtmlPlugin() {
             const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
             for (const file of htmlFiles) {
                 const src = path.join(feDir, file);
-                const dest = path.join(feDir, path.basename(file));
+                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);
                     unlinkSync(src);
@@ -144,18 +152,13 @@ export const VBuildFE = async (input) => {
         configFile: false,
         plugins: [
             (await import("@vitejs/plugin-react")).default(),
-            flattenHtmlPlugin(),
+            flattenHtmlPlugin(".tpl"),
         ],
         build: {
             outDir: outDir(),
             emptyOutDir: true,
             rollupOptions: {
                 input,
-                output: {
-                    entryFileNames: "frontend/[name].js",
-                    chunkFileNames: "frontend/[name].js",
-                    assetFileNames: "frontend/[name].[ext]",
-                },
             },
         },
         resolve: {

package/package.json

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