Feat/perfect

cli/bin/reactpress.js

@@ -8,12 +8,14 @@
 const { Command } = require('commander');
 const path = require('path');
 const chalk = require('chalk');
-const { ensureOriginalCwd, getMonorepoRoot } = require('../lib/root');
+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');
@@ -24,7 +26,7 @@ const { getClientBin } = require('../lib/paths');
 const { runInteractiveLoop } = require('../ui/interactive');
 const { t } = require('../lib/i18n');
 
-const rootPkg = require(path.join(getMonorepoRoot(), 'package.json'));
+const rootPkg = require(path.join(__dirname, '..', 'package.json'));
 
 const program = new Command();
 
@@ -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('');
 });
 

cli/lib/api-dev.js

@@ -1,8 +1,14 @@
-const { spawn, spawnSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
 const { ensureProjectEnvironment } = require('./bootstrap');
-const { isUsingMonorepoServer } = require('./paths');
-const { getMonorepoRoot } = require('./root');
+const {
+  getServerBin,
+  getServerDir,
+  isUsingMonorepoServer,
+  canStartLocalApi,
+} = require('./paths');
+const { stopApi } = require('./lifecycle');
+const { ensureOriginalCwd } = require('./root');
 const { t } = require('./i18n');
 
 let apiChild;
@@ -11,16 +17,13 @@ function stopApiDev(projectRoot) {
   if (apiChild && !apiChild.killed) {
     apiChild.kill('SIGTERM');
   }
-  if (!isUsingMonorepoServer()) {
-    spawnSync('pnpm', ['exec', 'reactpress-cli', 'stop'], {
-      cwd: projectRoot,
-      stdio: 'inherit',
-    });
+  if (!isUsingMonorepoServer(projectRoot)) {
+    stopApi(projectRoot);
   }
 }
 
 function startApiDev(projectRoot) {
-  if (isUsingMonorepoServer()) {
+  if (isUsingMonorepoServer(projectRoot)) {
     console.log(t('apiDev.modeServer'));
     apiChild = spawn('pnpm', ['run', '--dir', './server', 'dev'], {
       cwd: projectRoot,
@@ -31,18 +34,19 @@ function startApiDev(projectRoot) {
         REACTPRESS_ORIGINAL_CWD: projectRoot,
       },
     });
-  } else {
-    console.log(t('apiDev.modeCli'));
-    const start = spawnSync('pnpm', ['exec', 'reactpress-cli', 'start'], {
-      cwd: projectRoot,
+  } else if (canStartLocalApi(projectRoot)) {
+    console.log(t('apiDev.modeBundled'));
+    apiChild = spawn(process.execPath, [getServerBin(projectRoot)], {
+      cwd: getServerDir(projectRoot),
       stdio: 'inherit',
+      env: {
+        ...process.env,
+        REACTPRESS_ORIGINAL_CWD: projectRoot,
+      },
     });
-    if (start.status !== 0) {
-      process.exit(start.status ?? 1);
-    }
-    console.log(t('apiDev.startedByCli'));
-    process.stdin.resume();
-    return;
+  } else {
+    console.error(t('lifecycle.noServerAvailable'));
+    process.exit(1);
   }
 
   if (apiChild) {
@@ -54,7 +58,7 @@ function startApiDev(projectRoot) {
   }
 }
 
-async function runApiDev(projectRoot = process.env.REACTPRESS_ORIGINAL_CWD || getMonorepoRoot()) {
+async function runApiDev(projectRoot = ensureOriginalCwd()) {
   try {
     await ensureProjectEnvironment(projectRoot);
   } catch (err) {

cli/lib/bootstrap.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { pathToFileURL } = require('url');
-const { getMonorepoRoot, isMonorepoCheckout } = require('./root');
+const { ensureOriginalCwd, isMonorepoCheckout } = require('./root');
 const { getCliPackageRoot } = require('./paths');
 const { t } = require('./i18n');
 
@@ -68,7 +68,7 @@ async function initMonorepoProject(projectRoot, { force = false } = {}) {
   };
 }
 
-async function ensureProjectEnvironment(projectRoot = getMonorepoRoot()) {
+async function ensureProjectEnvironment(projectRoot = ensureOriginalCwd()) {
   const root = path.resolve(projectRoot);
   const { setProjectCwd } = await importCliModule('utils/cli-context.js');
   setProjectCwd(root);