gridsum-vue3-pc 1.0.7 → 1.1.0

package/bin/create-vue3-pc.mjs

@@ -45,7 +45,6 @@ ${pc.bold('Options:')}
   --auto-start              Auto start dev server after creation
   --no-auto-install         Skip automatic dependency installation
   --no-interactive          Run in non-interactive mode
-  --no-git                  Skip git initialization
   -h, --help                Display this message
   -v, --version             Display version number
 
@@ -60,13 +59,9 @@ ${pc.bold('Examples:')}
   ${pc.green('gsvue my-app')} ${pc.yellow('--no-interactive --name my-app --title "My App"')}
 `;
 
-const SPINNER_FRAMES = process.platform === 'win32'
-  ? ['-', '\\', '|', '/']
-  : ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-
-function formatTargetDir(targetDir) {
-  const dir = targetDir.trim().replace(/\/+$/g, '');
-  if (/[<>:"\\|?*\x00-\x1f]/.test(dir) || dir.includes('..') || dir.includes('/') || dir.includes('\\')) {
+function formatTargetDir(input) {
+  const dir = input.trim().replace(/[\/\\]+$/g, '');
+  if (!dir || /[<>:"|?*\x00-\x1f]/.test(dir) || dir.includes('..') || dir.includes('/') || dir.includes('\\')) {
     return '';
   }
   return dir;
@@ -119,12 +114,10 @@ function copyDir(srcDir, destDir) {
 }
 
 function detectPackageManager() {
-  const userAgent = process.env.npm_config_user_agent;
-  if (!userAgent) return 'npm';
-
-  if (userAgent.startsWith('pnpm')) return 'pnpm';
-  if (userAgent.startsWith('yarn')) return 'yarn';
-  if (userAgent.startsWith('bun')) return 'bun';
+  const ua = process.env.npm_config_user_agent || '';
+  if (ua.startsWith('pnpm')) return 'pnpm';
+  if (ua.startsWith('yarn')) return 'yarn';
+  if (ua.startsWith('bun')) return 'bun';
   return 'npm';
 }
 
@@ -134,6 +127,17 @@ function getInstallCommand(pkgManager) {
   return args;
 }
 
+function getRunCommand(pkgManager, script) {
+  switch (pkgManager) {
+    case 'yarn':
+    case 'pnpm':
+    case 'bun':
+      return [pkgManager, script];
+    default:
+      return [pkgManager, 'run', script];
+  }
+}
+
 function runCommand(command, options = {}) {
   const [cmd, ...args] = command;
   const result = spawn.sync(cmd, args, {
@@ -141,52 +145,13 @@ function runCommand(command, options = {}) {
     stdio: 'inherit',
   });
 
-  if (result.status != null && result.status > 0) {
-    process.exit(result.status);
-  }
-
   if (result.error) {
-    console.error(`\n${pc.red('Error:')} ${result.error.message}\n`);
-    process.exit(1);
+    throw new Error(`Failed to execute "${cmd}": ${result.error.message}`);
   }
-}
 
-function runCommandAsync(command, options = {}) {
-  const [cmd, ...args] = command;
-  return new Promise((resolve, reject) => {
-    const child = spawn(cmd, args, {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      windowsHide: false,
-      ...options,
-    });
-
-    child.stdout.on('data', () => {});
-    let stderr = '';
-    child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });
-
-    let i = 0;
-    const timer = setInterval(() => {
-      process.stdout.write(`\r${pc.cyan(SPINNER_FRAMES[i])} Installing dependencies...`);
-      i = (i + 1) % SPINNER_FRAMES.length;
-    }, 100);
-
-    child.on('close', (code) => {
-      clearInterval(timer);
-      process.stdout.write('\r\x1b[K');
-      if (code !== null && code > 0) {
-        if (stderr) process.stderr.write(stderr);
-        reject(new Error(`exit code ${code}`));
-      } else {
-        resolve();
-      }
-    });
-    child.on('error', (err) => {
-      clearInterval(timer);
-      process.stdout.write('\r\x1b[K');
-      if (stderr) process.stderr.write(stderr);
-      reject(err);
-    });
-  });
+  if (result.status != null && result.status > 0) {
+    throw new Error(`"${cmd}" exited with code ${result.status}`);
+  }
 }
 
 function checkNodeVersion() {
@@ -205,7 +170,7 @@ Please upgrade Node.js:
 
 function parseArgs() {
   const argv = mri(process.argv.slice(2), {
-    boolean: ['help', 'version', 'force', 'auto-start', 'no-interactive', 'no-auto-install', 'no-git'],
+    boolean: ['help', 'version', 'force', 'auto-start', 'no-interactive', 'no-auto-install'],
     string: ['name', 'title', 'cicd'],
     alias: {
       h: 'help',
@@ -240,25 +205,37 @@ function scaffoldProject(root, answers, packageName) {
 
   const pkgPath = path.join(root, 'package.json');
   if (fs.existsSync(pkgPath)) {
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-    pkg.name = packageName;
-    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+    try {
+      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+      pkg.name = packageName;
+      fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+    } catch (e) {
+      throw new Error(`Failed to update package.json: ${e.message}`);
+    }
   }
 
-  ['.env', '.env.production'].forEach(file => {
+  for (const file of ['.env', '.env.production']) {
     const filePath = path.join(root, file);
     if (fs.existsSync(filePath)) {
-      let content = fs.readFileSync(filePath, 'utf-8');
-      content = content.replace(/VITE_APP_TITLE=.*/, `VITE_APP_TITLE=${answers.title}`);
-      fs.writeFileSync(filePath, content);
+      try {
+        let content = fs.readFileSync(filePath, 'utf-8');
+        content = content.replace(/^VITE_APP_TITLE=.*$/m, `VITE_APP_TITLE=${answers.title}`);
+        fs.writeFileSync(filePath, content);
+      } catch (e) {
+        throw new Error(`Failed to update ${file}: ${e.message}`);
+      }
     }
-  });
+  }
 
   const indexPath = path.join(root, 'index.html');
   if (fs.existsSync(indexPath)) {
-    let content = fs.readFileSync(indexPath, 'utf-8');
-    content = content.replace(/<title>[^<]*<\/title>/, `<title>${answers.title}</title>`);
-    fs.writeFileSync(indexPath, content);
+    try {
+      let content = fs.readFileSync(indexPath, 'utf-8');
+      content = content.replace(/<title>[^<]*<\/title>/, `<title>${answers.title}</title>`);
+      fs.writeFileSync(indexPath, content);
+    } catch (e) {
+      throw new Error(`Failed to update index.html: ${e.message}`);
+    }
   }
 }
 
@@ -270,7 +247,11 @@ function validateOptions(options) {
   }
 
   if (options.cicd && !VALID_CICD.includes(options.cicd)) {
-    errors.push(`Invalid cicd "${options.cicd}". Valid: ${VALID_CICD.join(', ')}`);
+    errors.push(`Invalid CI/CD type "${options.cicd}". Valid: ${VALID_CICD.join(', ')}`);
+  }
+
+  if (options.title && !/^[a-zA-Z0-9_\-\u4e00-\u9fa5 ]+$/.test(options.title)) {
+    errors.push('Project title contains invalid characters (allowed: letters, numbers, Chinese, spaces, dash, underscore)');
   }
 
   return errors;
@@ -398,11 +379,6 @@ async function main() {
     cicd: argv.cicd || 'none',
   };
 
-  if (argv.title && !/^[a-zA-Z0-9_\-\u4e00-\u9fa5 ]+$/.test(argv.title)) {
-    console.error(`\n${pc.red('Error:')} Project title contains invalid characters\n`);
-    process.exit(1);
-  }
-
   if (isInteractive) {
     const title = await prompts.text({
       message: 'Project title:',
@@ -457,26 +433,53 @@ async function main() {
     autoInstall = result;
   }
 
+  let autoStart = argv['auto-start'];
+  if (autoStart === undefined && isInteractive && autoInstall) {
+    const result = await prompts.confirm({
+      message: 'Start dev server now?',
+      initialValue: false,
+    });
+    if (prompts.isCancel(result)) return cancel();
+    autoStart = result;
+  }
+
   if (autoInstall && !process.env._CREATE_VUE3_PC_TEST) {
     process.stdout.write(`\r\x1b[K${pc.dim('Installing dependencies...')}\n`);
-    runCommand(getInstallCommand(pkgManager), { cwd: root });
-    process.stdout.write(`${pc.green('✓')} Dependencies installed!\n`);
+    try {
+      runCommand(getInstallCommand(pkgManager), { cwd: root });
+      process.stdout.write(`${pc.green('✓')} Dependencies installed!\n`);
+    } catch (e) {
+      process.stdout.write(`\n${pc.red('✗')} Installation failed\n`);
+      console.error(`  ${pc.dim('You can retry manually:')}`);
+      console.error(`  ${pc.cyan(`cd ${targetDir} && ${pkgManager} install${pkgManager === 'npm' ? ' --legacy-peer-deps' : ''}`)}\n`);
+      process.exit(1);
+    }
+  }
+
+  if (autoStart) {
+    prompts.log.step(`Starting dev server... (press ${pc.bold('Ctrl+C')} to stop)`);
+    runCommand(getRunCommand(pkgManager, 'dev'), { cwd: root });
+    return;
   }
 
-  const cdProjectName = path.relative(process.cwd(), root);
-  let doneMessage = '';
+  const cdPath = path.relative(process.cwd(), root);
+  const lines = [];
 
   if (root !== process.cwd()) {
-    doneMessage += `\n  ${pc.bold(pc.cyan('cd'))} ${cdProjectName.includes(' ') ? `"${cdProjectName}"` : cdProjectName}`;
+    const quoted = cdPath.includes(' ') ? `"${cdPath}"` : cdPath;
+    lines.push(`  ${pc.bold(pc.cyan('cd'))} ${quoted}`);
   }
 
   if (!autoInstall) {
-    doneMessage += `\n  ${pc.bold(pc.cyan(pkgManager))} ${pkgManager === 'yarn' ? '' : 'install '}${pc.dim('--legacy-peer-deps')}`;
+    const cmd = pkgManager === 'yarn' ? pkgManager : `${pkgManager} install`;
+    const flag = pkgManager === 'npm' ? ' --legacy-peer-deps' : '';
+    lines.push(`  ${pc.bold(pc.cyan(cmd))}${pc.dim(flag)}`);
   }
 
-  doneMessage += `\n  ${pc.bold(pc.cyan(pkgManager))} ${pkgManager === 'yarn' ? 'dev' : 'run dev'}`;
+  const runCmd = pkgManager === 'yarn' ? 'yarn dev' : `${pkgManager} run dev`;
+  lines.push(`  ${pc.bold(pc.cyan(runCmd))}`);
 
-  prompts.outro(`${pc.green('Done!')} Now run:${doneMessage}`);
+  prompts.outro(`${pc.green('Done!')} Now run:\n${lines.join('\n')}`);
 }
 
 main().catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gridsum-vue3-pc",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "Gridsum Vue3 Vite PC Template Generator - 快速生成基于 Vue3 + Vite + TypeScript 的企业级 PC 端项目",
   "type": "module",
   "sideEffects": false,