fix(cli): Call the CJS build of api-server for CJS projects (#431)

Author: Tobbe

packages/cli/src/commands/__tests__/serve.test.js

@@ -1,13 +1,18 @@
-import { vi, describe, afterEach, it, expect } from 'vitest'
+import { vi, describe, afterEach, beforeEach, it, expect } from 'vitest'
 import yargs from 'yargs/yargs'
 
 import * as apiServerCLIConfig from '@cedarjs/api-server/apiCliConfig'
 import * as bothServerCLIConfig from '@cedarjs/api-server/bothCliConfig'
+import * as apiServerCLIConfigHandler from '@cedarjs/api-server/cjs/apiCliConfigHandler'
 
 import { builder } from '../serve.js'
 
 globalThis.__dirname = __dirname
 
+const mocks = vi.hoisted(() => ({
+  isEsm: true,
+}))
+
 // We mock these to skip the check for web/dist and api/dist
 vi.mock('@cedarjs/project-config', async (importOriginal) => {
   const originalProjectConfig = await importOriginal()
@@ -31,6 +36,7 @@ vi.mock('@cedarjs/project-config', async (importOriginal) => {
         api: {},
       }
     },
+    projectIsEsm: () => mocks.isEsm,
   }
 })
 
@@ -58,6 +64,11 @@ vi.mock('@cedarjs/api-server/apiCliConfig', async (importOriginal) => {
     handler: vi.fn(),
   }
 })
+vi.mock('@cedarjs/api-server/cjs/apiCliConfigHandler', async () => {
+  return {
+    handler: vi.fn(),
+  }
+})
 vi.mock('@cedarjs/api-server/bothCliConfig', async (importOriginal) => {
   const originalBothCLIConfig = await importOriginal()
   return {
@@ -74,6 +85,10 @@ vi.mock('execa', () => ({
 }))
 
 describe('yarn rw serve', () => {
+  beforeEach(() => {
+    mocks.isEsm = true
+  })
+
   afterEach(() => {
     vi.clearAllMocks()
   })
@@ -91,6 +106,21 @@ describe('yarn rw serve', () => {
     )
   })
 
+  it('Should proxy serve api with params to api-server handler for CJS projects', async () => {
+    mocks.isEsm = false
+
+    const parser = yargs().command('serve [side]', false, builder)
+
+    await parser.parse('serve api --port 5555 --apiRootPath funkyFunctions')
+
+    expect(apiServerCLIConfigHandler.handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        port: 5555,
+        apiRootPath: expect.stringMatching(/^\/?funkyFunctions\/?$/),
+      }),
+    )
+  })
+
   it('Should proxy serve api with params to api-server handler (alias and slashes in path)', async () => {
     const parser = yargs().command('serve [side]', false, builder)
 
@@ -106,6 +136,23 @@ describe('yarn rw serve', () => {
     )
   })
 
+  it('Should proxy serve api with params to api-server handler (alias and slashes in path) for CJS projects', async () => {
+    mocks.isEsm = false
+
+    const parser = yargs().command('serve [side]', false, builder)
+
+    await parser.parse(
+      'serve api --port 5555 --rootPath funkyFunctions/nested/',
+    )
+
+    expect(apiServerCLIConfigHandler.handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        port: 5555,
+        rootPath: expect.stringMatching(/^\/?funkyFunctions\/nested\/$/),
+      }),
+    )
+  })
+
   it('Should proxy rw serve with params to appropriate handler', async () => {
     const parser = yargs().command('serve [side]', false, builder)
 

packages/cli/src/commands/serve.js

@@ -6,6 +6,7 @@ import { terminalLink } from 'termi-link'
 import * as apiServerCLIConfig from '@cedarjs/api-server/apiCliConfig'
 import * as bothServerCLIConfig from '@cedarjs/api-server/bothCliConfig'
 import { recordTelemetryAttributes } from '@cedarjs/cli-helpers'
+import { projectIsEsm } from '@cedarjs/project-config'
 import * as webServerCLIConfig from '@cedarjs/web-server'
 
 import c from '../lib/colors.js'
@@ -69,7 +70,14 @@ export const builder = async (yargs) => {
           const { apiServerFileHandler } = await import('./serveApiHandler.js')
           await apiServerFileHandler(argv)
         } else {
-          await apiServerCLIConfig.handler(argv)
+          if (!projectIsEsm()) {
+            const { handler } = await import(
+              '@cedarjs/api-server/cjs/apiCliConfigHandler'
+            )
+            await handler(argv)
+          } else {
+            await apiServerCLIConfig.handler(argv)
+          }
         }
       },
     })
@@ -89,6 +97,8 @@ export const builder = async (yargs) => {
         if (streamingEnabled) {
           await webSsrServerHandler(rscEnabled)
         } else {
+          // @cedarjs/web-server is still built as CJS only, so we don't need
+          // the same solution here as we do for the api side
           await webServerCLIConfig.handler(argv)
         }
       },