@roots/bud-compiler 6.17.0 → 6.19.0

package/README.md

@@ -66,9 +66,6 @@ However, the amount of effort needed to maintain and develop new features and pr
 <a href="https://wordpress.com/">
 <img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="200" height="150"/>
 </a>
-<a href="https://pantheon.io/">
-<img src="https://cdn.roots.io/app/uploads/pantheon.svg" alt="Pantheon" width="200" height="150"/>
-</a>
 <a href="https://worksitesafety.ca/careers/">
 <img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="200" height="150"/>
 </a>

package/lib/service/index.d.ts

@@ -7,10 +7,6 @@ import { Service } from '@roots/bud-framework/service';
  * {@link BudCompiler} implementation
  */
 declare class Compiler extends Service implements BudCompiler {
-    /**
-     * {@link BudCompiler.compilationStats}
-     */
-    compilationStats: BudCompiler[`compilationStats`];
     /**
      * {@link BudCompiler.config}
      */
@@ -30,7 +26,7 @@ declare class Compiler extends Service implements BudCompiler {
     /**
      * {@link BudCompiler.onError}
      */
-    onError(error: Error): void;
+    onError(error: Error | undefined): void;
     /**
      * {@link BudCompiler.onStats}
      */

package/lib/service/index.js

@@ -3,14 +3,13 @@ import { jsx as _jsx } from "@roots/bud-support/jsx-runtime";
 import { cpus } from 'node:os';
 import process from 'node:process';
 import { pathToFileURL } from 'node:url';
-import { Error as DisplayError } from '@roots/bud-dashboard/components/error';
+import { Display 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';
+import { BudError, CompilerError } from '@roots/bud-support/errors';
+import isNull from '@roots/bud-support/isNull';
+import isNumber from '@roots/bud-support/isNumber';
+import isString from '@roots/bud-support/isString';
 import stripAnsi from '@roots/bud-support/strip-ansi';
 /**
  * {@link BudCompiler} implementation
@@ -32,17 +31,16 @@ class Compiler extends Service {
         if (!error)
             return;
         this.app.server?.appliedMiddleware?.hot?.publish({ error });
+        const normalized = CompilerError.normalize(error, {
+            thrownBy: import.meta.url,
+        });
+        normalized.details = undefined;
         this.app.notifier?.notify({
             group: this.app.label,
-            message: error.message,
-            subtitle: error.name,
+            message: normalized.message,
+            subtitle: normalized.name,
         });
-        if (`isBudError` in error) {
-            render(_jsx(DisplayError, { error: error }));
-        }
-        else {
-            render(_jsx(DisplayError, { error: BudError.normalize(error) }));
-        }
+        this.app.context.render(_jsx(DisplayError, { error: error }));
     }
     /**
      * {@link BudCompiler.onStats}
@@ -51,18 +49,17 @@ class Compiler extends Service {
         const makeNoticeTitle = (child) => this.app.label !== child.name
             ? `${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 => ({
+            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)
                 .forEach(child => {
                 try {
@@ -83,7 +80,7 @@ class Compiler extends Service {
                 }
             });
         }
-        this.compilationStats.children
+        this.stats.children
             ?.filter(child => child.errorsCount === 0)
             .forEach(child => {
             try {
@@ -97,6 +94,7 @@ class Compiler extends Service {
                     title: makeNoticeTitle(child),
                 });
                 this.app.server?.publicUrl.href &&
+                    this.app.context.browser &&
                     this.app.notifier.openBrowser(this.app.server?.publicUrl.href);
             }
             catch (error) {
@@ -110,27 +108,24 @@ class Compiler extends Service {
     async compile(bud) {
         const config = !bud.hasChildren
             ? [await bud.build.make()]
-            : await Promise.all(Object.values(bud.children).map(async (child) => child.build.make().catch(error => {
+            : await Promise.all(Object.values(bud.children).map(async (child) => await child.build.make().catch(error => {
                 throw error;
             })));
         this.config = config?.filter(Boolean);
-        this.config.parallelism = Math.max(cpus().length - 1, 1);
-        this.logger.info(`parallel compilations: ${this.config.parallelism}`);
+        if (this.config.length > 1) {
+            this.config.parallelism = Math.max(cpus().length - 1, 1);
+            this.logger.info(`parallel compilations: ${this.config.parallelism}`);
+        }
         await bud.hooks.fire(`compiler.before`, bud).catch(error => {
             throw error;
         });
         this.logger.timeEnd(`initialize`);
-        this.app.dashboard.updateStatus(`compiling`);
-        try {
-            this.instance = this.implementation(this.config);
-        }
-        catch (error) {
-            const normalError = error instanceof Error ? error : BudError.normalize(error);
-            this.onError(normalError);
-        }
+        this.instance = this.implementation(this.config);
         this.instance.hooks.done.tap(bud.label, (stats) => {
             this.onStats(stats);
-            bud.hooks.fire(`compiler.done`, bud, this.stats).catch(this.onError);
+            bud.hooks
+                .fire(`compiler.done`, bud, this.stats)
+                .catch(this.app.catch);
         });
         return this.instance;
     }
@@ -157,8 +152,8 @@ class Compiler extends Service {
                  * 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));
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-compiler",
-  "version": "6.17.0",
+  "version": "6.19.0",
   "description": "Compilation handler",
   "engines": {
     "node": ">=16"
@@ -65,15 +65,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "6.17.0",
+    "@roots/bud-api": "6.19.0",
     "@skypack/package-check": "0.2.2",
-    "@types/node": "18.17.19",
-    "@types/react": "18.2.22"
+    "@types/node": "20.10.4",
+    "@types/react": "18.2.43"
   },
   "dependencies": {
-    "@roots/bud-dashboard": "6.17.0",
-    "@roots/bud-framework": "6.17.0",
-    "@roots/bud-support": "6.17.0",
+    "@roots/bud-dashboard": "6.19.0",
+    "@roots/bud-framework": "6.19.0",
+    "@roots/bud-support": "6.19.0",
     "react": "18.2.0",
     "tslib": "2.6.2"
   },

package/src/service/index.tsx

@@ -17,25 +17,19 @@ import {cpus} from 'node:os'
 import process from 'node:process'
 import {pathToFileURL} from 'node:url'
 
-import {Error as DisplayError} from '@roots/bud-dashboard/components/error'
+import {Display 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'
+import {BudError, CompilerError} from '@roots/bud-support/errors'
+import isNull from '@roots/bud-support/isNull'
+import isNumber from '@roots/bud-support/isNumber'
+import isString from '@roots/bud-support/isString'
 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}
    */
@@ -60,24 +54,27 @@ class Compiler extends Service implements BudCompiler {
    * {@link BudCompiler.onError}
    */
   @bind
-  public onError(error: Error) {
+  public onError(error: Error | undefined) {
     process.exitCode = 1
     if (!error) return
 
     this.app.server?.appliedMiddleware?.hot?.publish({error})
 
+    const normalized = CompilerError.normalize(error, {
+      thrownBy: import.meta.url,
+    })
+
+    normalized.details = undefined
+
     this.app.notifier?.notify({
       group: this.app.label,
-      message: error.message,
-      subtitle: error.name,
+      message: normalized.message,
+      subtitle: normalized.name,
     })
 
-    if (`isBudError` in error) {
-      render(<DisplayError error={error} />)
-    } else {
-      render(<DisplayError error={BudError.normalize(error)} />)
-    }
+    this.app.context.render(<DisplayError error={error} />)
   }
+
   /**
    * {@link BudCompiler.onStats}
    */
@@ -88,26 +85,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 +123,7 @@ class Compiler extends Service implements BudCompiler {
         })
     }
 
-    this.compilationStats.children
+    this.stats.children
       ?.filter(child => child.errorsCount === 0)
       .forEach(child => {
         try {
@@ -146,6 +138,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)
@@ -160,36 +153,34 @@ class Compiler extends Service implements BudCompiler {
     const config = !bud.hasChildren
       ? [await bud.build.make()]
       : await Promise.all(
-          Object.values(bud.children).map(async (child: Bud) =>
-            child.build.make().catch(error => {
-              throw error
-            }),
+          Object.values(bud.children).map(
+            async (child: Bud) =>
+              await child.build.make().catch(error => {
+                throw error
+              }),
           ),
         )
 
     this.config = config?.filter(Boolean)
 
-    this.config.parallelism = Math.max(cpus().length - 1, 1)
-    this.logger.info(`parallel compilations: ${this.config.parallelism}`)
+    if (this.config.length > 1) {
+      this.config.parallelism = Math.max(cpus().length - 1, 1)
+      this.logger.info(`parallel compilations: ${this.config.parallelism}`)
+    }
 
     await bud.hooks.fire(`compiler.before`, bud).catch(error => {
       throw error
     })
 
     this.logger.timeEnd(`initialize`)
-    this.app.dashboard.updateStatus(`compiling`)
 
-    try {
-      this.instance = this.implementation(this.config)
-    } catch (error: unknown) {
-      const normalError =
-        error instanceof Error ? error : BudError.normalize(error)
-      this.onError(normalError)
-    }
+    this.instance = this.implementation(this.config)
 
     this.instance.hooks.done.tap(bud.label, (stats: any) => {
       this.onStats(stats)
-      bud.hooks.fire(`compiler.done`, bud, this.stats).catch(this.onError)
+      bud.hooks
+        .fire(`compiler.done`, bud, this.stats)
+        .catch(this.app.catch)
     })
 
     return this.instance
@@ -225,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))
           }