No commit message

sources/@roots/bud-compiler/src/service/index.tsx

@@ -21,7 +21,6 @@ import {Error as DisplayError} from '@roots/bud-dashboard/components/error'
 import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
 import {BudError} from '@roots/bud-support/errors'
-import {render} from '@roots/bud-support/ink'
 import isNull from '@roots/bud-support/lodash/isNull'
 import isNumber from '@roots/bud-support/lodash/isNumber'
 import isString from '@roots/bud-support/lodash/isString'
@@ -31,11 +30,6 @@ import stripAnsi from '@roots/bud-support/strip-ansi'
  * {@link BudCompiler} implementation
  */
 class Compiler extends Service implements BudCompiler {
-  /**
-   * {@link BudCompiler.compilationStats}
-   */
-  public declare compilationStats: BudCompiler[`compilationStats`]
-
   /**
    * {@link BudCompiler.config}
    */
@@ -73,9 +67,11 @@ class Compiler extends Service implements BudCompiler {
     })
 
     if (`isBudError` in error) {
-      render(<DisplayError error={error} />)
+      this.app.context.render(<DisplayError error={error} />)
     } else {
-      render(<DisplayError error={BudError.normalize(error)} />)
+      this.app.context.render(
+        <DisplayError error={BudError.normalize(error)} />,
+      )
     }
   }
   /**
@@ -88,26 +84,21 @@ class Compiler extends Service implements BudCompiler {
         ? `${this.app.label} (${child.name})`
         : child.name
 
-    this.stats = stats
-
-    this.compilationStats = stats.toJson(statsOptions)
-
-    this.app.dashboard.updateStats(this.compilationStats)
+    this.stats = stats.toJson(statsOptions)
+    this.app.context.render(this.app.dashboard.render(stats))
 
     if (stats.hasErrors()) {
       process.exitCode = 1
 
-      this.compilationStats.children = this.compilationStats.children?.map(
-        child => ({
-          ...child,
-          errors:
-            child.errors && this.sourceErrors
-              ? this.sourceErrors(child.errors)
-              : child.errors ?? [],
-        }),
-      )
+      this.stats.children = this.stats.children?.map(child => ({
+        ...child,
+        errors:
+          child.errors && this.sourceErrors
+            ? this.sourceErrors(child.errors)
+            : child.errors ?? [],
+      }))
 
-      this.compilationStats.children
+      this.stats.children
         ?.filter(
           child => isNumber(child.errorsCount) && child.errorsCount > 0,
         )
@@ -131,7 +122,7 @@ class Compiler extends Service implements BudCompiler {
         })
     }
 
-    this.compilationStats.children
+    this.stats.children
       ?.filter(child => child.errorsCount === 0)
       .forEach(child => {
         try {
@@ -146,6 +137,7 @@ class Compiler extends Service implements BudCompiler {
           })
 
           this.app.server?.publicUrl.href &&
+            this.app.context.browser &&
             this.app.notifier.openBrowser(this.app.server?.publicUrl.href)
         } catch (error) {
           this.logger.error(error)
@@ -224,8 +216,8 @@ class Compiler extends Service implements BudCompiler {
            * In a perfect world webpack plugins would use the
            * `nameForCondition` property to identify the module.
            */
