chore: update build script and release script

Author: fecommunity

client/bin/reactpress-client.js

@@ -3,12 +3,17 @@
 /**
  * ReactPress Client CLI Entry Point
  * This script allows starting the ReactPress client via npx
+ * Supports both regular and PM2 startup modes
  */
 
 const path = require('path');
 const fs = require('fs');
 const { spawn, spawnSync } = require('child_process');
-const url = require('url');
+
+// Capture the original working directory where npx was executed
+// BUT prioritize the REACTPRESS_ORIGINAL_CWD environment variable if it exists
+// This ensures consistency when running via pnpm dev from root directory
+const originalCwd = process.env.REACTPRESS_ORIGINAL_CWD || process.cwd();
 
 // Get command line arguments
 const args = process.argv.slice(2);
@@ -28,7 +33,7 @@ Options:
   --help, -h   Show this help message
 
 Examples:
-  npx @fecommunity/reactpress-client          # Start client in development mode
+  npx @fecommunity/reactpress-client          # Start client normally
   npx @fecommunity/reactpress-client --pm2    # Start client with PM2
   npx @fecommunity/reactpress-client --help   # Show this help message
   `);
@@ -38,38 +43,7 @@ Examples:
 // Get the directory where this script is located
 const binDir = __dirname;
 const clientDir = path.join(binDir, '..');
-
-// Change to the client directory
-process.chdir(clientDir);
-
-// Try to load configuration
-let port = 3001;
-let clientSiteUrl = 'http://localhost:3001';
-
-try {
-  const { config } = require('@fecommunity/reactpress-config');
-  
-  // Extract port from CLIENT_SITE_URL or use CLIENT_PORT
-  if (config.CLIENT_SITE_URL) {
-    try {
-      const parsedUrl = url.parse(config.CLIENT_SITE_URL);
-      if (parsedUrl.port) {
-        port = parseInt(parsedUrl.port, 10);
-      } else if (parsedUrl.protocol === 'https:') {
-        port = 443;
-      } else {
-        port = 80;
-      }
-      clientSiteUrl = config.CLIENT_SITE_URL;
-    } catch (err) {
-      console.warn('[ReactPress Client] Failed to parse CLIENT_SITE_URL, using default port 3001');
-    }
-  } else if (config.CLIENT_PORT) {
-    port = parseInt(config.CLIENT_PORT, 10);
-  }
-} catch (err) {
-  console.warn('[ReactPress Client] Failed to load configuration, using default settings');
-}
+const nextDir = path.join(clientDir, '.next');
 
 // Function to check if PM2 is installed
 function isPM2Installed() {
@@ -115,7 +89,6 @@ function startWithPM2() {
   }
 
   // Check if the client is built
-  const nextDir = path.join(clientDir, '.next');
   if (!fs.existsSync(nextDir)) {
     console.log('[ReactPress Client] Client not built yet. Building...');
 
@@ -162,85 +135,56 @@ function startWithPM2() {
   });
 }
 
-// Function to start with regular Node.js
+// Function to start with regular Node.js (npm start)
 function startWithNode() {
-  // Check if we're in development or production mode
-  const isDev = process.env.NODE_ENV !== 'production';
-
-  if (isDev) {
-    // In development mode, start Next.js dev server
-    console.log('[ReactPress Client] Starting Next.js development server...');
+  // Check if the app is built
+  if (!fs.existsSync(nextDir)) {
+    console.log('[ReactPress Client] Client not built yet. Building...');
 
-    // Use Next.js CLI directly
-    const nextDev = spawn('npx', ['next', 'dev', '-p', port.toString()], {
+    // Try to build the client
+    const buildResult = spawnSync('npm', ['run', 'build'], {
       stdio: 'inherit',
       cwd: clientDir
     });
 
-    nextDev.on('close', (code) => {
-      console.log(`[ReactPress Client] Next.js dev server exited with code ${code}`);
-      process.exit(code);
-    });
-    
-    nextDev.on('error', (error) => {
-      console.error('[ReactPress Client] Failed to start Next.js dev server:', error);
+    if (buildResult.status !== 0) {
+      console.error('[ReactPress Client] Failed to build client');
       process.exit(1);
-    });
-  } else {
-    // In production mode, check if the app is built and start it
-    const nextDir = path.join(clientDir, '.next');
-    
-    if (!fs.existsSync(nextDir)) {
-      console.log('[ReactPress Client] Client not built yet. Building...');
-      
-      // Try to build the client
-      const buildResult = spawnSync('npm', ['run', 'build'], {
-        stdio: 'inherit',
-        cwd: clientDir
-      });
-      
-      if (buildResult.status !== 0) {
-        console.error('[ReactPress Client] Failed to build client');
-        process.exit(1);
-      }
     }
-    
-    console.log('[ReactPress Client] Starting Next.js production server...');
-    
-    // Start Next.js production server
-    const nextStart = spawn('npx', ['next', 'start', '-p', port.toString()], {
-      stdio: 'inherit',
-      cwd: clientDir
-    });
-    
-    nextStart.on('close', (code) => {
-      console.log(`[ReactPress Client] Next.js production server exited with code ${code}`);
-      process.exit(code);
-    });
-    
-    nextStart.on('error', (error) => {
-      console.error('[ReactPress Client] Failed to start Next.js production server:', error);
-      process.exit(1);
-    });
   }
-}
 
-console.log(`[ReactPress Client] Starting client on port ${port}...`);
+  // ONLY set the environment variable if it's not already set
+  // This preserves the value set by set-env.js when running pnpm dev from root
+  if (!process.env.REACTPRESS_ORIGINAL_CWD) {
+    process.env.REACTPRESS_ORIGINAL_CWD = originalCwd;
+  } else {
+    console.log(`[ReactPress Client] Using existing REACTPRESS_ORIGINAL_CWD: ${process.env.REACTPRESS_ORIGINAL_CWD}`);
+  }
+
+  // Change to the client directory
+  process.chdir(clientDir);
+
+  // Start with npm start
+  console.log('[ReactPress Client] Starting with npm start...');
+  const npmStart = spawn('npm', ['start'], {
+    stdio: 'inherit',
+    cwd: clientDir
+  });
+
+  npmStart.on('close', (code) => {
+    console.log(`[ReactPress Client] npm start process exited with code ${code}`);
+    process.exit(code);
+  });
+
+  npmStart.on('error', (error) => {
+    console.error('[ReactPress Client] Failed to start with npm start:', error);
+    process.exit(1);
+  });
+}
 
 // Main execution
 if (usePM2) {
   startWithPM2();
 } else {
   startWithNode();
-}
-
-// Try to automatically open browser after a short delay (only in dev mode and not with PM2)
-if (!usePM2 && process.env.NODE_ENV !== 'production') {
-  setTimeout(() => {
-    try {
-      require('open')(clientSiteUrl);
-    } catch (err) {
-      console.warn('[ReactPress Client] Failed to open browser automatically');
-    }
-  }, 3000);
 }

client/next.config.js

@@ -18,8 +18,8 @@ const getServerApiUrl = () => {
 const nextConfig = {
   assetPrefix: config.CLIENT_ASSET_PREFIX || '/',
   i18n: {
-    locales,
-    defaultLocale,
+    locales: locales && locales.length > 0 ? locales : ['zh', 'en'],
+    defaultLocale: defaultLocale || 'zh',
   },
   env: {
     SERVER_API_URL: getServerApiUrl(),

client/package.json

@@ -1,20 +1,14 @@
 {
   "name": "@fecommunity/reactpress-client",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.21",
   "bin": {
     "reactpress-client": "./bin/reactpress-client.js"
   },
   "files": [
     ".next/**/*",
     "bin/**/*",
-    "pages/**/*",
-    "public/**/*",
-    "src/**/*",
-    "types/**/*",
     "next.config.js",
-    "next-sitemap.js",
-    "server.js",
-    "tsconfig.json"
+    "server.js"
   ],
   "scripts": {
     "prebuild": "rimraf .next",

client/public/sitemap.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
-<url><loc>http://localhost:3001</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
-<url><loc>http://localhost:3001/archives</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
-<url><loc>http://localhost:3001/knowledge</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
-<url><loc>http://localhost:3001/login</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
-<url><loc>http://localhost:3001/nav</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
-<url><loc>http://localhost:3001/rss</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T05:25:49.206Z</lastmod></url>
+<url><loc>http://localhost:3001</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
+<url><loc>http://localhost:3001/archives</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
+<url><loc>http://localhost:3001/knowledge</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
+<url><loc>http://localhost:3001/login</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
+<url><loc>http://localhost:3001/nav</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
+<url><loc>http://localhost:3001/rss</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2025-09-20T11:48:06.840Z</lastmod></url>
 </urlset>

client/server.js

@@ -1,74 +1,11 @@
 const { config } = require('@fecommunity/reactpress-config');
-const cli = require('next/dist/cli/next-dev');
-const { spawn } = require('child_process');
+const cli = require('next/dist/cli/next-start');
 
-// Extract port from CLIENT_SITE_URL or default to 3001
-let port = 3001;
-if (config.CLIENT_SITE_URL) {
-  try {
-    const url = require('url');
-    const parsedUrl = url.parse(config.CLIENT_SITE_URL);
-    if (parsedUrl.port) {
-      port = parseInt(parsedUrl.port, 10);
-    } else if (parsedUrl.protocol === 'https:') {
-      port = 443;
-    } else {
-      port = 80;
-    }
-  } catch (err) {
-    console.warn('[ReactPress] Failed to parse CLIENT_SITE_URL, using default port 3001');
-  }
-}
+const port = config.CLIENT_PORT || 3001;
 
-// Get command line arguments
-const args = process.argv.slice(2);
-const usePM2 = args.includes('--pm2');
-
-if (usePM2) {
-  // Check if PM2 is installed
-  try {
-    require.resolve('pm2');
-  } catch (e) {
-    // Check if PM2 is installed globally
-    try {
-      const { spawnSync } = require('child_process');
-      spawnSync('pm2', ['--version'], { stdio: 'ignore' });
-    } catch (e) {
-      console.log('[ReactPress] PM2 not found. Installing PM2...');
-      const { spawnSync } = require('child_process');
-      const installResult = spawnSync('npm', ['install', 'pm2', '--no-save'], {
-        stdio: 'inherit'
-      });
-      
-      if (installResult.status !== 0) {
-        console.error('[ReactPress] Failed to install PM2');
-        process.exit(1);
-      }
-    }
-  }
-  
-  // Use PM2 to start the Next.js development server
-  console.log('[ReactPress] Starting client with PM2...');
-  const pm2 = spawn('pm2', ['start', 'npm', '--name', 'reactpress-client', '--', 'run', 'dev'], {
-    stdio: 'inherit'
-  });
-  
-  pm2.on('close', (code) => {
-    console.log(`[ReactPress] PM2 process exited with code ${code}`);
-    process.exit(code);
-  });
-  
-  pm2.on('error', (error) => {
-    console.error('[ReactPress] Failed to start with PM2:', error);
-    process.exit(1);
-  });
-} else {
-  try {
-    cli.nextDev(['-p', port.toString());
-    console.log(`[ReactPress] 客户端已启动，端口：${port}`);
-    // 自动打开
-    require('open')(`http://localhost:${port}`);
-  } catch (err) {
-    console.log(`[ReactPress] 客户端启动失败！${err.message || err}`);
-  }
+try {
+  cli.nextStart(['-p', port]);
+  console.log(`[reactpress] 客户端已启动，端口：${port}`);
+} catch (err) {
+  console.log(`[reactpress] 客户端启动失败！${err.message || err}`);
 }

