@roots/bud-compiler 2023.6.14-154 → 2023.6.15-2014

package/lib/compiler.service.d.ts

@@ -2,7 +2,7 @@ import type { MultiCompiler, MultiStats, StatsError } from '@roots/bud-framework
 import type { Compiler as Contract } from '@roots/bud-framework/services';
 import type { ErrorWithSourceFile } from '@roots/bud-support/open';
 import { Service } from '@roots/bud-framework/service';
-import webpack from 'webpack';
+import webpack from '@roots/bud-support/webpack';
 /**
  * Wepback compilation controller class
  */
@@ -30,7 +30,7 @@ export declare class Compiler extends Service implements Contract.Service {
     /**
      * Compiler error event
      */
-    onError(error: Error): Promise<void>;
+    onError(error: webpack.WebpackError): Promise<void>;
     /**
      * Stats handler
      */

package/lib/compiler.service.js

@@ -1,14 +1,14 @@
 import { __decorate, __metadata } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
-import * as App from '@roots/bud-dashboard/app';
+import { Error } from '@roots/bud-dashboard/app';
 import { Service } from '@roots/bud-framework/service';
 import { bind } from '@roots/bud-support/decorators/bind';
-import { BudError, CompilerError } from '@roots/bud-support/errors';
+import { BudError } from '@roots/bud-support/errors';
 import { duration } from '@roots/bud-support/human-readable';
-import * as Ink from '@roots/bud-support/ink';
+import { render } from '@roots/bud-support/ink';
 import stripAnsi from '@roots/bud-support/strip-ansi';
+import webpack from '@roots/bud-support/webpack';
 import { pathToFileURL } from 'node:url';
-import webpack from 'webpack';
 /**
  * Wepback compilation controller class
  */
@@ -33,62 +33,66 @@ export class Compiler extends Service {
      * Initiates compilation
      */
     async compile() {
-        const compilerPath = await this.app.module.resolve(`webpack`, import.meta.url);
-        this.implementation = await this.app.module.import(compilerPath, import.meta.url);
-        this.logger.log(`imported webpack`, this.implementation.version);
+        const compilerPath = await this.app.module
+            .resolve(`webpack`, import.meta.url)
+            .catch(error => {
+            throw BudError.normalize(error);
+        });
+        this.implementation = await this.app.module
+            .import(compilerPath, import.meta.url)
+            .catch(error => {
+            throw BudError.normalize(error);
+        })
+            .finally(() => {
+            this.logger.info(`imported webpack from ${compilerPath}`);
+        });
         this.config = !this.app.hasChildren
             ? [await this.app.build.make()]
-            : await Promise.all(Object.values(this.app.children).map(async (child) => {
-                try {
-                    return await child.build.make();
-                }
-                catch (error) {
-                    throw error;
-                }
-            }));
+            : await Promise.all(Object.values(this.app.children).map(async (child) => await child.build.make().catch(error => {
+                throw error;
+            })));
         await this.app.hooks.fire(`compiler.before`, this.app);
         this.logger.timeEnd(`initialize`);
-        this.logger.await(`compilation`);
-        this.instance = this.implementation(this.config);
+        try {
+            this.instance = this.implementation(this.config);
+        }
+        catch (error) {
+            throw BudError.normalize(error);
+        }
         this.instance.hooks.done.tap(this.app.label, async (stats) => {
             await this.onStats(stats);
-            await this.app.hooks.fire(`compiler.close`, this.app);
+            await this.app.hooks
+                .fire(`compiler.after`, this.app)
+                .catch(error => {
+                this.logger.error(error);
+            });
+            await this.app.hooks
+                .fire(`compiler.close`, this.app)
+                .catch(error => {
+                this.logger.error(error);
+            });
         });
-        await this.app.hooks.fire(`compiler.after`, this.app);
         return this.instance;
     }
     /**
      * Compiler error event
      */
     async onError(error) {
-        process.exitCode = 1;
-        await this.app.hooks.fire(`compiler.error`, error);
+        global.process.exitCode = 1;
         this.app.isDevelopment &&
             this.app.server.appliedMiddleware?.hot?.publish({ error });
-        try {
-            this.app.notifier.notify({
-                group: this.app.label,
-                message: error.message,
-                subtitle: error.name,
-            });
-        }
-        catch (error) {
-            this.logger.error(error);
-        }
-        try {
-            Ink.render(_jsx(App.Error, { error: new CompilerError(error.message, {
-                    props: {
-                        details: `This error was thrown by the webpack compiler itself. It is not the same as a syntax error. It is likely a missing or unresolvable build dependency.`,
-                        docs: new URL(`https://bud.js.org/`),
-                        issues: new URL(`https://github.com/roots/bud/search?q=is:issue+"compiler" in:title`),
-                        stack: error.stack,
-                        thrownBy: `webpack`,
-                    },
-                }) }));
-        }
-        catch (error) {
-            throw BudError.normalize(error);
-        }
+        // @eslint-disable-next-line no-console
+        render(_jsx(Error, { ...new BudError(error.message, {
+                props: {
+                    error: BudError.normalize(error),
+                },
+            }) }));
+        await this.app.hooks.fire(`compiler.error`, error);
+        this.app.notifier.notify({
+            group: this.app.label,
+            message: error.message,
+            subtitle: error.name,
+        });
     }
     /**
      * Stats handler
@@ -160,9 +164,8 @@ export class Compiler extends Service {
                 const modules = this.stats.children.flatMap(child => child.modules);
                 const moduleIdent = error.moduleId ?? error.moduleName;
                 const module = modules.find(module => module?.id === moduleIdent || module?.name === moduleIdent);
-                if (!module) {
+                if (!module)
                     return error;
-                }
                 if (module.nameForCondition) {
                     file = module.nameForCondition;
                 }
@@ -191,7 +194,7 @@ __decorate([
 __decorate([
     bind,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Error]),
+    __metadata("design:paramtypes", [webpack.WebpackError]),
     __metadata("design:returntype", Promise)
 ], Compiler.prototype, "onError", null);
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-compiler",
-  "version": "2023.6.14-154",
+  "version": "2023.6.15-2014",
   "description": "Compilation handler",
   "engines": {
     "node": ">=16"
@@ -71,15 +71,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "2023.6.14-154",
+    "@roots/bud-api": "2023.6.15-2014",
     "@skypack/package-check": "0.2.2",
     "@types/node": "18.16.16",
     "@types/react": "18.2.9"
   },
   "dependencies": {
-    "@roots/bud-dashboard": "2023.6.14-154",
-    "@roots/bud-framework": "2023.6.14-154",
-    "@roots/bud-support": "2023.6.14-154",
+    "@roots/bud-dashboard": "2023.6.15-2014",
+    "@roots/bud-framework": "2023.6.15-2014",
+    "@roots/bud-support": "2023.6.15-2014",
     "react": "18.2.0",
     "tslib": "2.5.3",
     "webpack": "5.86.0"

package/src/compiler.service.tsx

@@ -11,15 +11,15 @@ import type {
   SourceFile,
 } from '@roots/bud-support/open'
 
-import * as App from '@roots/bud-dashboard/app'
+import {Error} from '@roots/bud-dashboard/app'
 import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
-import {BudError, CompilerError} from '@roots/bud-support/errors'
+import {BudError} from '@roots/bud-support/errors'
 import {duration} from '@roots/bud-support/human-readable'
-import * as Ink from '@roots/bud-support/ink'
+import {render} from '@roots/bud-support/ink'
 import stripAnsi from '@roots/bud-support/strip-ansi'
+import webpack from '@roots/bud-support/webpack'
 import {pathToFileURL} from 'node:url'
-import webpack from 'webpack'
 
 /**
  * Wepback compilation controller class
@@ -50,41 +50,56 @@ export class Compiler extends Service implements Contract.Service {
    */
   @bind
   public async compile(): Promise<MultiCompiler> {
-    const compilerPath = await this.app.module.resolve(
-      `webpack`,
-      import.meta.url,
-    )
-    this.implementation = await this.app.module.import(
-      compilerPath,
-      import.meta.url,
-    )
-    this.logger.log(`imported webpack`, this.implementation.version)
+    const compilerPath = await this.app.module
+      .resolve(`webpack`, import.meta.url)
+      .catch(error => {
+        throw BudError.normalize(error)
+      })
+
+    this.implementation = await this.app.module
+      .import(compilerPath, import.meta.url)
+      .catch(error => {
+        throw BudError.normalize(error)
+      })
+      .finally(() => {
+        this.logger.info(`imported webpack from ${compilerPath}`)
+      })
 
     this.config = !this.app.hasChildren
       ? [await this.app.build.make()]
       : await Promise.all(
-          Object.values(this.app.children).map(async (child: Bud) => {
-            try {
-              return await child.build.make()
-            } catch (error) {
-              throw error
-            }
-          }),
+          Object.values(this.app.children).map(
+            async (child: Bud) =>
+              await child.build.make().catch(error => {
+                throw error
+              }),
+          ),
         )
 
     await this.app.hooks.fire(`compiler.before`, this.app)
 
     this.logger.timeEnd(`initialize`)
 
-    this.logger.await(`compilation`)
+    try {
+      this.instance = this.implementation(this.config)
+    } catch (error) {
+      throw BudError.normalize(error)
+    }
 
-    this.instance = this.implementation(this.config)
     this.instance.hooks.done.tap(this.app.label, async (stats: any) => {
       await this.onStats(stats)
-      await this.app.hooks.fire(`compiler.close`, this.app)
-    })
+      await this.app.hooks
+        .fire(`compiler.after`, this.app)
+        .catch(error => {
+          this.logger.error(error)
+        })
 
-    await this.app.hooks.fire(`compiler.after`, this.app)
+      await this.app.hooks
+        .fire(`compiler.close`, this.app)
+        .catch(error => {
+          this.logger.error(error)
+        })
+    })
 
     return this.instance
   }
