@xfe-repo/web-app 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/vite.mjs

@@ -5,9 +5,12 @@ import { reactRouter } from "@react-router/dev/vite";
 import { defineConfig, loadEnv } from "vite";
 
 // src/config.ts
-import path from "path";
 import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
 import yaml from "yaml";
+var DEFAULT_BUILD_DIRECTORY = "dist";
+var protectedDirectories = /* @__PURE__ */ new Set(["src", "types", "public", "node_modules", ".git"]);
 var loadXfeConfig = (root = process.cwd()) => {
   const xfeConfigPath = path.join(root, "xfe.json");
   if (!fs.existsSync(xfeConfigPath)) {
@@ -19,8 +22,49 @@ var loadXfeConfig = (root = process.cwd()) => {
   if (renderMode !== void 0 && renderMode !== "client" && renderMode !== "server") {
     throw new Error("xfe.json.webapp.renderMode \u53EA\u80FD\u4E3A client \u6216 server");
   }
+  getBuildDirectory(root, config.webapp);
+  getServerEntry(root, config.webapp);
   return config;
 };
+var getBuildDirectory = (projectRoot, webapp = {}) => {
+  const configured = webapp?.buildDirectory === void 0 ? DEFAULT_BUILD_DIRECTORY : webapp.buildDirectory;
+  if (typeof configured !== "string" || !configured.trim() || /[\0\r\n]/.test(configured)) {
+    throw new Error("xfe.json.webapp.buildDirectory \u5FC5\u987B\u662F\u975E\u7A7A\u7684\u5355\u884C\u5B57\u7B26\u4E32");
+  }
+  const directory = configured.trim().replaceAll("\\", "/");
+  const root = path.resolve(projectRoot);
+  const output = path.resolve(root, directory);
+  const relative = path.relative(root, output);
+  const [firstDirectory = ""] = relative.split(path.sep);
+  const escapesProject = path.isAbsolute(directory) || Boolean(path.win32.parse(directory).root) || firstDirectory === "..";
+  const overwritesInput = !relative || protectedDirectories.has(firstDirectory.toLowerCase());
+  if (escapesProject || overwritesInput) {
+    throw new Error("xfe.json.webapp.buildDirectory \u5FC5\u987B\u662F\u9879\u76EE\u5185\u72EC\u7ACB\u7684\u8F93\u51FA\u76EE\u5F55\uFF0C\u4E0D\u80FD\u8986\u76D6\u9879\u76EE\u3001\u6E90\u7801\u6216\u4F9D\u8D56");
+  }
+  let currentDirectory = root;
+  for (const segment of relative.split(path.sep)) {
+    currentDirectory = path.join(currentDirectory, segment);
+    if (fs.lstatSync(currentDirectory, { throwIfNoEntry: false })?.isSymbolicLink()) {
+      throw new Error("xfe.json.webapp.buildDirectory \u4E0D\u80FD\u7ECF\u8FC7\u7B26\u53F7\u94FE\u63A5\uFF0C\u4EE5\u514D\u6E05\u7406\u5176\u4ED6\u76EE\u5F55");
+    }
+  }
+  return output;
+};
+var getServerEntry = (projectRoot, webapp = {}) => {
+  const entry = webapp?.serverEntry;
+  if (entry === void 0) return;
+  if (typeof entry !== "string" || !entry.trim() || /[\0\r\n]/.test(entry)) {
+    throw new Error("xfe.json.webapp.serverEntry \u5FC5\u987B\u662F\u9879\u76EE\u5185\u7684 TypeScript / JavaScript \u76F8\u5BF9\u8DEF\u5F84");
+  }
+  const normalized = entry.trim().replaceAll("\\", "/");
+  const absolute = path.resolve(projectRoot, normalized);
+  const relative = path.relative(path.resolve(projectRoot), absolute);
+  const outside = Boolean(path.win32.parse(normalized).root) || relative.split(path.sep)[0] === "..";
+  if (outside || !/\.(?:[jt]sx?|m[jt]s)$/.test(relative)) {
+    throw new Error("xfe.json.webapp.serverEntry \u5FC5\u987B\u662F\u9879\u76EE\u5185\u7684 TypeScript / JavaScript \u76F8\u5BF9\u8DEF\u5F84");
+  }
+  return absolute;
+};
 
 // src/vite.ts
 var chromeDevToolsConfigPath = "/.well-known/appspecific/com.chrome.devtools.json";
@@ -52,6 +96,7 @@ var vite_default = defineConfig(({ mode }) => {
   const { webapp = {} } = loadXfeConfig(projectRoot);
   const publicEnv = (key) => process.env[key] || env[key] || "";
   return {
+    ...webapp.serverEntry ? { base: path2.posix.join(webapp.basename || "/", "/") } : {},
     plugins: [frameworkPlugin(webapp.renderMode === "client"), reactRouter()],
     build: { emptyOutDir: true },
     envDir: projectRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "bin": {
     "xfe-web": "./bin/index.js"
   },
@@ -17,8 +17,10 @@
   },
   "dependencies": {
     "@react-router/dev": "8.3.0",
+    "@react-router/express": "8.3.0",
     "@react-router/serve": "8.3.0",
     "@types/node": "^22.0.0",
+    "esbuild": "^0.27.7",
     "express": "5.2.1",
     "isbot": "^5.1.36",
     "less": "^4.1.3",
@@ -26,6 +28,7 @@
     "typescript": "~5.9.3",
     "vite": "^8.2.1",
     "yaml": "^2.4.2",
+    "tsx": "4.23.15",
     "@xfe-repo/eslint-config": "2.0.0-beta.1",
     "@xfe-repo/web-router": "2.0.0-beta.1",
     "@xfe-repo/typescript-config": "2.0.0-beta.1"
@@ -44,6 +47,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "lint": "eslint \"src/**/*.ts*\" --fix",
-    "clean": "rm -rf .turbo coverage dist node_modules"
+    "clean": "rm -rf .turbo coverage dist node_modules",
+    "test": "pnpm build && node --test test/*.test.cjs"
   }
 }