@fecommunity/reactpress 2.0.0-beta-4-beta.1 → 2.0.0-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fecommunity/reactpress",
   "author": "fecommunity",
-  "version": "2.0.0-beta-4-beta.1",
+  "version": "2.0.0-beta.0",
   "description": "ReactPress - A full-stack CMS built with React, Next.js, and NestJS",
   "keywords": [
     "reactpress",
@@ -13,8 +13,8 @@
     "typescript"
   ],
   "bin": {
-    "reactpress": "./scripts/reactpress-cli.js",
-    "reactpress-server": "./server/bin/reactpress-server.js",
+    "reactpress": "./bin/reactpress.js",
+    "reactpress-server": "./scripts/reactpress-server.js",
     "reactpress-client": "./client/bin/reactpress-client.js"
   },
   "files": [
@@ -24,6 +24,40 @@
     "server/bin/**/*",
     "CONTRIBUTING.md"
   ],
+  "scripts": {
+    "clean": "pnpm clean:node_modules && pnpm clean:dist",
+    "clean:node_modules": "npx rimraf ./node_modules ./**/node_modules",
+    "clean:dist": "npx rimraf ./dist ./**/dist",
+    "dev": "node ./scripts/dev.js",
+    "dev:server": "pnpm run --dir ./server dev",
+    "dev:client": "pnpm run --dir ./client dev",
+    "dev:docs": "pnpm run --dir ./docs dev",
+    "build": "pnpm build:toolkit && pnpm build:server && pnpm build:client",
+    "build:packages": "node scripts/build-packages.js",
+    "build:toolkit": "pnpm run --dir ./toolkit build",
+    "build:server": "pnpm run --dir ./server build",
+    "build:client": "pnpm run --dir ./client build",
+    "build:docs": "pnpm run --dir ./docs build",
+    "deploy:docs": "pnpm run --dir ./docs deploy:surge",
+    "deploy": "sh scripts/deploy.sh",
+    "start": "concurrently 'pnpm:start:*'",
+    "start:server": "pnpm run --dir ./server start",
+    "start:client": "pnpm run --dir ./client start",
+    "pm2": "pnpm run pm2:server && pnpm run pm2:client",
+    "pm2:server": "pnpm run --dir ./server pm2",
+    "pm2:client": "pnpm run --dir ./client pm2",
+    "lint": "concurrently 'pnpm:lint:*'",
+    "lint:client": "eslint --fix './client/**/*.{ts,tsx,js,jsx}'",
+    "lint:server": "eslint --fix './server/./**/*.{ts,js}'",
+    "format": "concurrently 'pnpm:format:*'",
+    "format:js": "prettier --write --parser typescript './**/*.{ts,tsx,js,jsx}'",
+    "prepare": "husky",
+    "precommit": "lint-staged",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s  -r 0",
+    "publish": "node scripts/publish-packages.js",
+    "release": "node scripts/build-packages.js --publish",
+    "generate:api-types": "node scripts/generate-api-types.js"
+  },
   "dependencies": {
     "chalk": "^4.1.2",
     "commander": "^9.4.1",
@@ -58,35 +92,5 @@
       "eslint --fix"
     ]
   },
-  "scripts": {
-    "clean": "pnpm clean:node_modules && pnpm clean:dist",
-    "clean:node_modules": "npx rimraf ./node_modules ./**/node_modules",
-    "clean:dist": "npx rimraf ./dist ./**/dist",
-    "dev": "node ./scripts/reactpress-dev.js",
-    "dev:server": "pnpm run --dir ./server dev",
-    "dev:client": "pnpm run --dir ./client dev",
-    "dev:docs": "pnpm run --dir ./docs dev",
-    "build": "pnpm build:toolkit && pnpm build:server && pnpm build:client",
-    "build:packages": "node scripts/reactpress-cli.js --build",
-    "build:toolkit": "pnpm run --dir ./toolkit build",
-    "build:server": "pnpm run --dir ./server build",
-    "build:client": "pnpm run --dir ./client build",
-    "build:docs": "pnpm run --dir ./docs build",
-    "deploy:docs": "pnpm run --dir ./docs deploy:surge",
-    "deploy": "sh scripts/deploy.sh",
-    "start": "concurrently 'pnpm:start:*'",
-    "start:server": "pnpm run --dir ./server start",
-    "start:client": "pnpm run --dir ./client start",
-    "pm2": "pnpm run pm2:server && pnpm run pm2:client",
-    "pm2:server": "pnpm run --dir ./server pm2",
-    "pm2:client": "pnpm run --dir ./client pm2",
-    "lint": "concurrently 'pnpm:lint:*'",
-    "lint:client": "eslint --fix './client/**/*.{ts,tsx,js,jsx}'",
-    "lint:server": "eslint --fix './server/./**/*.{ts,js}'",
-    "format": "concurrently 'pnpm:format:*'",
-    "format:js": "prettier --write --parser typescript './**/*.{ts,tsx,js,jsx}'",
-    "precommit": "lint-staged",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s  -r 0",
-    "release": "node scripts/reactpress-publish.js --publish"
-  }
+  "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac"
 }

