@roots/bud-compiler 2023.7.26-1516 → 2023.8.3-210

package/lib/service.d.ts

@@ -1,10 +1,8 @@
-import type { Compiler as BudCompiler } from '@roots/bud-framework';
 import type { Bud } from '@roots/bud-framework';
+import type { Compiler as BudCompiler } from '@roots/bud-framework';
 import type { MultiCompiler, MultiStats, Stats, StatsError, Webpack } from '@roots/bud-framework/config';
 import type { ErrorWithSourceFile } from '@roots/bud-support/open';
 import { Service } from '@roots/bud-framework/service';
-import { BudError } from '@roots/bud-support/errors';
-import webpack from '@roots/bud-support/webpack';
 /**
  * {@link BudCompiler} implementation
  */
@@ -36,7 +34,7 @@ export declare class Compiler extends Service implements BudCompiler {
     /**
      * {@link BudCompiler.onError}
      */
-    onError(error: BudError | webpack.WebpackError): void;
+    onError(error: Error): void;
     /**
      * {@link BudCompiler.onStats}
      */
@@ -45,5 +43,5 @@ export declare class Compiler extends Service implements BudCompiler {
      * {@link Service.register}
      */
     register?(bud: Bud): Promise<any>;
-    sourceErrors?(errors: Array<StatsError>): Array<ErrorWithSourceFile | StatsError>;
+    sourceErrors?(errors: Array<StatsError> | undefined): Array<ErrorWithSourceFile | StatsError>;
 }

package/lib/service.js

@@ -1,26 +1,21 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { cpus } from 'node:os';
 import process from 'node:process';
 import { pathToFileURL } from 'node:url';
-import { Error } from '@roots/bud-dashboard/components/error';
+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 { duration } from '@roots/bud-support/human-readable';
 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 stripAnsi from '@roots/bud-support/strip-ansi';
-import webpack from '@roots/bud-support/webpack';
 /**
  * {@link BudCompiler} implementation
  */
 export class Compiler extends Service {
-    /**
-     * {@link BudCompiler.compilationStats}
-     */
-    compilationStats;
     /**
      * {@link BudCompiler.config}
      */
@@ -29,23 +24,16 @@ export class Compiler extends Service {
      * {@link BudCompiler.implementation}
      */
     implementation;
-    /**
-     * {@link BudCompiler.instance}
-     */
-    instance;
-    /**
-     * {@link BudCompiler.stats}
-     */
-    stats;
     /**
      * {@link BudCompiler.compile}
      */
     async compile(bud) {
-        this.config = !bud.hasChildren
+        const config = !bud.hasChildren
             ? [await bud.build.make()]
             : await Promise.all(Object.values(bud.children).map(async (child) => 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}`);
         await bud.hooks.fire(`compiler.before`, bud).catch(error => {
@@ -57,7 +45,8 @@ export class Compiler extends Service {
             this.instance = this.implementation(this.config);
         }
         catch (error) {
-            this.onError(error);
+            const normalError = error instanceof Error ? error : BudError.normalize(error);
+            this.onError(normalError);
         }
         this.instance.hooks.done.tap(bud.label, (stats) => {
             this.onStats(stats);
@@ -81,10 +70,10 @@ export class Compiler extends Service {
             subtitle: error.name,
         });
         if (`isBudError` in error) {
-            render(_jsx(Error, { error: error }));
+            render(_jsx(DisplayError, { error: error }));
         }
         else {
-            render(_jsx(Error, { error: BudError.normalize(error) }));
+            render(_jsx(DisplayError, { error: BudError.normalize(error) }));
         }
     }
     /**
@@ -101,10 +90,12 @@ export class Compiler extends Service {
             process.exitCode = 1;
             this.compilationStats.children = this.compilationStats.children?.map(child => ({
                 ...child,
-                errors: this.sourceErrors(child.errors),
+                errors: child.errors && this.sourceErrors
+                    ? this.sourceErrors(child.errors)
+                    : child.errors ?? [],
             }));
             this.compilationStats.children
-                ?.filter(child => child.errorsCount > 0)
+                ?.filter(child => isNumber(child.errorsCount) && child.errorsCount > 0)
                 .forEach(child => {
                 try {
                     const error = child.errors?.shift();
@@ -117,7 +108,7 @@ export class Compiler extends Service {
                         subtitle: error.file ? `Error in ${error.name}` : error.name,
                         title: makeNoticeTitle(child),
                     });
-                    this.app.notifier.openEditor(error.file);
+                    error.file && this.app.notifier.openEditor(error.file);
                 }
                 catch (error) {
                     this.logger.error(error);
@@ -131,13 +122,14 @@ export class Compiler extends Service {
                 this.app.notifier.notify({
                     group: `${this.app.label}-${child.name}`,
                     message: child.modules
-                        ? `${child.modules.length} modules compiled in ${duration(child.time)}`
-                        : `Compiled in ${duration(child.time)}`,
+                        ? `${child.modules.length} modules compiled`
+                        : `Modules compiled successfully`,
                     open: this.app.server?.publicUrl.href,
                     subtitle: `Build successful`,
                     title: makeNoticeTitle(child),
                 });
-                this.app.notifier.openBrowser(this.app.server?.publicUrl.href);
+                this.app.server?.publicUrl.href &&
+                    this.app.notifier.openBrowser(this.app.server?.publicUrl.href);
             }
             catch (error) {
                 this.logger.error(error);
@@ -167,7 +159,7 @@ export class Compiler extends Service {
                  * In a perfect world webpack plugins would use the
                  * `nameForCondition` property to identify the module.
                  */
-                if (ident) {
+                if (ident && this.compilationStats?.children) {
                     module = this.compilationStats.children
                         .flatMap(child => child?.modules)
                         .find(module => [module?.id, module?.name].includes(ident));
@@ -218,34 +210,19 @@ export class Compiler extends Service {
     }
 }
 __decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Function]),
-    __metadata("design:returntype", Promise)
+    bind
 ], Compiler.prototype, "compile", null);
 __decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
+    bind
 ], Compiler.prototype, "onError", null);
 __decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Function]),
-    __metadata("design:returntype", void 0)
+    bind
 ], Compiler.prototype, "onStats", null);
 __decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Function]),
-    __metadata("design:returntype", Promise)
+    bind
 ], Compiler.prototype, "register", null);
 __decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array]),
-    __metadata("design:returntype", Array)
+    bind
 ], Compiler.prototype, "sourceErrors", null);
 const statsOptions = {
     all: false,
@@ -256,6 +233,7 @@ const statsOptions = {
         cachedAssets: true,
         cachedModules: true,
         entrypoints: true,
+        errorDetails: false,
         errors: true,
         errorsCount: true,
         hash: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-compiler",
-  "version": "2023.7.26-1516",
+  "version": "2023.8.3-210",
   "description": "Compilation handler",
   "engines": {
     "node": ">=16"
@@ -61,15 +61,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "2023.7.26-1516",
+    "@roots/bud-api": "2023.8.3-210",
     "@skypack/package-check": "0.2.2",
     "@types/node": "18.16.19",
     "@types/react": "18.2.15"
   },
   "dependencies": {
-    "@roots/bud-dashboard": "2023.7.26-1516",
-    "@roots/bud-framework": "2023.7.26-1516",
-    "@roots/bud-support": "2023.7.26-1516",
+    "@roots/bud-dashboard": "2023.8.3-210",
+    "@roots/bud-framework": "2023.8.3-210",
+    "@roots/bud-support": "2023.8.3-210",
     "react": "18.2.0",
     "tslib": "2.6.0"
   },

package/src/service.tsx

@@ -1,5 +1,5 @@
-import type {Compiler as BudCompiler} from '@roots/bud-framework'
 import type {Bud} from '@roots/bud-framework'
+import type {Compiler as BudCompiler} from '@roots/bud-framework'
 import type {
   MultiCompiler,
   MultiStats,
@@ -17,16 +17,15 @@ import {cpus} from 'node:os'
 import process from 'node:process'
 import {pathToFileURL} from 'node:url'
 
-import {Error} from '@roots/bud-dashboard/components/error'
+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 {duration} from '@roots/bud-support/human-readable'
 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 stripAnsi from '@roots/bud-support/strip-ansi'
-import webpack from '@roots/bud-support/webpack'
 
 /**
  * {@link BudCompiler} implementation
@@ -35,7 +34,7 @@ export class Compiler extends Service implements BudCompiler {
   /**
    * {@link BudCompiler.compilationStats}
    */
-  public compilationStats: BudCompiler[`compilationStats`]
+  public declare compilationStats: BudCompiler[`compilationStats`]
 
   /**
    * {@link BudCompiler.config}
@@ -50,19 +49,19 @@ export class Compiler extends Service implements BudCompiler {
   /**
    * {@link BudCompiler.instance}
    */
-  public instance: BudCompiler[`instance`]
+  public declare instance: BudCompiler[`instance`]
 
   /**
    * {@link BudCompiler.stats}
    */
-  public stats: BudCompiler[`stats`]
+  public declare stats: BudCompiler[`stats`]
 
   /**
    * {@link BudCompiler.compile}
    */
   @bind
   public async compile(bud: Bud): Promise<MultiCompiler> {
-    this.config = !bud.hasChildren
+    const config = !bud.hasChildren
       ? [await bud.build.make()]
       : await Promise.all(
           Object.values(bud.children).map(async (child: Bud) =>
@@ -72,6 +71,8 @@ export class Compiler extends Service implements BudCompiler {
           ),
         )
 
+    this.config = config?.filter(Boolean)
+
     this.config.parallelism = Math.max(cpus().length - 1, 1)
     this.logger.info(`parallel compilations: ${this.config.parallelism}`)
 
@@ -84,8 +85,9 @@ export class Compiler extends Service implements BudCompiler {
 
     try {
       this.instance = this.implementation(this.config)
-    } catch (error) {
-      this.onError(error)
+    } catch (error: unknown) {
+      const normalError = error instanceof Error ? error : BudError.normalize(error)
+      this.onError(normalError)
     }
 
     this.instance.hooks.done.tap(bud.label, (stats: any) => {
@@ -102,7 +104,7 @@ export class Compiler extends Service implements BudCompiler {
    * {@link BudCompiler.onError}
    */
   @bind
-  public onError(error: BudError | webpack.WebpackError) {
+  public onError(error: Error) {
     process.exitCode = 1
     if (!error) return
 
@@ -115,9 +117,9 @@ export class Compiler extends Service implements BudCompiler {
     })
 
     if (`isBudError` in error) {
-      render(<Error error={error} />)
+      render(<DisplayError error={error} />)
     } else {
-      render(<Error error={BudError.normalize(error)} />)
+      render(<DisplayError error={BudError.normalize(error)} />)
     }
   }
 
@@ -143,12 +145,17 @@ export class Compiler extends Service implements BudCompiler {
       this.compilationStats.children = this.compilationStats.children?.map(
         child => ({
           ...child,
-          errors: this.sourceErrors(child.errors),
+          errors:
+            child.errors && this.sourceErrors
+              ? this.sourceErrors(child.errors)
+              : child.errors ?? [],
         }),
       )
 
       this.compilationStats.children
-        ?.filter(child => child.errorsCount > 0)
+        ?.filter(
+          child => isNumber(child.errorsCount) && child.errorsCount > 0,
+        )
         .forEach(child => {
           try {
             const error = child.errors?.shift()
@@ -162,7 +169,7 @@ export class Compiler extends Service implements BudCompiler {
               title: makeNoticeTitle(child),
             })
 
-            this.app.notifier.openEditor(error.file)
+            error.file && this.app.notifier.openEditor(error.file)
           } catch (error) {
             this.logger.error(error)
           }
@@ -176,16 +183,15 @@ export class Compiler extends Service implements BudCompiler {
           this.app.notifier.notify({
             group: `${this.app.label}-${child.name}`,
             message: child.modules
-              ? `${child.modules.length} modules compiled in ${duration(
-                  child.time,
-                )}`
-              : `Compiled in ${duration(child.time)}`,
+              ? `${child.modules.length} modules compiled`
+              : `Modules compiled successfully`,
             open: this.app.server?.publicUrl.href,
             subtitle: `Build successful`,
             title: makeNoticeTitle(child),
           })
 
-          this.app.notifier.openBrowser(this.app.server?.publicUrl.href)
+          this.app.server?.publicUrl.href &&
+            this.app.notifier.openBrowser(this.app.server?.publicUrl.href)
         } catch (error) {
           this.logger.error(error)
         }
@@ -206,7 +212,7 @@ export class Compiler extends Service implements BudCompiler {
 
   @bind
   public sourceErrors?(
-    errors: Array<StatsError>,
+    errors: Array<StatsError> | undefined,
   ): Array<ErrorWithSourceFile | StatsError> {
     if (!errors || !errors.length) return []
 
@@ -222,7 +228,7 @@ export class Compiler extends Service implements BudCompiler {
            * In a perfect world webpack plugins would use the
            * `nameForCondition` property to identify the module.
            */
-          if (ident) {
+          if (ident && this.compilationStats?.children) {
             module = this.compilationStats.children
               .flatMap(child => child?.modules)
               .find(module => [module?.id, module?.name].includes(ident))
@@ -290,6 +296,7 @@ const statsOptions = {
     cachedAssets: true,
     cachedModules: true,
     entrypoints: true,
+    errorDetails: false,
     errors: true,
     errorsCount: true,
     hash: true,