wildpig 1.4.0 → 1.5.0

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "wildpig",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "author": "eriktse",
-  "main": "index.ts",
   "type": "module",
   "bin": {
     "wildpig": "./bin/cli.ts"
@@ -29,7 +28,6 @@
   ],
   "license": "ISC",
   "scripts": {
-    "publish": "yalc publish",
     "dev": "wildpig dev",
     "build": "wildpig build",
     "start": "wildpig start"

package/scripts/build.ts

@@ -6,14 +6,14 @@ const prebuild = async () => {
     const promises = [];
     // 先编译客户端代码
     promises.push(viteBuild({
-        configFile: path.resolve(__dirname, "../vite.config.ts"),
+        configFile: path.resolve(__dirname, "../../../vite.config.ts"),
         build: {
             outDir: "./dist/client",
         },
     }));
     // 编译服务端入口文件
     promises.push(viteBuild({
-        configFile: path.resolve(__dirname, "../vite.config.ts"),
+        configFile: path.resolve(__dirname, "../../../vite.config.ts"),
         
         build: {
             rollupOptions:{

package/scripts/devServer.ts

@@ -1,14 +1,14 @@
 import { getApiRouteModules } from "./apiRoutes";
 import { createServer as createViteServer } from "vite";
-import { createStaticHandler, createStaticRouter, matchRoutes } from "react-router";
+import { matchRoutes } from "react-router";
 import fs from "node:fs";
 
 const __dirname = import.meta.dirname;
 
 // 用户代码
-import pageRoutes from "@/router/routes";
 import path from "node:path";
 import chalk from "chalk";
+import { WildPigRouteObject } from "router/types";
 
 const env = process.env;
 const port = env.PORT || 3000;
@@ -33,12 +33,14 @@ const viteHandler = (apiModules: any) => async (request: Request) => {
         viteURL.port = viteServer.config.server.port.toString();
         console.log("转发请求：" + viteURL.toString());
         const response = await fetch(viteURL.toString(), {
-            headers: request.headers,
             method: request.method,
+            headers: request.headers,
+            body: request.body,
         });
-        return response;
+        return response.clone();
     }
 
+    const pageRoutes = (await viteServer.ssrLoadModule("@/router/routes.ts"!)).default as WildPigRouteObject[];
     const matches = matchRoutes(pageRoutes, url.pathname);
     if(!matches)return new Response("404 Not Found", { status: 404 });
 

package/scripts/prodServer.ts

@@ -4,8 +4,9 @@ import { matchRoutes } from "react-router";
 import path from "node:path";
 
 // 用户代码
-import pageRoutes from "#/src/router/routes";
+const pageRoutes = (await import("@/router/routes"!)).default as WildPigRouteObject[];
 import chalk from "chalk";
+import { WildPigRouteObject } from "router/types";
 
 const env = process.env;
 const port = env.PORT || 3000;
@@ -46,8 +47,7 @@ export const startServer = async () => {
             "/*": async (request: Request) => {
                 // 判断pathname是否匹配pageRoutes
                 const url = new URL(request.url);
-                const matches = matchRoutes(pageRoutes, url.pathname);
-                if(!matches){
+                if(url.pathname.includes(".") || url.pathname.startsWith("/@") || url.pathname.startsWith("/assets")){
                     const filepath = "./client" + url.pathname;
                     // 检查文件是否存在
                     if(fs.existsSync(filepath) && fs.statSync(filepath).isFile()){
@@ -58,6 +58,9 @@ export const startServer = async () => {
                 }
 
                 // 请求服务端数据
+                const matches = matchRoutes(pageRoutes, url.pathname);
+                if(!matches)return new Response("Not Found", {status: 404});
+
                 const matchRoute = matches.at(-1)!;
                 let serverDataApi = matchRoute.route.serverDataApi;
                 const getServerData = async () => {