@@ -93,45 +108,30 @@ export class Compiler extends Service implements Contract.Service {
    * Compiler error event
    */
   @bind
-  public async onError(error: Error) {
-    process.exitCode = 1
-
-    await this.app.hooks.fire(`compiler.error`, error)
+  public async onError(error: webpack.WebpackError) {
+    global.process.exitCode = 1
 
     this.app.isDevelopment &&
       this.app.server.appliedMiddleware?.hot?.publish({error})
 
-    try {
-      this.app.notifier.notify({
-        group: this.app.label,
-        message: error.message,
-        subtitle: error.name,
-      })
-    } catch (error) {
-      this.logger.error(error)
-    }
+    // @eslint-disable-next-line no-console
+    render(
+      <Error
+        {...new BudError(error.message, {
+          props: {
+            error: BudError.normalize(error),
+          },
+        })}
+      />,
+    )
 
-    try {
-      Ink.render(
-        <App.Error
-          error={
-            new CompilerError(error.message, {
-              props: {
-                details: `This error was thrown by the webpack compiler itself. It is not the same as a syntax error. It is likely a missing or unresolvable build dependency.`,
-                docs: new URL(`https://bud.js.org/`),
-                issues: new URL(
-                  `https://github.com/roots/bud/search?q=is:issue+"compiler" in:title`,
-                ),
-                stack: error.stack,
-                thrownBy: `webpack`,
-              },
-            })
-          }
-        />,
-      )
-    } catch (error) {
-      throw BudError.normalize(error)
-    }
+    await this.app.hooks.fire(`compiler.error`, error)
+
+    this.app.notifier.notify({
+      group: this.app.label,
+      message: error.message,
+      subtitle: error.name,
+    })
   }
 
   /**
@@ -226,9 +226,7 @@ export class Compiler extends Service implements Contract.Service {
             module?.id === moduleIdent || module?.name === moduleIdent,
         )
 
-        if (!module) {
-          return error
-        }
+        if (!module) return error
 
         if (module.nameForCondition) {
           file = module.nameForCondition