npm - zen-gitsync - Versions diffs - 2.4.12 → 2.4.14 - Mend

zen-gitsync 2.4.12 → 2.4.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/README.md +148 -148
package/package.json +1 -1
package/src/ui/public/assets/index-BWRGBvFK.css +1 -0
package/src/ui/public/assets/index-CTaH84EG.js +59 -0
package/src/ui/public/assets/vendor-DMUTcfLR.js +75 -0
package/src/ui/public/assets/vendor-HJmoQ7iQ.css +1 -0
package/src/ui/public/index.html +16 -16
package/src/ui/server/index.js +176 -0
package/src/ui/public/assets/index-BFihJBzC.js +0 -46
package/src/ui/public/assets/index-CK7Vijoe.css +0 -1
package/src/ui/public/assets/vendor-D9qDBEE1.css +0 -1
package/src/ui/public/assets/vendor-DJt7ABTC.js +0 -68

package/src/ui/public/index.html CHANGED Viewed

@@ -1,16 +1,16 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Zen-GitSync - Git同步工具</title>
-    <script type="module" crossorigin src="/assets/index-BFihJBzC.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-DJt7ABTC.js">
-    <link rel="stylesheet" crossorigin href="/assets/vendor-D9qDBEE1.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-CK7Vijoe.css">
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Zen-GitSync - Git同步工具</title>
+    <script type="module" crossorigin src="/assets/index-CTaH84EG.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-DMUTcfLR.js">
+    <link rel="stylesheet" crossorigin href="/assets/vendor-HJmoQ7iQ.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-BWRGBvFK.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

package/src/ui/server/index.js CHANGED Viewed

@@ -1987,6 +1987,52 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   });
+  // 解决冲突：保存解决后的文件内容
+  app.post('/api/resolve-conflict', async (req, res) => {
+    try {
+      const { filePath, content } = req.body;
+      if (!filePath) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少文件路径参数'
+        });
+      }
+      if (content === undefined) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少文件内容参数'
+        });
+      }
+      try {
+        // 写入解决后的内容到文件
+        await fs.writeFile(filePath, content, 'utf8');
+        // 不自动添加到暂存区，让用户手动决定
+        // Git 会自动将冲突已解决的文件标记为"已修改"状态
+        // await execGitCommand(`git add "${filePath}"`);
+        res.json({
+          success: true,
+          message: '冲突已解决，文件已更新'
+        });
+      } catch (writeError) {
+        res.status(500).json({
+          success: false,
+          error: `保存文件失败: ${writeError.message}`
+        });
+      }
+    } catch (error) {
+      console.error('解决冲突失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `解决冲突失败: ${error.message}`
+      });
+    }
+  });
   // 撤回文件修改
   app.post('/api/revert_file', async (req, res) => {
     try {
@@ -2843,6 +2889,136 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   });
+  // ========== NPM 脚本管理相关 API ==========
+  // 扫描项目目录及子目录下的所有package.json，并提取scripts
+  app.get('/api/scan-npm-scripts', async (req, res) => {
+    try {
+      const projectRoot = process.cwd();
+      const packageJsons = [];
+      // 递归扫描目录查找package.json
+      async function scanDirectory(dir, depth = 0) {
+        // 限制扫描深度，避免扫描过深
+        if (depth > 5) return;
+        try {
+          const items = await fs.readdir(dir, { withFileTypes: true });
+          for (const item of items) {
+            const fullPath = path.join(dir, item.name);
+            // 跳过常见的不需要扫描的目录
+            if (item.isDirectory()) {
+              const dirName = item.name;
+              if (dirName === 'node_modules' ||
+                  dirName === '.git' ||
+                  dirName === 'dist' ||
+                  dirName === 'build' ||
+                  dirName.startsWith('.')) {
+                continue;
+              }
+              // 递归扫描子目录
+              await scanDirectory(fullPath, depth + 1);
+            } else if (item.name === 'package.json') {
+              // 读取package.json文件
+              try {
+                const content = await fs.readFile(fullPath, 'utf8');
+                const packageData = JSON.parse(content);
+                // 只有当scripts存在且至少有一个脚本时才添加
+                if (packageData.scripts && Object.keys(packageData.scripts).length > 0) {
+                  const relativePath = path.relative(projectRoot, dir);
+                  packageJsons.push({
+                    path: dir,
+                    relativePath: relativePath || '.',
+                    name: packageData.name || path.basename(dir),
+                    scripts: packageData.scripts
+                  });
+                }
+              } catch (error) {
+                console.error(`读取package.json失败: ${fullPath}`, error);
+              }
+            }
+          }
+        } catch (error) {
+          console.error(`扫描目录失败: ${dir}`, error);
+        }
+      }
+      // 从项目根目录开始扫描
+      await scanDirectory(projectRoot);
+      res.json({
+        success: true,
+        packages: packageJsons,
+        totalScripts: packageJsons.reduce((sum, pkg) => sum + Object.keys(pkg.scripts).length, 0)
+      });
+    } catch (error) {
+      console.error('扫描npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `扫描npm脚本失败: ${error.message}`
+      });
+    }
+  });
+  // 在新终端中执行npm脚本
+  app.post('/api/run-npm-script', async (req, res) => {
+    try {
+      const { packagePath, scriptName } = req.body;
+      if (!packagePath || !scriptName) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数：packagePath 和 scriptName'
+        });
+      }
+      console.log(`执行npm脚本: ${scriptName} in ${packagePath}`);
+      // 根据操作系统选择合适的终端命令
+      let terminalCommand;
+      const npmCommand = `npm run ${scriptName}`;
+      if (process.platform === 'win32') {
+        // Windows: 使用 start 命令打开新的 cmd 窗口
+        // /K 参数表示执行命令后保持窗口打开
+        terminalCommand = `start cmd /K "cd /d ${packagePath} && ${npmCommand}"`;
+      } else if (process.platform === 'darwin') {
+        // macOS: 使用 osascript 打开 Terminal.app
+        const script = `tell application "Terminal" to do script "cd ${packagePath} && ${npmCommand}"`;
+        terminalCommand = `osascript -e '${script}'`;
+      } else {
+        // Linux: 尝试常见的终端模拟器
+        // 优先使用 gnome-terminal, 然后是 xterm
+        terminalCommand = `gnome-terminal -- bash -c "cd ${packagePath} && ${npmCommand}; exec bash" || xterm -e "cd ${packagePath} && ${npmCommand}; bash"`;
+      }
+      // 执行命令打开新终端
+      const { exec } = await import('child_process');
+      exec(terminalCommand, (error, stdout, stderr) => {
+        if (error) {
+          console.error('打开终端失败:', error);
+        }
+      });
+      res.json({
+        success: true,
+        message: `已在新终端中执行: ${scriptName}`,
+        command: npmCommand,
+        path: packagePath
+      });
+    } catch (error) {
+      console.error('执行npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `执行npm脚本失败: ${error.message}`
+      });
+    }
+  });
   // Socket.io 实时更新
   io.on('connection', (socket) => {
     console.log('客户端已连接:', socket.id);