config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-config",
-  "version": "1.0.0-beta.22",
+  "version": "1.0.0-beta.33",
   "description": "ReactPress Configuration - Environment and i18n configuration for ReactPress",
   "author": "fecommunity",
   "main": "./lib/index.js",

config/src/env.ts

@@ -9,9 +9,23 @@ interface EnvConfig {
   config: Record<string, string>;
 }
 
+// 获取项目根目录的函数
+function getProjectRoot(): string {
+  // 优先使用通过环境变量传递的原始工作目录
+  // 这是在 bin/reactpress-server.js 中设置的，表示用户执行 npx 命令的目录
+  if (process.env.REACTPRESS_ORIGINAL_CWD) {
+    return process.env.REACTPRESS_ORIGINAL_CWD;
+  }
+  
+  // 如果没有设置环境变量，则回退到当前工作目录
+  return process.cwd();
+}
+
 function parseEnv(): EnvConfig {
-  // Try multiple possible paths for environment files
+  // 使用改进的项目根目录查找
+  const projectRoot = getProjectRoot();
   const possibleBasePaths = [
+    projectRoot, // Project root directory
     path.resolve(__dirname, '../../'), // From config/lib to project root
     path.resolve(__dirname, '../../../'), // From node_modules to project root
     path.resolve(__dirname, '../'), // From client directory to project root

config/src/i18n.ts

@@ -58,29 +58,10 @@ function parseI18n(): I18nResult {
 }
 
 function findProjectRoot(): string {
-  // 查找项目根目录（包含package.json的目录）
-  let currentDir = __dirname;
-  
-  // 向上查找最多10层目录
-  for (let i = 0; i < 10; i++) {
-    const packageJsonPath = path.join(currentDir, 'package.json');
-    if (fs.existsSync(packageJsonPath)) {
-      try {
-        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-        // 检查是否是主项目package.json
-        if (packageJson.name === 'reactpress' || packageJson.workspaces) {
-          return currentDir;
-        }
-      } catch (e) {
-        // 解析失败，继续向上查找
-      }
-    }
-    const parentDir = path.dirname(currentDir);
-    // 如果已经到达文件系统根目录，停止查找
-    if (parentDir === currentDir) {
-      break;
-    }
-    currentDir = parentDir;
+  // 优先使用通过环境变量传递的原始工作目录
+  // 这是在 bin/reactpress-server.js 或 client/server.js 中设置的，表示用户执行命令的目录
+  if (process.env.REACTPRESS_ORIGINAL_CWD) {
+    return process.env.REACTPRESS_ORIGINAL_CWD;
   }
 
   // 如果找不到项目根目录，返回当前工作目录