@fecommunity/reactpress 3.0.3 → 3.0.4

package/bin/reactpress.js

@@ -8,12 +8,14 @@
 const { Command } = require('commander');
 const path = require('path');
 const chalk = require('chalk');
+const { brand, divider } = require('../ui/theme');
 const { ensureOriginalCwd } = require('../lib/root');
 const { ensureProjectEnvironment, initMonorepoProject } = require('../lib/bootstrap');
 const { runDev } = require('../lib/dev');
 const { runApiDev } = require('../lib/api-dev');
 const { runLifecycleCommand } = require('../lib/lifecycle');
 const { runDockerCommand } = require('../lib/docker');
+const { runNginxCommand } = require('../lib/nginx');
 const { printUnifiedStatus } = require('../lib/status');
 const { runDoctor } = require('../lib/doctor');
 const { runDbBackup } = require('../lib/db-backup');
@@ -176,6 +178,102 @@ dockerCmd
     await runDockerCommand('logs', ensureOriginalCwd(), service ? [service] : []);
   });
 
+const nginxCmd = program.command('nginx').description(t('cli.nginx.description'));
+
+function nginxActionOptions(cmd) {
+  return cmd.option('--prod', t('cli.nginx.prod')).option('-f, --force', t('cli.nginx.force'));
+}
+
+nginxActionOptions(nginxCmd.command('ensure').description(t('cli.nginx.ensure'))).action(async (options) => {
+  try {
+    await runNginxCommand('ensure', ensureOriginalCwd(), [], options);
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxActionOptions(nginxCmd.command('up').description(t('cli.nginx.up'))).action(async (options) => {
+  try {
+    await runNginxCommand('up', ensureOriginalCwd(), [], options);
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxCmd
+  .command('down')
+  .alias('stop')
+  .description(t('cli.nginx.down'))
+  .option('--prod', t('cli.nginx.prod'))
+  .action(async (options) => {
+    try {
+      await runNginxCommand('down', ensureOriginalCwd(), [], options);
+    } catch (err) {
+      console.error(chalk.red('[reactpress]'), err.message || err);
+      process.exit(1);
+    }
+  });
+
+nginxActionOptions(nginxCmd.command('restart').description(t('cli.nginx.restart'))).action(async (options) => {
+  try {
+    await runNginxCommand('restart', ensureOriginalCwd(), [], options);
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxCmd
+  .command('status')
+  .description(t('cli.nginx.status'))
+  .option('--prod', t('cli.nginx.prod'))
+  .action(async (options) => {
+    try {
+      await runNginxCommand('status', ensureOriginalCwd(), [], options);
+    } catch (err) {
+      console.error(chalk.red('[reactpress]'), err.message || err);
+      process.exit(1);
+    }
+  });
+
+nginxCmd.command('logs').description(t('cli.nginx.logs')).action(async () => {
+  try {
+    await runNginxCommand('logs', ensureOriginalCwd());
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxCmd.command('test').description(t('cli.nginx.test')).action(async () => {
+  try {
+    await runNginxCommand('test', ensureOriginalCwd());
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxCmd.command('reload').description(t('cli.nginx.reload')).action(async () => {
+  try {
+    await runNginxCommand('reload', ensureOriginalCwd());
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
+nginxCmd.command('open').description(t('cli.nginx.open')).action(async () => {
+  try {
+    await runNginxCommand('open', ensureOriginalCwd());
+  } catch (err) {
+    console.error(chalk.red('[reactpress]'), err.message || err);
+    process.exit(1);
+  }
+});
+
 program
   .command('status')
   .description(t('cli.status.description'))
@@ -212,19 +310,16 @@ program
   .option('--build', t('cli.publish.build'))
   .option('--publish', t('cli.publish.publish'))
   .action(async (options) => {
-    const prev = process.argv.slice();
-    const args = [process.argv[0], process.argv[1]];
-    if (options.build) args.push('--build');
-    else if (options.publish) args.push('--publish');
-    else args.push('--publish');
-    process.argv = args;
     try {
-      await require('../lib/publish').main();
+      const publish = require('../lib/publish');
+      if (options.build) {
+        await publish.buildPackages();
+        return;
+      }
+      await publish.publishPackages();
     } catch (err) {
       console.error(chalk.red('[reactpress]'), err.message || err);
       process.exit(1);
-    } finally {
-      process.argv = prev;
     }
   });
 
@@ -233,9 +328,14 @@ program
   .description(t('cli.start.description'))
   .action(async () => {
     const projectRoot = ensureOriginalCwd();
-    const { spawn } = require('child_process');
+    const { hasClient } = require('../lib/project-type');
     const code = await runLifecycleCommand('start', projectRoot);
     if (code !== 0) process.exit(code);
+    if (!hasClient(projectRoot)) {
+      console.log(t('dev.standaloneHint'));
+      return;
+    }
+    const { spawn } = require('child_process');
     const child = spawn('pnpm', ['run', '--dir', './client', 'start'], {
       stdio: 'inherit',
       shell: true,
@@ -246,16 +346,23 @@ program
 
 program.on('--help', () => {
   console.log('');
-  console.log(chalk.gray(t('cli.help.examples')));
-  console.log(t('cli.help.interactive'));
-  console.log(t('cli.help.dev'));
-  console.log(t('cli.help.init'));
-  console.log(t('cli.help.server'));
-  console.log(t('cli.help.status'));
-  console.log(t('cli.help.doctor'));
-  console.log(t('cli.help.docker'));
-  console.log(t('cli.help.build'));
-  console.log(t('cli.help.publish'));
+  console.log(brand.bold(t('cli.help.examples')));
+  console.log(divider(40));
+  const lines = [
+    t('cli.help.interactive'),
+    t('cli.help.dev'),
+    t('cli.help.init'),
+    t('cli.help.server'),
+    t('cli.help.status'),
+    t('cli.help.doctor'),
+    t('cli.help.docker'),
+    t('cli.help.nginx'),
+    t('cli.help.build'),
+    t('cli.help.publish'),
+  ];
+  for (const line of lines) {
+    console.log(brand.dim(line));
+  }
   console.log('');
 });
 

package/lib/build.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
-const chalk = require('chalk');
+const ora = require('ora');
+const { brand, icon, ok, warn, label, chip } = require('../ui/theme');
 const { runSync } = require('./spawn');
 const { ensureOriginalCwd } = require('./root');
 const { t } = require('./i18n');
@@ -78,6 +79,10 @@ function resolveBuildInvocation(script, projectRoot) {
   return null;
 }
 
+function stepBadge(current, total) {
+  return chip(`${current}/${total}`, brand.primary);
+}
+
 async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
   if (process.env.REACTPRESS_BUILD_ACTIVE === '1') {
     throw new Error(t('build.recursive'));
@@ -96,8 +101,10 @@ async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
   const total = steps.length;
   const buildStarted = Date.now();
 
+  console.log('');
   if (total > 1) {
-    console.log(t('build.plan', { total }));
+    console.log(label(t('build.plan', { total })));
+    console.log('');
   }
 
   for (let i = 0; i < steps.length; i++) {
@@ -107,35 +114,44 @@ async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
     }
 
     const current = i + 1;
-    const label = t(labelKey);
+    const stepLabel = t(labelKey);
     const stepStarted = Date.now();
-
-    console.log(t('build.step', { current, total, label }));
+    const badge = stepBadge(current, total);
 
     const invocation = resolveBuildInvocation(script, projectRoot);
     if (!invocation) {
-      console.log(chalk.yellow(t('build.stepSkipped', { label })));
+      console.log(`  ${badge}  ${warn(t('build.stepSkipped', { label: stepLabel }))}`);
       continue;
     }
 
+    const spinner = ora({
+      text: `${badge}  ${t('build.step', { current, total, label: stepLabel })}`,
+      color: 'magenta',
+      spinner: 'dots',
+    }).start();
+
     try {
       runSync(invocation.command, invocation.args, {
         cwd: invocation.cwd,
         env: buildChildEnv,
       });
     } catch (err) {
-      console.error(chalk.red(t('build.stepFailed', { current, total, label })));
+      spinner.fail(`${badge}  ${t('build.stepFailed', { current, total, label: stepLabel })}`);
       throw err;
     }
 
     const seconds = ((Date.now() - stepStarted) / 1000).toFixed(1);
-    console.log(chalk.green(t('build.stepDone', { current, total, label, seconds })));
+    spinner.succeed(
+      `${badge}  ${ok(t('build.stepDone', { current, total, label: stepLabel, seconds }))}`
+    );
   }
 
   if (total > 1) {
     const totalSeconds = ((Date.now() - buildStarted) / 1000).toFixed(1);
-    console.log(chalk.green(t('build.done', { seconds: totalSeconds })));
+    console.log('');
+    console.log(`  ${icon.spark}  ${ok(t('build.done', { seconds: totalSeconds }))}`);
   }
+  console.log('');
 }
 
 module.exports = {

package/lib/db-backup.js

@@ -3,6 +3,18 @@ const path = require('path');
 const { execSync } = require('child_process');
 const chalk = require('chalk');
 const { t } = require('./i18n');
+const { mysqldumpFromDbContainer } = require('./docker');
+
+function isLocalDbHost(host) {
+  const h = String(host || '').toLowerCase();
+  return h === '127.0.0.1' || h === 'localhost' || h === '::1' || h === '';
+}
+
+function isMysqldumpNotFoundError(err) {
+  const msg = `${err && err.message ? err.message : ''}\n${err && err.stderr ? err.stderr : ''}`;
+  if (err && err.status === 127) return true;
+  return /command not found|not recognized as an internal or external command/i.test(msg);
+}
 
 function parseEnv(projectRoot) {
   const envPath = path.join(projectRoot, '.env');
@@ -38,6 +50,15 @@ async function runDbBackup(projectRoot, outputPath) {
     console.log(chalk.green('[reactpress]'), t('db.backup.done'));
     return out;
   } catch (err) {
+    if (isMysqldumpNotFoundError(err) && isLocalDbHost(host)) {
+      const via = mysqldumpFromDbContainer(projectRoot, { user, password, database });
+      if (via.ok) {
+        console.log(chalk.cyan('[reactpress]'), t('db.backup.viaDocker'));
+        fs.writeFileSync(out, via.stdout, 'utf8');
+        console.log(chalk.green('[reactpress]'), t('db.backup.done'));
+        return out;
+      }
+    }
     console.error(chalk.red('[reactpress]'), t('db.backup.fail'));
     throw err;
   }

package/lib/dev-banner.js

@@ -1,4 +1,15 @@
-const chalk = require('chalk');
+const {
+  brand,
+  icon,
+  ok,
+  divider,
+  padRight,
+  terminalWidth,
+  gradientText,
+  palette,
+  pulseBar,
+  statusLights,
+} = require('../ui/theme');
 const {
   loadClientSiteUrl,
   loadServerSiteUrl,
@@ -20,20 +31,41 @@ function getDevUrls(projectRoot) {
   };
 }
 
+function urlLine(key, url, { underline = true } = {}) {
+  const keyCol = brand.muted(padRight(key, 10));
+  const value = underline ? brand.accent.underline(url) : brand.dim(url);
+  return `  ${brand.accent('▸ ')}${keyCol}  ${value}`;
+}
+
 function printDevReadyBanner(projectRoot, { apiOnly = false } = {}) {
   const urls = getDevUrls(projectRoot);
+  const w = Math.min(terminalWidth() - 4, 56);
+
   console.log('');
-  console.log(chalk.bold.green(t('devBanner.ready')));
-  console.log(chalk.gray('  ─────────────────────────────────────────'));
+  console.log(
+    `  ${icon.ok}  ${gradientText(t('devBanner.ready'), [palette.green, palette.accent], { bold: true })}  ${statusLights('online')}`
+  );
+  console.log(`  ${brand.primary('╔' + '═'.repeat(w) + '╗')}`);
+
   if (!apiOnly) {
-    console.log(`  ${chalk.cyan(t('devBanner.site'))}     ${chalk.underline(urls.site)}`);
-    console.log(`  ${chalk.cyan(t('devBanner.admin'))}   ${chalk.underline(urls.admin)}`);
+    console.log(urlLine(t('devBanner.site'), urls.site));
+    console.log(urlLine(t('devBanner.admin'), urls.admin));
+  }
+  console.log(urlLine(t('devBanner.api'), urls.api));
+  console.log(urlLine(t('devBanner.swagger'), urls.swagger));
+  console.log(urlLine(t('devBanner.health'), urls.health, { underline: false }));
+
+  const pulseWidth = Math.min(20, w - 4);
+  if (pulseWidth > 6) {
+    console.log(
+      `  ${brand.muted('  ')}${pulseBar(pulseWidth, pulseWidth)}  ${brand.success(t('devBanner.allSystemsGo'))}`
+    );
   }
-  console.log(`  ${chalk.cyan('API')}      ${chalk.underline(urls.api)}`);
-  console.log(`  ${chalk.cyan('Swagger')}  ${chalk.underline(urls.swagger)}`);
-  console.log(`  ${chalk.cyan(t('devBanner.health'))} ${urls.health}`);
-  console.log(chalk.gray('  ─────────────────────────────────────────'));
-  console.log(chalk.gray(t('devBanner.hint')));
+
+  console.log(`  ${brand.primary('╚' + '═'.repeat(w) + '╝')}`);
+  console.log(
+    `  ${brand.dim(t('devBanner.hint'))}  ${brand.muted('·')}  ${brand.dim(t('devBanner.shortcuts'))}`
+  );
   console.log('');
 }
 

package/lib/dev.js

@@ -1,18 +1,24 @@
 const { spawn } = require('child_process');
 const path = require('path');
+const ora = require('ora');
 const { runBuild } = require('./build');
 const { ensureProjectEnvironment } = require('./bootstrap');
 const { loadServerSiteUrl, loadClientSiteUrl, waitForHttp } = require('./http');
 const { printDevReadyBanner } = require('./dev-banner');
 const { ensureOriginalCwd } = require('./root');
+const { detectProjectType, hasClient, hasToolkit } = require('./project-type');
 const { t } = require('./i18n');
 
 const CLIENT_READY_TIMEOUT_MS = 120_000;
-
 const API_READY_TIMEOUT_MS = 180_000;
 
 function formatDevFailureHint() {
-  return [t('dev.nextSteps'), t('dev.nextDoctor'), t('dev.nextDocker'), t('dev.nextEnv')].join('\n');
+  return [
+    t('dev.nextSteps'),
+    t('dev.nextDoctor'),
+    t('dev.nextDocker'),
+    t('dev.nextEnv'),
+  ].join('\n');
 }
 
 let apiChild;
@@ -22,22 +28,17 @@ let shuttingDown = false;
 function shutdown(signal = 'SIGINT') {
   if (shuttingDown) return;
   shuttingDown = true;
-  if (webChild && !webChild.killed) {
-    webChild.kill(signal);
-  }
-  if (apiChild && !apiChild.killed) {
-    apiChild.kill(signal);
-  }
+  if (webChild && !webChild.killed) webChild.kill(signal);
+  if (apiChild && !apiChild.killed) apiChild.kill(signal);
 }
 
 async function buildToolkit(projectRoot) {
+  if (!hasToolkit(projectRoot)) return;
   await runBuild('toolkit', projectRoot);
 }
 
-async function startDevStack(projectRoot) {
-  const serverUrl = loadServerSiteUrl(projectRoot);
+function spawnApi(projectRoot) {
   const apiDevRunner = path.join(__dirname, 'api-dev-runner.js');
-
   console.log(t('dev.startingApi'));
   apiChild = spawn(process.execPath, [apiDevRunner], {
     stdio: 'inherit',
@@ -53,25 +54,28 @@ async function startDevStack(projectRoot) {
       process.exit(code ?? 0);
       return;
     }
-    if (webChild && !webChild.killed) {
-      webChild.kill('SIGINT');
-    }
+    if (webChild && !webChild.killed) webChild.kill('SIGINT');
     process.exit(code ?? 1);
   });
+}
 
-  console.log(t('dev.waitingApi', { url: serverUrl }));
+async function waitForApiReady(projectRoot) {
+  const serverUrl = loadServerSiteUrl(projectRoot);
+  const spinner = ora({
+    text: t('dev.waitingApi', { url: serverUrl }),
+    color: 'magenta',
+    spinner: 'dots',
+  }).start();
   const ready = await waitForHttp(serverUrl, API_READY_TIMEOUT_MS);
   if (!ready) {
-    console.error(
-      t('dev.apiTimeout', { seconds: API_READY_TIMEOUT_MS / 1000 }),
-    );
+    spinner.fail(t('dev.apiTimeout', { seconds: API_READY_TIMEOUT_MS / 1000 }));
     shutdown('SIGINT');
     process.exit(1);
   }
+  spinner.succeed(t('dev.apiReady'));
+}
 
-  printDevReadyBanner(projectRoot, { apiOnly: true });
-
-  console.log(t('dev.apiReady'));
+function spawnClient(projectRoot) {
   webChild = spawn('pnpm', ['run', '--dir', './client', 'dev'], {
     stdio: 'inherit',
     shell: true,
@@ -87,28 +91,38 @@ async function startDevStack(projectRoot) {
         t('dev.clientSlow', {
           seconds: CLIENT_READY_TIMEOUT_MS / 1000,
           url: clientUrl,
-        }),
+        })
       );
     }
   });
 
   webChild.on('close', (code) => {
-    if (!shuttingDown) {
-      shutdown('SIGINT');
-    }
+    if (!shuttingDown) shutdown('SIGINT');
     process.exit(code ?? 0);
   });
 }
 
+async function startDevStack(projectRoot) {
+  const includeClient = hasClient(projectRoot);
+
+  spawnApi(projectRoot);
+  await waitForApiReady(projectRoot);
+  printDevReadyBanner(projectRoot, { apiOnly: !includeClient });
+
+  if (!includeClient) {
+    console.log(t('dev.standaloneHint'));
+    return;
+  }
+  spawnClient(projectRoot);
+}
+
 async function runDev(projectRoot = ensureOriginalCwd()) {
   process.on('SIGINT', () => shutdown('SIGINT'));
   process.on('SIGTERM', () => shutdown('SIGTERM'));
 
   try {
     const result = await ensureProjectEnvironment(projectRoot);
-    if (result.message) {
-      console.log(`[reactpress] ${result.message}`);
-    }
+    if (result.message) console.log(`[reactpress] ${result.message}`);
   } catch (err) {
     console.error(t('dev.envFailed'), err.message || err);
     console.error(formatDevFailureHint());
@@ -119,4 +133,9 @@ async function runDev(projectRoot = ensureOriginalCwd()) {
   await startDevStack(projectRoot);
 }
 
-module.exports = { runDev, buildToolkit, startDevStack };
+module.exports = {
+  runDev,
+  buildToolkit,
+  startDevStack,
+  detectProjectType,
+};