package/scripts/build-packages.js

@@ -0,0 +1,271 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const chalk = require('chalk');
+const crypto = require('crypto');
+
+// Package build order (dependencies first)
+const packages = [
+  {
+    name: '@fecommunity/reactpress-config',
+    path: 'config',
+    description: 'Configuration management package'
+  },
+  {
+    name: '@fecommunity/reactpress-server', 
+    path: 'server',
+    description: 'Backend API server package'
+  },
+  {
+    name: '@fecommunity/reactpress-client',
+    path: 'client', 
+    description: 'Frontend application package'
+  }
+];
+
+// Generate a hash for a file or directory
+function generateHash(filePath) {
+  try {
+    if (fs.statSync(filePath).isDirectory()) {
+      const files = fs.readdirSync(filePath);
+      const hashes = files
+        .filter(file => !file.startsWith('.') && file !== 'node_modules' && file !== 'dist' && file !== '.next') // Ignore hidden files and build directories
+        .map(file => generateHash(path.join(filePath, file)))
+        .sort();
+      return crypto.createHash('md5').update(hashes.join('')).digest('hex');
+    } else {
+      const content = fs.readFileSync(filePath);
+      return crypto.createHash('md5').update(content).digest('hex');
+    }
+  } catch (error) {
+    return '';
+  }
+}
+
+// Get package content hash
+function getPackageHash(packagePath) {
+  const fullPath = path.join(process.cwd(), packagePath);
+  return generateHash(fullPath);
+}
+
+// Check if package has meaningful changes
+function hasMeaningfulChanges(packagePath, packageName) {
+  try {
+    // Create a hash file path to store previous hash in node_modules
+    const hashFilePath = path.join(process.cwd(), 'node_modules', '.build-cache', `${packageName.replace('/', '_')}.hash`);
+    
+    // Generate current hash
+    const currentHash = getPackageHash(packagePath);
+    
+    // Check if we have a previous hash
+    if (fs.existsSync(hashFilePath)) {
+      const previousHash = fs.readFileSync(hashFilePath, 'utf8').trim();
+      return currentHash !== previousHash;
+    }
+    
+    // If no previous hash, consider it as having changes
+    return true;
+  } catch (error) {
+    console.log(chalk.yellow(`⚠️  Could not check changes for ${packageName}, assuming changes exist`));
+    return true;
+  }
+}
+
+// Save package hash
+function savePackageHash(packagePath, packageName) {
+  try {
+    const hashFilePath = path.join(process.cwd(), 'node_modules', '.build-cache', `${packageName.replace('/', '_')}.hash`);
+    
+    // Ensure cache directory exists
+    const cacheDir = path.dirname(hashFilePath);
+    if (!fs.existsSync(cacheDir)) {
+      fs.mkdirSync(cacheDir, { recursive: true });
+    }
+    
+    // Generate and save current hash
+    const currentHash = getPackageHash(packagePath);
+    fs.writeFileSync(hashFilePath, currentHash);
+  } catch (error) {
+    console.log(chalk.yellow(`⚠️  Could not save hash for ${packageName}`));
+  }
+}
+
+// Get current versions
+function getCurrentVersion(packagePath) {
+  try {
+    const pkgPath = path.join(process.cwd(), packagePath, 'package.json');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+    return pkg.version;
+  } catch (error) {
+    return 'unknown';
+  }
+}
+
+// Fix workspace dependencies for build
+function fixWorkspaceDependenciesForBuild(packagePath) {
+  console.log(chalk.blue(`🔧 Fixing workspace dependencies for build: ${packagePath}...`));
+  
+  const pkgPath = path.join(process.cwd(), packagePath, 'package.json');
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+  
+  // Fix dependencies
+  const depTypes = ['dependencies', 'devDependencies', 'peerDependencies'];
+  
+  depTypes.forEach(depType => {
+    if (pkg[depType]) {
+      Object.keys(pkg[depType]).forEach(depName => {
+        // Check if it's a workspace dependency
+        if (pkg[depType][depName] === 'workspace:*' || pkg[depType][depName].startsWith('workspace:')) {
+          // For build purposes, we'll use the file: protocol to reference local packages
+          const depPackage = packages.find(p => p.name === depName);
+          if (depPackage) {
+            console.log(chalk.gray(`  Replacing ${depName} workspace dependency with file reference`));
+            pkg[depType][depName] = `file:../${depPackage.path}`;
+          }
+        }
+      });
+    }
+  });
+  
+  // Write the updated package.json
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+  console.log(chalk.green(`✅ Workspace dependencies fixed for build: ${packagePath}`));
+}
+
+// Restore workspace dependencies after build
+function restoreWorkspaceDependenciesAfterBuild(packagePath) {
+  console.log(chalk.blue(`🔄 Restoring workspace dependencies after build: ${packagePath}...`));
+  
+  const pkgPath = path.join(process.cwd(), packagePath, 'package.json');
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+  
+  // Restore dependencies
+  const depTypes = ['dependencies', 'devDependencies', 'peerDependencies'];
+  
+  depTypes.forEach(depType => {
+    if (pkg[depType]) {
+      Object.keys(pkg[depType]).forEach(depName => {
+        // Check if this is one of our internal packages referenced with file:
+        const depPackage = packages.find(p => p.name === depName);
+        if (depPackage && pkg[depType][depName].startsWith('file:')) {
+          console.log(chalk.gray(`  Restoring ${depName} to workspace dependency`));
+          pkg[depType][depName] = 'workspace:*';
+        }
+      });
+    }
+  });
+  
+  // Write the updated package.json
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+  console.log(chalk.green(`✅ Workspace dependencies restored after build: ${packagePath}`));
+}
+
+// Build package
+function buildPackage(pkg) {
+  console.log(chalk.blue(`\n🔨 Building ${pkg.name} (${pkg.description})...`));
+  
+  try {
+    // Fix workspace dependencies for build
+    fixWorkspaceDependenciesForBuild(pkg.path);
+    
+    try {
+      if (pkg.path === 'config') {
+        execSync('pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
+      } else if (pkg.path === 'server') {
+        execSync('pnpm run prebuild && pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
+      } else if (pkg.path === 'client') {
+        execSync('pnpm run prebuild && pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
+      }
+      console.log(chalk.green(`✅ ${pkg.name} built successfully`));
+    } finally {
+      // Always restore workspace dependencies
+      restoreWorkspaceDependenciesAfterBuild(pkg.path);
+    }
+  } catch (error) {
+    console.log(chalk.red(`❌ Failed to build ${pkg.name}`));
+    throw error;
+  }
+}
+
+// Main function
+async function main() {
+  console.log(chalk.blue('🏗️  ReactPress Package Builder\n'));
+  
+  // Show current versions
+  console.log(chalk.cyan('📋 Current package versions:'));
+  packages.forEach(pkg => {
+    const version = getCurrentVersion(pkg.path);
+    console.log(chalk.gray(`  ${pkg.name}: ${version}`));
+  });
+  console.log();
+  
+  try {
+    // Track which packages actually need to be built
+    const packagesToBuild = [];
+    
+    // Check for meaningful changes in each package
+    for (const pkg of packages) {
+      if (fs.existsSync(path.join(process.cwd(), pkg.path))) {
+        if (hasMeaningfulChanges(pkg.path, pkg.name)) {
+          packagesToBuild.push(pkg);
+          console.log(chalk.blue(`\n📦 ${pkg.name} has changes, will be built`));
+        } else {
+          console.log(chalk.gray(`\n⏭️  ${pkg.name} has no meaningful changes, skipping...`));
+        }
+      } else {
+        console.log(chalk.yellow(`⚠️  Package ${pkg.name} directory not found, skipping...`));
+      }
+    }
+    
+    if (packagesToBuild.length === 0) {
+      console.log(chalk.green('\n✅ No packages have meaningful changes. Nothing to build!'));
+      return;
+    }
+    
+    // Build packages that have changes
+    for (const pkg of packagesToBuild) {
+      await buildPackage(pkg);
+      // Save the hash after successful build
+      savePackageHash(pkg.path, pkg.name);
+    }
+    
+    console.log(chalk.green(`\n🎉 ${packagesToBuild.length} package(s) built successfully!`));
+  } catch (error) {
+    console.error(chalk.red('❌ Build failed:'), error);
+    process.exit(1);
+  }
+}
+
+// Check if called with --publish flag
+if (process.argv.includes('--publish')) {
+  // When called with --publish, we only show the header and versions but don't build
+  // The publish script will handle building as needed
+  console.log(chalk.blue('🏗️  ReactPress Package Builder\n'));
+  
+  // Show current versions
+  console.log(chalk.cyan('📋 Current package versions:'));
+  packages.forEach(pkg => {
+    const version = getCurrentVersion(pkg.path);
+    console.log(chalk.gray(`  ${pkg.name}: ${version}`));
+  });
+  console.log();
+  
+  // Don't build packages here, just start the publish process
+  console.log(chalk.blue('\n🚀 Starting publish process...'));
+  // Execute publish script
+  const { spawn } = require('child_process');
+  const publishProcess = spawn('node', ['scripts/publish-packages.js', '--release'], { stdio: 'inherit' });
+  
+  publishProcess.on('close', (code) => {
+    if (code === 0) {
+      console.log(chalk.green('\n✅ Build and publish completed successfully!'));
+    } else {
+      console.log(chalk.red('\n❌ Publish process failed!'));
+      process.exit(code);
+    }
+  });
+} else {
+  main();
+}

package/scripts/deploy.sh

@@ -0,0 +1,25 @@
+# 更新代码
+git checkout master
+git pull
+
+# 安装依赖&构建
+pnpm install
+
+# 构建本地配置
+pnpm run build:config
+
+# 构建服务器
+pnpm run build:server
+
+# 结束进程
+pm2 kill
+
+# 构建本地client
+pnpm run build:client
+
+# 启动
+pnpm run pm2
+
+# 开机启动
+pm2 startup
+pm2 save