@fatdoge/wtree 0.1.0 → 0.1.2

package/README.en.md

@@ -1,6 +1,6 @@
 # wtree
 
-English | [简体中文](./README.md)
+English | [简体中文](https://github.com/FatDoge/wtree/blob/main/README.md)
 
 `wtree` is a local tool for managing git worktrees. It runs in an interactive command-line mode by default, and also supports a one-click local UI (TreeLab) for visual management.
 
@@ -15,14 +15,16 @@ English | [简体中文](./README.md)
 
 ## Installation
 
+Install globally via npm (specify the public registry if you are using a private one):
+
 ```bash
-npm install -g wtree
+npm install -g @fatdoge/wtree --registry=https://registry.npmjs.org/
 ```
 
 Or run directly using `npx`:
 
 ```bash
-npx wtree
+npx --registry=https://registry.npmjs.org/ @fatdoge/wtree
 ```
 
 ## Usage

package/README.md

@@ -1,6 +1,6 @@
 # wtree
 
-[English](./README.en.md) | 简体中文
+[English](https://github.com/FatDoge/wtree/blob/main/README.en.md) | 简体中文
 
 `wtree` 是一个本地工具，用于管理 git worktree。默认是交互式命令行模式，也支持一键启动 UI 页面 (TreeLab) 进行可视化操作。
 
@@ -15,16 +15,19 @@
 
 ## 安装
 
-需要本机已安装 `git`，建议 Node.js `>= 18`。
+可以通过 npm 全局安装（如果使用了私有源，请指定官方源）：
 
-本地软链安装：
 ```bash
-pnpm install
-pnpm run build
-npm link
+npm install -g @fatdoge/wtree --registry=https://registry.npmjs.org/
+```
+
+或者直接使用 `npx` 运行：
+
+```bash
+npx --registry=https://registry.npmjs.org/ @fatdoge/wtree
 ```
 
-## 快速开始
+## 运行与使用
 
 ### 交互式 CLI
 

package/api/ui/startUiDev.ts

@@ -1,29 +1,10 @@
-import os from 'node:os'
 import path from 'node:path'
-import fs from 'node:fs'
 import { fileURLToPath } from 'node:url'
-import { createServer } from 'vite'
-import type { ViteDevServer } from 'vite'
+import express from 'express'
+import serveStatic from 'serve-static'
 import { createApiApp } from '../createApiApp.js'
 import { openPath } from '../core/open.js'
 
-function findUiRoot(fromDir: string) {
-  let cur = fromDir
-  for (let i = 0; i < 10; i += 1) {
-    const indexHtml = path.join(cur, 'index.html')
-    const viteConfig = path.join(cur, 'vite.config.ts')
-    if (exists(indexHtml) && exists(viteConfig)) return cur
-    const parent = path.dirname(cur)
-    if (parent === cur) break
-    cur = parent
-  }
-  return fromDir
-}
-
-function exists(p: string) {
-  return fs.existsSync(p)
-}
-
 export type UiDevHandle = {
   uiUrl: string
   close: () => Promise<void>
@@ -43,29 +24,62 @@ export async function startUiDevServer(options: {
   await new Promise<void>((resolve) => apiServer.once('listening', () => resolve()))
   const apiAddress = apiServer.address()
   const apiPort = typeof apiAddress === 'object' && apiAddress ? apiAddress.port : 0
+  
+  // Set API URL for UI to consume
   process.env.WTUI_API_URL = `http://127.0.0.1:${apiPort}`
-  process.env.VITE_WTUI_API_URL = process.env.WTUI_API_URL
 
+  // Setup static file serving for UI
   const here = path.dirname(fileURLToPath(import.meta.url))
-  const uiRoot = findUiRoot(path.resolve(here, '..', '..'))
-  const prevCwd = process.cwd()
-  process.chdir(uiRoot)
+  // In production (dist-node/api/ui), UI assets are in ../../dist
+  const distPath = path.resolve(here, '..', '..', 'dist')
+  
+  const uiApp = express()
+  
+  // Proxy API requests to the API server
+  uiApp.use('/api', (req, res) => {
+    // Basic proxy implementation since we are in the same process
+    // But since we have createApiApp, we can just mount it?
+    // Actually createApiApp returns an express app, we can mount it directly.
+    // However, createApiApp includes cors and body parsers which might conflict if mounted twice?
+    // Let's just use the apiApp directly for API requests if possible, 
+    // but here we are starting a separate UI server.
+    // A better approach: merge them into one server.
+    res.redirect(`http://127.0.0.1:${apiPort}/api${req.url}`)
+  })
 
-  const vite: ViteDevServer = await createServer({
-    root: uiRoot,
-    configFile: path.join(uiRoot, 'vite.config.ts'),
-    cacheDir: path.join(os.tmpdir(), 'wtui-vite-cache'),
-    server: {
-      host: '127.0.0.1',
-      port: uiPort,
-      strictPort: false,
-    },
-    clearScreen: false,
-    appType: 'spa',
+  // Serve static files
+  uiApp.use(serveStatic(distPath))
+  
+  // SPA fallback
+  uiApp.get('*', (req, res) => {
+    res.sendFile(path.join(distPath, 'index.html'))
   })
 
-  await vite.listen()
-  const url = vite.resolvedUrls?.local?.[0] || `http://127.0.0.1:${uiPort}/`
+  // Start UI server
+  // Note: We need to inject the API URL into the HTML or provide it via an endpoint
+  // The current UI implementation uses relative paths /api/..., so we need to proxy /api
+  // Let's rewrite the logic to use a single server for both API and UI
+  
+  const combinedApp = express()
+  
+  // 1. API routes
+  combinedApp.use('/api', createApiApp(() => repoRoot))
+  
+  // 2. Static files
+  combinedApp.use(serveStatic(distPath))
+  
+  // 3. SPA fallback
+  combinedApp.get('*', (req, res) => {
+    res.sendFile(path.join(distPath, 'index.html'))
+  })
+
+  // Close the temporary apiServer we created earlier since we are using combinedApp now
+  apiServer.close()
+
+  const combinedServer = combinedApp.listen(uiPort, '127.0.0.1')
+  await new Promise<void>((resolve) => combinedServer.once('listening', () => resolve()))
+  
+  const url = `http://127.0.0.1:${uiPort}/`
 
   if (open) {
     openPath(url)
@@ -74,9 +88,7 @@ export async function startUiDevServer(options: {
   return {
     uiUrl: url,
     close: async () => {
-      await vite.close()
-      await new Promise<void>((resolve) => apiServer.close(() => resolve()))
-      process.chdir(prevCwd)
+      await new Promise<void>((resolve) => combinedServer.close(() => resolve()))
     },
   }
 }

package/dist-node/api/ui/startUiDev.js

@@ -1,27 +1,9 @@
-import os from 'node:os';
 import path from 'node:path';
-import fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { createServer } from 'vite';
+import express from 'express';
+import serveStatic from 'serve-static';
 import { createApiApp } from '../createApiApp.js';
 import { openPath } from '../core/open.js';
-function findUiRoot(fromDir) {
-    let cur = fromDir;
-    for (let i = 0; i < 10; i += 1) {
-        const indexHtml = path.join(cur, 'index.html');
-        const viteConfig = path.join(cur, 'vite.config.ts');
-        if (exists(indexHtml) && exists(viteConfig))
-            return cur;
-        const parent = path.dirname(cur);
-        if (parent === cur)
-            break;
-        cur = parent;
-    }
-    return fromDir;
-}
-function exists(p) {
-    return fs.existsSync(p);
-}
 export async function startUiDevServer(options) {
     const repoRoot = options.repoRoot;
     const open = options.open !== false;
@@ -31,35 +13,55 @@ export async function startUiDevServer(options) {
     await new Promise((resolve) => apiServer.once('listening', () => resolve()));
     const apiAddress = apiServer.address();
     const apiPort = typeof apiAddress === 'object' && apiAddress ? apiAddress.port : 0;
+    // Set API URL for UI to consume
     process.env.WTUI_API_URL = `http://127.0.0.1:${apiPort}`;
-    process.env.VITE_WTUI_API_URL = process.env.WTUI_API_URL;
+    // Setup static file serving for UI
     const here = path.dirname(fileURLToPath(import.meta.url));
-    const uiRoot = findUiRoot(path.resolve(here, '..', '..'));
-    const prevCwd = process.cwd();
-    process.chdir(uiRoot);
-    const vite = await createServer({
-        root: uiRoot,
-        configFile: path.join(uiRoot, 'vite.config.ts'),
-        cacheDir: path.join(os.tmpdir(), 'wtui-vite-cache'),
-        server: {
-            host: '127.0.0.1',
-            port: uiPort,
-            strictPort: false,
-        },
-        clearScreen: false,
-        appType: 'spa',
+    // In production (dist-node/api/ui), UI assets are in ../../dist
+    const distPath = path.resolve(here, '..', '..', 'dist');
+    const uiApp = express();
+    // Proxy API requests to the API server
+    uiApp.use('/api', (req, res) => {
+        // Basic proxy implementation since we are in the same process
+        // But since we have createApiApp, we can just mount it?
+        // Actually createApiApp returns an express app, we can mount it directly.
+        // However, createApiApp includes cors and body parsers which might conflict if mounted twice?
+        // Let's just use the apiApp directly for API requests if possible, 
+        // but here we are starting a separate UI server.
+        // A better approach: merge them into one server.
+        res.redirect(`http://127.0.0.1:${apiPort}/api${req.url}`);
+    });
+    // Serve static files
+    uiApp.use(serveStatic(distPath));
+    // SPA fallback
+    uiApp.get('*', (req, res) => {
+        res.sendFile(path.join(distPath, 'index.html'));
+    });
+    // Start UI server
+    // Note: We need to inject the API URL into the HTML or provide it via an endpoint
+    // The current UI implementation uses relative paths /api/..., so we need to proxy /api
+    // Let's rewrite the logic to use a single server for both API and UI
+    const combinedApp = express();
+    // 1. API routes
+    combinedApp.use('/api', createApiApp(() => repoRoot));
+    // 2. Static files
+    combinedApp.use(serveStatic(distPath));
+    // 3. SPA fallback
+    combinedApp.get('*', (req, res) => {
+        res.sendFile(path.join(distPath, 'index.html'));
     });
-    await vite.listen();
-    const url = vite.resolvedUrls?.local?.[0] || `http://127.0.0.1:${uiPort}/`;
+    // Close the temporary apiServer we created earlier since we are using combinedApp now
+    apiServer.close();
+    const combinedServer = combinedApp.listen(uiPort, '127.0.0.1');
+    await new Promise((resolve) => combinedServer.once('listening', () => resolve()));
+    const url = `http://127.0.0.1:${uiPort}/`;
     if (open) {
         openPath(url);
     }
     return {
         uiUrl: url,
         close: async () => {
-            await vite.close();
-            await new Promise((resolve) => apiServer.close(() => resolve()));
-            process.chdir(prevCwd);
+            await new Promise((resolve) => combinedServer.close(() => resolve()));
         },
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fatdoge/wtree",
   "private": false,
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "CLI + UI tool for managing git worktrees",
   "keywords": [
     "git",
@@ -12,6 +12,14 @@
   ],
   "author": "fatdoge",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/FatDoge/wtree.git"
+  },
+  "bugs": {
+    "url": "https://github.com/FatDoge/wtree/issues"
+  },
+  "homepage": "https://github.com/FatDoge/wtree#readme",
   "type": "module",
   "bin": {
     "wtree": "dist-node/api/cli/wtree.js"
@@ -59,6 +67,7 @@
     "react-dom": "^18.3.1",
     "react-i18next": "^16.5.7",
     "react-router-dom": "^7.3.0",
+    "serve-static": "^2.2.1",
     "tailwind-merge": "^3.0.2",
     "tailwindcss": "^3.4.17",
     "vite": "^6.3.5",
@@ -73,6 +82,7 @@
     "@types/node": "^22.15.30",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
+    "@types/serve-static": "^2.2.0",
     "@vercel/node": "^5.3.6",
     "babel-plugin-react-dev-locator": "^1.0.0",
     "concurrently": "^9.2.0",