CLI responsiveness

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

@@ -1,4 +1,4 @@
-jest.mock('@redwoodjs/internal', () => {
+jest.mock('@redwoodjs/internal/dist/paths', () => {
   return {
     getPaths: () => {
       return {
@@ -10,6 +10,11 @@ jest.mock('@redwoodjs/internal', () => {
         },
       }
     },
+  }
+})
+
+jest.mock('@redwoodjs/internal/dist/config', () => {
+  return {
     getConfig: () => {},
   }
 })
@@ -25,8 +30,8 @@ import { handler } from '../build'
 
 afterEach(() => jest.clearAllMocks())
 
-test('the build tasks are in the correct sequence', () => {
-  handler({})
+test('the build tasks are in the correct sequence', async () => {
+  await handler({})
   expect(Listr.mock.calls[0][0].map((x) => x.title)).toMatchInlineSnapshot(`
 Array [
   "Generating Prisma Client...",
@@ -43,7 +48,7 @@ jest.mock('@redwoodjs/prerender/detection', () => {
 })
 
 test('Should run prerender for web', async () => {
-  handler({ side: ['web'], prerender: true })
+  await handler({ side: ['web'], prerender: true })
   expect(Listr.mock.calls[0][0].map((x) => x.title)).toMatchInlineSnapshot(`
     Array [
       "Cleaning Web...",

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

@@ -1,3 +1,5 @@
+import '../../lib/mockTelemetry'
+
 jest.mock('concurrently', () => ({
   __esModule: true, // this property makes it work
   default: jest.fn().mockReturnValue({
@@ -17,6 +19,14 @@ jest.mock('fs', () => {
 })
 
 jest.mock('@redwoodjs/internal', () => {
+  return {
+    getConfig: jest.fn(),
+    getConfigPath: () => '/mocked/project/redwood.toml',
+    shutdownPort: jest.fn(),
+  }
+})
+
+jest.mock('@redwoodjs/internal/dist/paths', () => {
   return {
     getPaths: () => {
       return {
@@ -31,9 +41,6 @@ jest.mock('@redwoodjs/internal', () => {
         },
       }
     },
-    getConfig: jest.fn(),
-    getConfigPath: () => '/mocked/project/redwood.toml',
-    shutdownPort: jest.fn(),
   }
 })
 

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

@@ -1,4 +1,4 @@
-jest.mock('@redwoodjs/internal', () => {
+jest.mock('@redwoodjs/internal/dist/paths', () => {
   return {
     getPaths: () => {
       return {

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

@@ -1,7 +1,7 @@
 global.__dirname = __dirname
 
 // We mock these to skip the check for web/dist and api/dist
-jest.mock('@redwoodjs/internal', () => {
+jest.mock('@redwoodjs/internal/dist/paths', () => {
   return {
     getPaths: () => {
       return {
@@ -13,6 +13,11 @@ jest.mock('@redwoodjs/internal', () => {
         },
       }
     },
+  }
+})
+
+jest.mock('@redwoodjs/internal/dist/config', () => {
+  return {
     getConfig: () => {
       return {
         api: {},

packages/cli/src/commands/build.js

@@ -1,45 +1,18 @@
-import fs from 'fs'
-import path from 'path'
-
-import execa from 'execa'
-import Listr from 'listr'
-import VerboseRenderer from 'listr-verbose-renderer'
-import rimraf from 'rimraf'
 import terminalLink from 'terminal-link'
 
-import { buildApi, loadAndValidateSdls } from '@redwoodjs/internal'
-import { detectPrerenderRoutes } from '@redwoodjs/prerender/detection'
-import { timedTelemetry, errorTelemetry } from '@redwoodjs/telemetry'
-
-import { getPaths } from '../lib'
-import c from '../lib/colors'
-import { generatePrismaCommand } from '../lib/generatePrismaClient'
+import { sides } from '../lib/project'
 import checkForBabelConfig from '../middleware/checkForBabelConfig'
 
-import { getTasks as getPrerenderTasks } from './prerender'
-
 export const command = 'build [side..]'
 export const description = 'Build for production'
 
 export const builder = (yargs) => {
-  const apiExists = fs.existsSync(getPaths().api.src)
-  const webExists = fs.existsSync(getPaths().web.src)
-
-  const optionDefault = (apiExists, webExists) => {
-    let options = []
-    if (apiExists) {
-      options.push('api')
-    }
-    if (webExists) {
-      options.push('web')
-    }
-    return options
-  }
+  const choices = sides()
 
   yargs
     .positional('side', {
-      choices: ['api', 'web'],
-      default: optionDefault(apiExists, webExists),
+      choices,
+      default: choices,
       description: 'Which side(s) to build',
       type: 'array',
     })
@@ -83,131 +56,7 @@ export const builder = (yargs) => {
     )
 }
 
-export const handler = async ({
-  side = ['api', 'web'],
-  verbose = false,
-  performance = false,
-  stats = false,
-  prisma = true,
-  prerender,
-}) => {
-  const rwjsPaths = getPaths()
-
-  if (performance) {
-    console.log('Measuring Web Build Performance...')
-    execa.sync(
-      `yarn cross-env NODE_ENV=production webpack --config ${require.resolve(
-        '@redwoodjs/core/config/webpack.perf.js'
-      )}`,
-      { stdio: 'inherit', shell: true, cwd: rwjsPaths.web.base }
-    )
-    // We do not want to continue building...
-    return
-  }
-
-  if (stats) {
-    console.log('Building Web Stats...')
-    execa.sync(
-      `yarn cross-env NODE_ENV=production webpack --config ${require.resolve(
-        '@redwoodjs/core/config/webpack.stats.js'
-      )}`,
-      { stdio: 'inherit', shell: true, cwd: rwjsPaths.web.base }
-    )
-    // We do not want to continue building...
-    return
-  }
-
-  const tasks = [
-    side.includes('api') &&
-      prisma && {
-        title: 'Generating Prisma Client...',
-        task: async () => {
-          const { cmd, args } = generatePrismaCommand(rwjsPaths.api.dbSchema)
-          return execa(cmd, args, {
-            stdio: verbose ? 'inherit' : 'pipe',
-            shell: true,
-            cwd: rwjsPaths.api.base,
-          })
-        },
-      },
-    side.includes('api') && {
-      title: 'Verifying graphql schema...',
-      task: loadAndValidateSdls,
-    },
-    side.includes('api') && {
-      title: 'Building API...',
-      task: () => {
-        const { errors, warnings } = buildApi()
-
-        if (errors.length) {
-          console.error(errors)
-        }
-        if (warnings.length) {
-          console.warn(warnings)
-        }
-      },
-    },
-    side.includes('web') && {
-      // Clean web
-      title: 'Cleaning Web...',
-      task: () => {
-        rimraf.sync(rwjsPaths.web.dist)
-      },
-    },
-    side.includes('web') && {
-      title: 'Building Web...',
-      task: async () => {
-        await execa(
-          `yarn cross-env NODE_ENV=production webpack --config ${require.resolve(
-            '@redwoodjs/core/config/webpack.production.js'
-          )}`,
-          {
-            stdio: verbose ? 'inherit' : 'pipe',
-            shell: true,
-            cwd: rwjsPaths.web.base,
-          }
-        )
-
-        console.log('Creating 200.html...')
-
-        const indexHtmlPath = path.join(getPaths().web.dist, 'index.html')
-
-        fs.copyFileSync(
-          indexHtmlPath,
-          path.join(getPaths().web.dist, '200.html')
-        )
-      },
-    },
-    side.includes('web') &&
-      prerender && {
-        title: 'Prerendering Web...',
-        task: async () => {
-          const prerenderRoutes = detectPrerenderRoutes()
-          if (prerenderRoutes.length === 0) {
-            return `You have not marked any "prerender" in your ${terminalLink(
-              'Routes',
-              'file://' + rwjsPaths.web.routes
-            )}.`
-          }
-          return new Listr(await getPrerenderTasks(), {
-            renderer: verbose && VerboseRenderer,
-            concurrent: true, // Re-use prerender tasks, but run them in parallel to speed things up
-          })
-        },
-      },
-  ].filter(Boolean)
-
-  const jobs = new Listr(tasks, {
-    renderer: verbose && VerboseRenderer,
-  })
-
-  try {
-    await timedTelemetry(process.argv, { type: 'build' }, async () => {
-      await jobs.run()
-    })
-  } catch (e) {
-    console.log(c.error(e.message))
-    errorTelemetry(process.argv, e.message)
-    process.exit(1)
-  }
+export const handler = async (options) => {
+  const { handler } = await import('./buildHandler')
+  return handler(options)
 }