refactor: run build directly on core

Author: matthewvolk

packages/cli/package.json

@@ -47,5 +47,8 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"
+  },
+  "peerDependencies": {
+    "@opennextjs/cloudflare": "^1.6.5"
   }
 }

packages/cli/src/commands/build.ts

@@ -2,67 +2,29 @@ import { Command, Option } from 'commander';
 import consola from 'consola';
 import { execa } from 'execa';
 import { cp } from 'node:fs/promises';
-import { join, relative, sep } from 'node:path';
+import { join } from 'node:path';
 
 import { getModuleCliPath } from '../lib/get-module-cli-path';
-import { mkTempDir } from '../lib/mk-temp-dir';
 
 const WRANGLER_VERSION = '4.24.3';
 
-const SKIP_DIRS = new Set([
-  'node_modules',
-  '.bigcommerce',
-  '.git',
-  '.turbo',
-  '.next',
-  '.vscode',
-  '.github',
-  '.changeset',
-  'dist',
-]);
-
-export function createFilter(root: string, skipDirs: Set<string>) {
-  return (src: string) => {
-    const rel = relative(root, src);
-    const parts = rel.split(sep);
-
-    return !parts.some((part) => skipDirs.has(part));
-  };
-}
-
 export const build = new Command('build')
-  .option('--keep-temp-dir', 'Keep the temporary directory after the build')
   .option('--project-uuid <uuid>', 'Project UUID to be included in the deployment configuration.')
   .addOption(
     new Option('--framework <framework>', 'The framework to use for the build.').choices([
       'nextjs',
       'catalyst',
     ]),
   )
