feat(cli): run build automatically when deploying

Deploy now runs the Catalyst build pipeline before bundling, so users
no longer need to manually run `catalyst build && catalyst deploy`.

Author: matthewvolk

packages/catalyst/src/cli/commands/build.ts

@@ -11,6 +11,71 @@ import { getWranglerConfig } from '../lib/wrangler-config';
 
 const WRANGLER_VERSION = '4.24.3';
 
+export async function buildCatalystProject(projectUuid: string): Promise<void> {
+  const coreDir = process.cwd();
+  const openNextOutDir = join(coreDir, '.open-next');
+  const bigcommerceDistDir = join(coreDir, '.bigcommerce', 'dist');
+
+  const wranglerConfig = getWranglerConfig(projectUuid, 'PLACEHOLDER_KV_ID');
+
+  consola.start('Copying templates...');
+
+  await copyFile(
+    join(getModuleCliPath(), 'templates', 'open-next.config.ts'),
+    join(coreDir, '.bigcommerce', 'open-next.config.ts'),
+  );
+  await writeFile(
+    join(coreDir, '.bigcommerce', 'wrangler.jsonc'),
+    JSON.stringify(wranglerConfig, null, 2),
+  );
+
+  consola.success('Templates copied');
+
+  consola.start('Building project...');
+
+  await execa(
+    'pnpm',
+    [
+      'exec',
+      'opennextjs-cloudflare',
+      'build',
+      '--skipWranglerConfigCheck',
+      '--openNextConfigPath',
+      join(coreDir, '.bigcommerce', 'open-next.config.ts'),
+    ],
+    {
+      stdout: ['pipe', 'inherit'],
+      cwd: coreDir,
+    },
+  );
+
+  await execa(
+    'pnpm',
+    [
+      'dlx',
+      `wrangler@${WRANGLER_VERSION}`,
+      'deploy',
+      '--config',
+      join(coreDir, '.bigcommerce', 'wrangler.jsonc'),
+      '--keep-vars',
+      '--outdir',
+      bigcommerceDistDir,
+      '--dry-run',
+    ],
+    {
+      stdout: ['pipe', 'inherit'],
+      cwd: coreDir,
+    },
+  );
+
+  consola.success('Project built');
+
+  await cp(join(openNextOutDir, 'assets'), join(bigcommerceDistDir, 'assets'), {
+    recursive: true,
+    force: true,
+  });
+}
+
 export const build = new Command('build')
   .allowUnknownOption()
   // The unknown options end up in program.args, not in program.opts(). Commander does not take a guess at how to interpret the unknown options.
@@ -53,9 +118,6 @@ export const build = new Command('build')
       }
 
       if (framework === 'catalyst') {
-        const openNextOutDir = join(coreDir, '.open-next');
-        const bigcommerceDistDir = join(coreDir, '.bigcommerce', 'dist');
-
         const projectUuid = options.projectUuid ?? config.get('projectUuid');
 
         if (!projectUuid) {
@@ -64,64 +126,7 @@ export const build = new Command('build')
           );
         }
 
-        const wranglerConfig = getWranglerConfig(projectUuid, 'PLACEHOLDER_KV_ID');
-
-        consola.start('Copying templates...');
-
-        await copyFile(
-          join(getModuleCliPath(), 'templates', 'open-next.config.ts'),
-          join(coreDir, '.bigcommerce', 'open-next.config.ts'),
-        );
-        await writeFile(
-          join(coreDir, '.bigcommerce', 'wrangler.jsonc'),
-          JSON.stringify(wranglerConfig, null, 2),
-        );
-
-        consola.success('Templates copied');
-
-        consola.start('Building project...');
-
-        await execa(
-          'pnpm',
-          [
-            'exec',
-            'opennextjs-cloudflare',
-            'build',
-            '--skipWranglerConfigCheck',
-            '--openNextConfigPath',
-            join(coreDir, '.bigcommerce', 'open-next.config.ts'),
-          ],
-          {
-            stdout: ['pipe', 'inherit'],
-            cwd: coreDir,
-          },
-        );
-
-        await execa(
-          'pnpm',
-          [
-            'dlx',
-            `wrangler@${WRANGLER_VERSION}`,
-            'deploy',
-            '--config',
-            join(coreDir, '.bigcommerce', 'wrangler.jsonc'),
-            '--keep-vars',
-            '--outdir',
-            bigcommerceDistDir,
-            '--dry-run',
-          ],
-          {
-            stdout: ['pipe', 'inherit'],
-            cwd: coreDir,
-          },
-        );
-
-        consola.success('Project built');
-
-        await cp(join(openNextOutDir, 'assets'), join(bigcommerceDistDir, 'assets'), {
-          recursive: true,
-          force: true,
-        });
+        await buildCatalystProject(projectUuid);
       }
     } catch (error) {
       consola.error(error);

packages/catalyst/src/cli/commands/deploy.spec.ts

@@ -33,6 +33,11 @@ import {
 
 // eslint-disable-next-line import/dynamic-import-chunkname
 vi.mock('yocto-spinner', () => import('../../../tests/mocks/spinner'));
+vi.mock('./build', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('./build')>();
+
+  return { ...actual, buildCatalystProject: vi.fn() };
+});
 
 let exitMock: MockInstance;
 

packages/catalyst/src/cli/commands/deploy.ts

@@ -5,6 +5,7 @@ import { join } from 'node:path';
 import yoctoSpinner from 'yocto-spinner';
 import { z } from 'zod';
 
+import { buildCatalystProject } from './build';
 import { consola } from '../lib/logger';
 import { getProjectConfig } from '../lib/project-config';
 import { Telemetry } from '../lib/telemetry';
@@ -328,6 +329,7 @@ export const deploy = new Command('deploy')
         );
       }
 
+      await buildCatalystProject(projectUuid);
       await generateBundleZip();
 
       if (options.dryRun) {