-          if (ident && this.compilationStats?.children) {
-            module = this.compilationStats.children
+          if (ident && this.stats?.children) {
+            module = this.stats.children
               .flatMap(child => child?.modules)
               .find(module => [module?.id, module?.name].includes(ident))
           }

sources/@roots/bud-dashboard/src/application.tsx

@@ -4,6 +4,7 @@ import type {StatsCompilation} from '@roots/bud-framework/config'
 import {exit} from 'node:process'
 
 import {Error} from '@roots/bud-dashboard/components/error'
+import Footer from '@roots/bud-dashboard/components/footer'
 import Compilation from '@roots/bud-dashboard/views/compilation'
 import Debug from '@roots/bud-dashboard/views/debug'
 import Server from '@roots/bud-dashboard/views/server'
@@ -17,13 +18,10 @@ import {
   useStdout,
 } from '@roots/bud-support/ink'
 import escapes from '@roots/bud-support/ansi-escapes'
-import {isFunction} from 'lodash'
-import Help from './components/help.js'
 
 export interface Props {
   basedir?: string
-  close?: (callback: (error?: Error | null) => any) => void
-  closed?: boolean
+  close?: (callback: (error?: Error | null) => any) => any
   compact?: boolean
   compilations?: Array<Partial<StatsCompilation>>
   debug?: boolean
@@ -35,11 +33,12 @@ export interface Props {
   errors?: StatsCompilation[`errors`]
   isolated?: number
   mode: Bud['mode']
+  notifier?: Bud[`notifier`]
   proxy?: boolean
   proxyUrl?: URL
   publicDevUrl?: URL
   publicProxyUrl?: URL
-  status?: false | string
+  displayHelp?: boolean
   warnings?: StatsCompilation[`warnings`]
 }
 
@@ -59,7 +58,7 @@ export const Application = ({
   proxyUrl,
   publicDevUrl,
   publicProxyUrl,
-  status,
+  displayHelp,
 }: Props) => {
   const {stdout} = useStdout()
 
@@ -99,6 +98,7 @@ export const Application = ({
   return (
     <>
       {error && <Error error={error} />}
+
       {compilations.map((compilation, id) => (
         <RenderCompilation
           basedir={basedir}
@@ -168,12 +168,12 @@ export const RenderCompilation = ({
 export const TeletypeApplication = ({
   children,
   close,
+  notifier,
   ...props
 }: PropsWithChildren<Props>) => {
-  const app = useApp()
+  const onExit = useOnExit()
   const stdout = useStdout()
 
-  const [closed, setClosed] = useState(false)
   const [compact, setCompact] = useState(props.compact)
   const [debug, setDisplayDebug] = useState(props.debug)
   const [displayAssets, setDisplayAssets] = useState(props.displayAssets)
@@ -183,36 +183,42 @@ export const TeletypeApplication = ({
   )
   const [help, setHelp] = useState(false)
   const [isolated, setIsolated] = useState(0)
-  const [refresh, setRefresh] = useState(false)
 
   useInput((key, input) => {
     switch (key) {
       case `a`:
         setDisplayAssets(!displayAssets)
         break
 
-      case `c`:
-        setCompact(!compact)
+      case `b`:
+        if (notifier?.openBrowser && props.devUrl) {
+          notifier.openBrowser(props.devUrl?.toString())
+          notifier.browserOpened = false
+        }
         break
 
-      case `e`:
-        setDisplayEntrypoints(!displayEntrypoints)
+      case `c`:
+        setCompact(!compact)
         break
 
       case `d`:
         setDisplayDebug(!debug)
         break
 
+      case `e`:
+        setDisplayEntrypoints(!displayEntrypoints)
+        break
+
       case `h`:
         setHelp(!help)
         break
 
       case `q`:
-        setClosed(true)
+        onExit()
         break
 
       case `r`:
-        setRefresh(true)
+        stdout.write(escapes.clearTerminal)
         break
 
       case `s`:
@@ -222,50 +228,41 @@ export const TeletypeApplication = ({
       case `0`:
         setIsolated(0)
         break
-
-      default:
-        break
     }
 
     new Array(9).fill(0).forEach((_, i) => {
       if (!props.compilations) return
+
       key === `${i + 1}` &&
         isolated !== i + 1 &&
         setIsolated(Math.min(i + 1, props.compilations.length))
     })
 
-    if (input.escape) {
-      setClosed(true)
-    }
-
-    if (refresh) {
-      setRefresh(false)
-      stdout.write(escapes.clearTerminal)
-    }
-
-    closed &&
-      isFunction(close) &&
-      close((error?) => {
-        if (error) app.exit(error)
-        else app.exit()
-        exit(error ? 1 : 0)
-      })
+    if (input.escape) onExit()
   })
 
   return (
     <>
       <Application
         {...props}
-        closed={closed}
         compact={compact}
         debug={debug}
         displayAssets={displayAssets}
         displayEntrypoints={displayEntrypoints}
         displayServerInfo={displayServerInfo}
         isolated={isolated}
       />
-
-      {help && <Help />}
+      <Footer display={help} />
     </>
   )
 }
+
+const useOnExit = () => {
+  const app = useApp()
+
+  return (error?: Error | null): any => {
+    if (error) app.exit(error)
+    else app.exit()
+    exit(error ? 1 : 0)
+  }
+}

sources/@roots/bud-dashboard/src/components/footer.tsx

@@ -0,0 +1,70 @@
+import {Box, Text} from '@roots/bud-support/ink'
+
+export interface Props {
+  display?: boolean
+}
+
+const Footer = ({display}: Props) => {
+  if (!display) {
+    return (
+      <Box flexDirection="column">
+        <Text>{` `}</Text>
+        <Text>
+          <Text dimColor>{` `}Press</Text> h{' '}
+          <Text dimColor>to show help</Text>
+        </Text>
+      </Box>
+    )
+  }
+
+  return (
+    <Box flexDirection="column">
+      <Text>{` `}</Text>
+      <Text color="blue">
+        {` `}Shortcuts{` `}
+      </Text>
+      <Text>{` `}</Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> b <Text dimColor>to open browser</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> c{' '}
+        <Text dimColor>to toggle compact display</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> d{' '}
+        <Text dimColor>
+          to toggle detailed debug information (may be system intensive)
+        </Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> e{' '}
+        <Text dimColor>to toggle entrypoints display</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> h <Text dimColor>to hide help</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> q <Text dimColor>to quit</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> r{' '}
+        <Text dimColor>to clear/reload console</Text>
+      </Text>
+      <Text>
+        {` `}
+        <Text dimColor>Press</Text> s{' '}
+        <Text dimColor>to toggle server info display</Text>
+      </Text>
+    </Box>
+  )
+}
+
+export default Footer