-  .action(async (options) => {
-    const [tmpDir, rmTempDir] = await mkTempDir('catalyst-build-');
-
+  .action(async () => {
     try {
-      consola.start('Copying project to temp directory...');
-
-      const cwd = process.cwd();
-      const tmpCoreDir = join(tmpDir, 'core');
-      const wranglerOutDir = join(tmpCoreDir, '.dist');
-      const openNextOutDir = join(tmpCoreDir, '.open-next');
-      const bigcommerceDistDir = join(cwd, '.bigcommerce', 'dist');
-
-      await cp(cwd, tmpDir, {
-        recursive: true,
-        force: true,
-        preserveTimestamps: true,
-        filter: createFilter(cwd, SKIP_DIRS),
-      });
-
-      consola.success(`Project copied to temp directory: ${tmpDir}`);
+      const coreDir = process.cwd();
+      const openNextOutDir = join(coreDir, '.open-next');
+      const bigcommerceDistDir = join(coreDir, '.bigcommerce', 'dist');
 
       consola.start('Copying templates...');
 
-      await cp(join(getModuleCliPath(), 'templates'), tmpCoreDir, {
+      await cp(join(getModuleCliPath(), 'templates'), coreDir, {
         recursive: true,
         force: true,
       });
@@ -73,7 +35,7 @@ export const build = new Command('build')
 
       await execa('pnpm', ['exec', 'opennextjs-cloudflare', 'build'], {
         stdout: ['pipe', 'inherit'],
-        cwd: tmpCoreDir,
+        cwd: coreDir,
       });
 
       await execa(
@@ -84,38 +46,23 @@ export const build = new Command('build')
           'deploy',
           '--keep-vars',
           '--outdir',
-          wranglerOutDir,
+          bigcommerceDistDir,
           '--dry-run',
         ],
         {
           stdout: ['pipe', 'inherit'],
-          cwd: tmpCoreDir,
+          cwd: coreDir,
         },
       );
 
       consola.success('Project built');
 
-      consola.start('Copying build to project...');
-
-      await cp(wranglerOutDir, bigcommerceDistDir, {
-        recursive: true,
-        force: true,
-      });
-
       await cp(join(openNextOutDir, 'assets'), join(bigcommerceDistDir, 'assets'), {
         recursive: true,
         force: true,
       });
-
-      consola.success('Build copied to project');
     } catch (error) {
       consola.error(error);
-      process.exitCode = 1;
-    } finally {
-      if (!options.keepTempDir) {
-        await rmTempDir();
-      }
-
-      process.exit();
+      process.exit(1);
     }
   });

packages/cli/tests/commands/build.spec.ts

@@ -1,107 +1,15 @@
 import { Command } from 'commander';
-import consola from 'consola';
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
+import { expect, test } from 'vitest';
 
-import { build, createFilter } from '../../src/commands/build';
-import { program } from '../../src/program';
-
-const cleanup = vi.fn();
-
-beforeAll(() => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  vi.spyOn(process, 'exit').mockImplementation(() => null as never);
-
-  consola.wrapAll();
-
-  vi.mock('../../src/lib/mk-temp-dir', () => ({
-    mkTempDir: vi.fn(() => ['/tmp/test', cleanup]),
-  }));
-
-  vi.mock('node:fs/promises', () => ({
-    cp: vi.fn(),
-  }));
-
-  vi.mock('execa', () => ({
-    execa: vi.fn(),
-  }));
-});
-
-beforeEach(() => {
-  consola.mockTypes(() => vi.fn());
-});
-
-afterEach(() => {
-  vi.clearAllMocks();
-});
-
-afterAll(() => {
-  vi.restoreAllMocks();
-});
+import { build } from '../../src/commands/build';
 
 test('properly configured Command instance', () => {
   expect(build).toBeInstanceOf(Command);
   expect(build.name()).toBe('build');
   expect(build.options).toEqual(
     expect.arrayContaining([
-      expect.objectContaining({ long: '--keep-temp-dir' }),
       expect.objectContaining({ long: '--framework' }),
       expect.objectContaining({ long: '--project-uuid' }),
     ]),
   );
 });
-
-test('does not remove temp dir if --keep-temp-dir is passed', async () => {
-  await program.parseAsync(['node', 'catalyst', 'build', '--keep-temp-dir']);
-  expect(cleanup).not.toHaveBeenCalled();
-});
-
-test('removes temp dir if --keep-temp-dir is not passed', async () => {
-  await program.parseAsync(['node', 'catalyst', 'build']);
-  expect(cleanup).toHaveBeenCalled();
-});
-
-test('successfully builds project', async () => {
-  await program.parseAsync(['node', 'catalyst', 'build']);
-
-  expect(consola.success).toHaveBeenCalledWith('Project built');
-  expect(consola.success).toHaveBeenCalledWith('Build copied to project');
-});
-
-test('handles error if cp throws during build', async () => {
-  // Dynamically mock cp for this test only
-  // eslint-disable-next-line import/dynamic-import-chunkname
-  const cpModule = await import('node:fs/promises');
-  const originalCp = cpModule.cp;
-  const cpMock = vi.fn(() => {
-    throw new Error('cp failed');
-  });
-
-  cpModule.cp = cpMock;
-
-  await program.parseAsync(['node', 'catalyst', 'build']);
-
-  expect(consola.error).toHaveBeenCalledWith(expect.any(Error));
-
-  cpModule.cp = originalCp;
-});
-
-describe('createFilter', () => {
-  const ROOT = '/my/project';
-  const SKIP_DIRS = new Set(['node_modules', '.git', 'dist']);
-
-  const filter = createFilter(ROOT, SKIP_DIRS);
-
-  test('allows files not in skip list', () => {
-    expect(filter('/my/project/src/index.ts')).toBe(true);
-  });
-
-  test('skips files inside a skipped directory', () => {
-    expect(filter('/my/project/node_modules/lodash/index.js')).toBe(false);
-    expect(filter('/my/project/.git/config')).toBe(false);
-    expect(filter('/my/project/dist/main.js')).toBe(false);
-  });
-
-  test('handles nested skipped folders', () => {
-    expect(filter('/my/project/src/node_modules/whatever.js')).toBe(false);
-  });
-});