axhub-make 1.1.0 → 1.1.1

package/bin/index.js

@@ -3,8 +3,9 @@
 const fs = require('fs-extra');
 const path = require('path');
 const os = require('os');
-const { execFileSync, execSync } = require('child_process');
+const { execFile, execFileSync } = require('child_process');
 const chalk = require('chalk');
+const packageJson = require('../package.json');
 const {
   isAxhubMakeProject,
   ensureAxhubMakeMarker
@@ -277,13 +278,7 @@ async function applyUpdateFromTemplate(tmpDir, targetDir, rules, conflictMode) {
 async function testGitHubAccess(url, timeout = 5000) {
   return new Promise((resolve) => {
     try {
-      const { exec } = require('child_process');
-      const timer = setTimeout(() => {
-        resolve(false);
-      }, timeout);
-      
-      exec(`git ls-remote ${url}`, (error) => {
-        clearTimeout(timer);
+      execFile('git', ['ls-remote', url], { timeout }, (error) => {
         resolve(!error);
       });
     } catch {
@@ -318,16 +313,22 @@ function parseArgs(argv) {
     pre: false,
     dir: '.',
     template: null, // 将在 run() 中动态选择
-    install: true,
-    start: true,
+    install: false,
+    start: false,
     force: false,
     pm: null,
+    version: false,
     conflict: 'overwrite' // 默认强制覆盖，用户可通过 --conflict keep 改为保留模式（不对外文档化）
   };
 
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
 
+    if (a === '-v' || a === '--version') {
+      opts.version = true;
+      continue;
+    }
+
     if ((a === 'pre' || a === 'preinstall' || a === 'preupdate') && opts.dir === '.' && !opts.pre) {
       opts.pre = true;
       continue;
@@ -343,6 +344,10 @@ function parseArgs(argv) {
       continue;
     }
 
+    // Deprecated compatibility flag: remote setup handles dependency install.
+    // Keep parsing it so old callers do not fail, but never auto-install here.
+    if (a === '--install') opts.install = false;
+    if (a === '--start') opts.start = true;
     if (a === '--no-install') opts.install = false;
     if (a === '--no-start') opts.start = false;
     if (a === '--pre') opts.pre = true;
@@ -354,10 +359,66 @@ function parseArgs(argv) {
   return opts;
 }
 
-async function run() {
-  console.log(chalk.magenta.bold('\n🚀 Axhub Make\n'));
+function resolveExecutable(command) {
+  return process.platform === 'win32' ? `${command}.cmd` : command;
+}
 
+function runPackageManager(pm, args, cwd) {
+  execFileSync(resolveExecutable(pm), args, {
+    cwd,
+    stdio: 'inherit'
+  });
+}
+
+function quotePathForDisplay(value) {
+  if (!value) return '.';
+  if (!/[\s"'`$\\]/.test(value)) return value;
+  return JSON.stringify(value);
+}
+
+function printManualNextSteps({ targetDir, isCurrentDir, pm, install, start }) {
+  if (install && start) return;
+
+  console.log(chalk.cyan('\n下一步：'));
+
+  if (!isCurrentDir) {
+    const rel = path.relative(process.cwd(), targetDir);
+    console.log(chalk.cyan(`  cd ${quotePathForDisplay(rel || targetDir)}`));
+  }
+
+  if (!install) {
+    console.log(chalk.cyan(`  ${pm} install`));
+  }
+
+  if (!start) {
+    console.log(chalk.cyan(`  ${pm} run dev`));
+  }
+}
+
+function printCompletionMessage({ targetDir, isCurrentDir, pm, install, start }) {
+  if (!install && !start) {
+    console.log(chalk.green('\n✅ 模板已写入。CLI 不会自动运行安装或开发服务。'));
+  } else if (install && !start) {
+    console.log(chalk.green('\n✅ 模板已写入，依赖已安装。CLI 不会自动启动开发服务。'));
+  } else if (!install && start) {
+    console.log(chalk.green('\n✅ 模板已写入，已尝试启动开发服务。CLI 不会自动运行依赖安装。'));
+  } else {
+    console.log(chalk.green('\n✅ 完成'));
+    return;
+  }
+
+  printManualNextSteps({ targetDir, isCurrentDir, pm, install, start });
+}
+
+async function run() {
   const opts = parseArgs(process.argv);
+
+  if (opts.version) {
+    console.log(packageJson.version);
+    return;
+  }
+
+  console.log(chalk.magenta.bold('\n🚀 Axhub Make\n'));
   
   // 如果用户没有指定模板，自动选择可用的仓库
   if (!opts.template) {
@@ -478,10 +539,7 @@ async function run() {
 
   if (opts.install) {
     console.log(chalk.blue(`\n📦 安装依赖（${pm}）...\n`));
-    execSync(`${pm} install`, {
-      cwd: targetDir,
-      stdio: 'inherit'
-    });
+    runPackageManager(pm, ['install'], targetDir);
   }
 
   // -----------------------------
@@ -490,23 +548,23 @@ async function run() {
   if (opts.start) {
     console.log(chalk.green('\n🚀 启动项目...\n'));
     try {
-      execSync(`${pm} run dev`, { cwd: targetDir, stdio: 'inherit' });
+      runPackageManager(pm, ['run', 'dev'], targetDir);
     } catch {
       try {
-        execSync(`${pm} run start`, { cwd: targetDir, stdio: 'inherit' });
+        runPackageManager(pm, ['run', 'start'], targetDir);
       } catch {}
     }
   }
 
-  console.log(chalk.green('\n✅ 完成'));
+  printCompletionMessage({ targetDir, isCurrentDir, pm, install: opts.install, start: opts.start });
 }
 
 // -----------------------------
 // 包管理器检测
 // -----------------------------
 function detectPackageManager() {
-  try { execSync('pnpm -v', { stdio: 'ignore' }); return 'pnpm'; } catch {}
-  try { execSync('yarn -v', { stdio: 'ignore' }); return 'yarn'; } catch {}
+  try { execFileSync(resolveExecutable('pnpm'), ['-v'], { stdio: 'ignore' }); return 'pnpm'; } catch {}
+  try { execFileSync(resolveExecutable('yarn'), ['-v'], { stdio: 'ignore' }); return 'yarn'; } catch {}
   return 'npm';
 }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "axhub-make",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Axhub Make scaffolding tool",
   "files": [
     "bin"
   ],
   "bin": {
-    "axhub-make": "./bin/index.js"
+    "axhub-make": "bin/index.js"
   },
   "scripts": {
     "test": "node test.js",
@@ -19,11 +19,10 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
     "download-git-repo": "^3.0.2",
     "fs-extra": "^10.0.0",
     "inquirer": "^8.2.0",
-    "tailwind-merge": "^3.4.0"
+    "three": "^0.183.2"
   },
   "author": "Lintendo",
   "license": "ISC",