fix: indicator/hmr errors (#1248)

* fix: whm error handling (browser) * overlay: styles * fix: multicompiler * update publicPath test
roots · Mar 22, 2022 · c6a50b6 · c6a50b6
1 parent 5aa04cc
commit c6a50b6
Show file tree

Hide file tree

Showing 32 changed files with 874 additions and 489 deletions.
diff --git a/sources/@roots/bud-api/src/api/facade/facade.interface.ts b/sources/@roots/bud-api/src/api/facade/facade.interface.ts
@@ -336,6 +336,7 @@ export class Facade {
    * @public
    */
   public entry: entryFacade
+
   /**
    * Generate application entrypoints from source asset paths.
    *

diff --git a/sources/@roots/bud-api/src/api/methods/watch/index.ts b/sources/@roots/bud-api/src/api/methods/watch/index.ts
@@ -15,7 +15,7 @@ export interface watch {
 }
 
 export const watch: watch = function (files, options = {}) {
-  const ctx = (this.root as Framework) ?? (this as Framework)
+  const ctx = this as Framework
 
   files = Array.isArray(files) ? files : [files]
 

diff --git a/sources/@roots/bud-build/src/Build/index.ts b/sources/@roots/bud-build/src/Build/index.ts
@@ -136,9 +136,7 @@ export class Build extends Framework.Service implements Framework.Build {
 
     if (isUndefined(propValue)) return
 
-    Object.assign(this.config, {
-      [propKey]: propValue,
-    })
+    Object.assign(this.config, {[propKey]: propValue})
   }
 
   /**

diff --git a/sources/@roots/bud-compiler/src/Compiler/compiler.service.ts b/sources/@roots/bud-compiler/src/Compiler/compiler.service.ts
@@ -85,8 +85,8 @@ export class Compiler extends Service implements Contract {
   @bind
   @once
   public async compile() {
-    const config = await this.before()
-    const compiler = await this.invoke(config)
+    this.config = await this.before()
+    const compiler = await this.invoke(this.config)
 
     this.app.timeEnd('bud')
     this.app._hrdone = this.app._hrdiff()
@@ -131,7 +131,9 @@ export class Compiler extends Service implements Contract {
      */
     await this.app.build.make()
 
+    // if (this.app.hasChildren == false)
     this.config.push(this.app.build.config)
+
     /**
      * If there are {@link Framework.children} instances, iterate through
      * them and add to `config`

diff --git a/sources/@roots/bud-framework/src/Framework/index.ts b/sources/@roots/bud-framework/src/Framework/index.ts
@@ -239,13 +239,7 @@ export abstract class Framework {
    *
    * @public
    */
-  public _server: Server.Service
-  public get server(): Server.Service {
-    return this.root._server
-  }
-  public set server(server: Server.Service) {
-    this.root._server = server
-  }
+  public server: Server.Service
 
   /**
    * Container service for holding configuration values

diff --git a/sources/@roots/bud-framework/src/Store.ts b/sources/@roots/bud-framework/src/Store.ts
@@ -212,12 +212,6 @@ export namespace Store {
      * @public
      */
     hashFormat: string
-
-    /**
-     * Initial webpack configuration values
-     *
-     * @public
-     */
   }
 
   export interface Map

diff --git a/sources/@roots/bud-server/package.json b/sources/@roots/bud-server/package.json
@@ -57,10 +57,13 @@
     "@roots/bud-framework": "workspace:sources/@roots/bud-framework",
     "@roots/bud-support": "workspace:sources/@roots/bud-support",
     "@roots/container": "workspace:sources/@roots/container",
+    "ansi-html-community": "0.0.8",
     "express": "^4.17.1",
+    "html-entities": "^2.1.0",
     "http-proxy-middleware": "2.0.4",
+    "querystring": "^0.2.0",
+    "strip-ansi": "^6.0.0",
     "tslib": "^2.3.1",
-    "webpack-dev-middleware": "5.3.1",
-    "webpack-hot-middleware": "^2.25.1"
+    "webpack-dev-middleware": "5.3.1"
   }
 }