fix(deploy): Correct import of deploy helper for Netlify and Vercel (#435)

Author: Tobbe

packages/cli/src/commands/deploy/__tests__/netlify.test.ts

@@ -0,0 +1,68 @@
+import execa from 'execa'
+import { vi, it, expect, afterAll } from 'vitest'
+
+// @ts-expect-error JS file import
+import * as deployNetlify from '../netlify.js'
+
+vi.mock('path')
+vi.mock('execa', () => ({ default: vi.fn() }))
+vi.mock('fs-extra')
+
+vi.mock('@cedarjs/project-config', async () => ({
+  getPaths: () => ({
+    base: `${__dirname}/fixtures`,
+  }),
+}))
+
+vi.mock('@cedarjs/cli-helpers', async () => ({
+  recordTelemetryAttributes: vi.fn(),
+}))
+
+vi.spyOn(console, 'log').mockImplementation(() => {})
+
+afterAll(() => {
+  vi.restoreAllMocks()
+})
+
+it('should export a command', async () => {
+  expect(deployNetlify.command).toMatch(/netlify/)
+})
+
+it('should export a description', async () => {
+  expect(deployNetlify.description).toMatch('Build command for Netlify deploy')
+})
+
+it('should export a builder function', async () => {
+  const yargs = {
+    option: vi.fn().mockImplementation(() => yargs),
+    epilogue: vi.fn().mockImplementation(() => yargs),
+  }
+
+  deployNetlify.builder(yargs)
+
+  expect(yargs.option).toHaveBeenCalledWith('build', {
+    description: 'Build for production',
+    type: 'boolean',
+    default: 'true',
+  })
+  expect(yargs.option).toHaveBeenCalledWith('prisma', {
+    description: 'Apply database migrations',
+    type: 'boolean',
+    default: 'true',
+  })
+})
+
+it('should export a handler function', async () => {
+  await deployNetlify.handler({ build: true, prisma: false, dm: true })
+
+  expect(execa).toHaveBeenCalledWith(
+    'yarn rw build --verbose && yarn rw data-migrate up',
+    {
+      shell: true,
+      stdio: 'inherit',
+      cwd: expect.stringContaining('fixtures'),
+      extendEnv: true,
+      cleanup: true,
+    },
+  )
+})

packages/cli/src/commands/deploy/helpers/deployHandler.js

@@ -4,7 +4,7 @@ import { getPaths } from '@cedarjs/project-config'
 
 import c from '../../../lib/colors.js'
 
-export const deployHandler = async ({ build, prisma, dm: dataMigrate }) => {
+export const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
   const paths = getPaths()
 
   let commandSet = []
@@ -20,7 +20,7 @@ export const deployHandler = async ({ build, prisma, dm: dataMigrate }) => {
 
   const joinedCommands = commandSet.join(' && ')
 
-  console.log(c.note(`\nRunning:\n`) + `${joinedCommands} \n`)
+  console.log(c.note('\nRunning:\n') + `${joinedCommands}\n`)
 
   return execa(joinedCommands, {
     shell: true,

packages/cli/src/commands/deploy/netlify.js

@@ -15,9 +15,7 @@ export async function handler(yargs) {
     dataMigrate: yargs.dataMigrate,
   })
 
-  const { handler: importedHandler } = await import(
-    './helpers/deployHandler.js'
-  )
+  const { deployHandler } = await import('./helpers/deployHandler.js')
 
-  return importedHandler(yargs)
+  return deployHandler(yargs)
 }

packages/cli/src/commands/deploy/vercel.js

@@ -15,9 +15,7 @@ export async function handler(yargs) {
     dataMigrate: yargs.dataMigrate,
   })
 
-  const { handler: importedHandler } = await import(
-    './helpers/deployHandler.js'
-  )
+  const { deployHandler } = await import('./helpers/deployHandler.js')
 
-  return importedHandler(yargs)
+  return deployHandler(yargs)
 }