@roots/bud-client 6.13.1 → 6.14.1

package/lib/hot/components/index.js

@@ -1,21 +1,14 @@
+import * as Indicator from './indicator/index.js';
+import * as Overlay from './overlay/index.js';
 export const make = async (options) => {
     if (options.indicator && !customElements.get(`bud-activity-indicator`)) {
-        await import(`./indicator/index.js`)
-            .then(makeController)
-            .then(maybePushController);
+        maybePushController(Indicator.make());
     }
     if (options.overlay && !customElements.get(`bud-error`)) {
-        await import(`./overlay/index.js`)
-            .then(makeController)
-            .then(maybePushController);
+        maybePushController(Overlay.make());
     }
     return window.bud.controllers;
 };
-const makeController = async (module) => {
-    if (!module)
-        return;
-    return await module.make();
-};
 const maybePushController = (controller) => {
     if (!controller)
         return;

package/lib/hot/components/indicator/index.d.ts

@@ -1,3 +1,2 @@
-export declare const make: () => Promise<{
-    update: (data: Payload) => void;
-}>;
+import { Controller } from './indicator.controller.js';
+export declare const make: () => Controller;

package/lib/hot/components/indicator/index.js

@@ -1,6 +1,6 @@
 import { Component } from './indicator.component.js';
 import { Controller } from './indicator.controller.js';
-export const make = async () => {
+export const make = () => {
     if (customElements.get(`bud-activity-indicator`))
         return;
     customElements.define(`bud-activity-indicator`, Component);

package/lib/hot/components/overlay/index.d.ts

@@ -1,3 +1,3 @@
-export declare const make: () => Promise<{
+export declare const make: () => {
     update: (data: Payload) => void;
-}>;
+};

package/lib/hot/components/overlay/index.js

@@ -1,6 +1,6 @@
 import { Component } from './overlay.component.js';
 import { Controller } from './overlay.controller.js';
-export const make = async () => {
+export const make = () => {
     if (customElements.get(`bud-error`))
         return;
     customElements.define(`bud-error`, Component);

package/lib/hot/events.d.ts

@@ -1,22 +1,21 @@
-export declare const injectEvents: (eventSource: new (path: string) => EventSource) => {
+interface EventSourceFactory {
+    new (path: string): EventSource;
+}
+export declare const injectEvents: (eventSource: EventSourceFactory) => {
     new (options: Partial<Options> & {
         name: string;
         path: string;
     }): {
         /**
          * Registered listeners
-         *
-         * @public
          */
         listeners: Set<Listener>;
         /**
          * EventSource `onmessage` handler
-         * @public
          */
         onmessage: (payload: MessageEvent) => Promise<void>;
         /**
          * EventSource `onopen` handler
-         * @public
          */
         onopen: () => void;
         options: Partial<Options> & {
@@ -25,7 +24,6 @@ export declare const injectEvents: (eventSource: new (path: string) => EventSour
         };
         /**
          * EventSource `addMessageListener` handler
-         * @public
          */
         addListener(listener: Listener): this;
         onerror: (this: EventSource, ev: Event) => any;
@@ -47,7 +45,6 @@ export declare const injectEvents: (eventSource: new (path: string) => EventSour
     /**
      * Singleton constructor
      *
-     * @public
      */
     make(options: Partial<Options> & {
         name: string;
@@ -55,18 +52,14 @@ export declare const injectEvents: (eventSource: new (path: string) => EventSour
     }): {
         /**
          * Registered listeners
-         *
-         * @public
          */
         listeners: Set<Listener>;
         /**
          * EventSource `onmessage` handler
-         * @public
          */
         onmessage: (payload: MessageEvent) => Promise<void>;
         /**
          * EventSource `onopen` handler
-         * @public
          */
         onopen: () => void;
         options: Partial<Options> & {
@@ -75,7 +68,6 @@ export declare const injectEvents: (eventSource: new (path: string) => EventSour
         };
         /**
          * EventSource `addMessageListener` handler
-         * @public
          */
         addListener(listener: Listener): this;
         onerror: (this: EventSource, ev: Event) => any;
@@ -95,3 +87,4 @@ export declare const injectEvents: (eventSource: new (path: string) => EventSour
         dispatchEvent(event: Event): boolean;
     };
 };
+export {};

package/lib/hot/events.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 export const injectEvents = (eventSource) => {
     /**
      * EventSource wrapper
@@ -14,20 +13,16 @@ export const injectEvents = (eventSource) => {
          * @remarks
          * Singleton interface, so this is private.
          *
-         * @public
          */
         constructor(options) {
             super(options.path);
             this.options = options;
             /**
              * Registered listeners
-             *
-             * @public
              */
             this.listeners = new Set();
             /**
              * EventSource `onmessage` handler
-             * @public
              */
             this.onmessage = async function (payload) {
                 if (!payload?.data || payload.data == `\uD83D\uDC93`) {
@@ -45,7 +40,6 @@ export const injectEvents = (eventSource) => {
             };
             /**
              * EventSource `onopen` handler
-             * @public
              */
             this.onopen = function () { };
             this.onopen = this.onopen.bind(this);
@@ -55,7 +49,6 @@ export const injectEvents = (eventSource) => {
         /**
          * Singleton constructor
          *
-         * @public
          */
         static make(options) {
             if (typeof window.bud.hmr[options.name] === `undefined`)
@@ -66,7 +59,6 @@ export const injectEvents = (eventSource) => {
         }
         /**
          * EventSource `addMessageListener` handler
-         * @public
          */
         addListener(listener) {
             this.listeners.add(listener);

package/lib/hot/index.js

@@ -2,15 +2,11 @@
 /* global __resourceQuery */
 /* global module */
 import { client } from './client.js';
-try {
-    client(__resourceQuery, import.meta.webpackHot);
-}
-catch (err) {
-    console.error(err);
+(async function () {
     try {
-        client(__resourceQuery, module.hot);
+        await client(__resourceQuery, import.meta.webpackHot);
     }
-    catch (error) {
-        console.error(error);
+    catch (err) {
+        console.error(err);
     }
-}
+})();

package/lib/hot/log.d.ts

@@ -1,10 +1,10 @@
 export declare const makeLogger: (options: Options) => {
-    error: (...args: any[]) => void;
-    info: (...args: any[]) => void;
-    log: (...args: any[]) => void;
-    warn: (...args: any[]) => void;
+    error: (...args: Array<unknown>) => void;
+    info: (...args: Array<unknown>) => void;
+    log: (...args: Array<unknown>) => void;
+    warn: (...args: Array<unknown>) => void;
 };
-export declare const makeLog: (options: any) => (...args: any[]) => void;
-export declare const makeInfo: (options: any) => (...args: any[]) => void;
-export declare const makeError: (options: any) => (...args: any[]) => void;
-export declare const makeWarn: (options: any) => (...args: any[]) => void;
+export declare const makeLog: (options: Options) => (...args: Array<unknown>) => void;
+export declare const makeInfo: (options: Options) => (...args: Array<unknown>) => void;
+export declare const makeError: (options: Options) => (...args: Array<unknown>) => void;
+export declare const makeWarn: (options: Options) => (...args: Array<unknown>) => void;

package/lib/hot/log.js

@@ -7,30 +7,26 @@ export const makeLogger = (options) => {
         warn: makeWarn(options),
     };
 };
-let lastLog = null;
-export const makeLog = options => {
+export const makeLog = (options) => {
     return (...args) => {
         if (options.log) {
-            if (lastLog === args.join(``))
-                return;
-            lastLog = args.join(``);
             console.log(`[${options.name}]`, ...args);
         }
     };
 };
-export const makeInfo = options => {
+export const makeInfo = (options) => {
     return (...args) => {
         if (options.log) {
             console.info(`[${options.name}]`, ...args);
         }
     };
 };
-export const makeError = options => {
+export const makeError = (options) => {
     return (...args) => {
         console.error(`[${options.name}]`, ...args);
     };
 };
-export const makeWarn = options => {
+export const makeWarn = (options) => {
     return (...args) => {
         console.warn(`[${options.name}]`, ...args);
     };

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@roots/bud-client",
-  "version": "6.13.1",
+  "version": "6.14.1",
   "description": "Client scripts for @roots/bud",
   "engines": {
     "node": ">=16"
   },
   "contributors": [
     {
-      "name": "Kelly Mears",
       "email": "developers@tinypixel.dev",
+      "name": "Kelly Mears",
       "url": "https://github.com/kellymears"
     },
     {
-      "name": "Ben Word",
       "email": "ben@benword.com",
+      "name": "Ben Word",
       "url": "https://github.com/retlehs"
     },
     {
-      "name": "Brandon",
       "email": "brandon@tendency.me",
+      "name": "Brandon",
       "url": "https://github.com/Log1x"
     }
   ],
@@ -45,14 +45,8 @@
   ],
   "type": "module",
   "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "default": "./lib/index.js"
-    },
-    "./lib/*": {
-      "import": "./lib/*",
-      "default": "./lib/*"
-    }
+    ".": "./lib/index.js",
+    "./lib/*": "./lib/*"
   },
   "typesVersions": {
     "*": {
@@ -67,13 +61,13 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.mjs",
   "devDependencies": {
-    "@roots/bud": "6.13.1",
+    "@roots/bud": "6.14.1",
     "@skypack/package-check": "0.2.2",
-    "@types/node": "18.16.16",
+    "@types/node": "18.16.18",
     "@types/webpack-env": "1.18.1"
   },
   "dependencies": {
-    "tslib": "2.5.3"
+    "tslib": "2.6.0"
   },
   "volta": {
     "extends": "../../../package.json"

package/src/hot/components/index.ts

@@ -1,32 +1,20 @@
-interface ControllerModule {
-  make: () => Promise<Controller>
-}
+import * as Indicator from './indicator/index.js'
+import * as Overlay from './overlay/index.js'
 
 export const make: (
   options: Options,
 ) => Promise<Array<Controller>> = async options => {
   if (options.indicator && !customElements.get(`bud-activity-indicator`)) {
-    await import(`./indicator/index.js`)
-      .then(makeController)
-      .then(maybePushController)
+    maybePushController(Indicator.make())
   }
 
   if (options.overlay && !customElements.get(`bud-error`)) {
-    await import(`./overlay/index.js`)
-      .then(makeController)
-      .then(maybePushController)
+    maybePushController(Overlay.make())
   }
 
   return window.bud.controllers
 }
 
-const makeController = async (
-  module: ControllerModule,
-): Promise<Controller | undefined> => {
-  if (!module) return
-  return await module.make()
-}
-
 const maybePushController = (controller: Controller | undefined) => {
   if (!controller) return
   window.bud.controllers.push(controller)

package/src/hot/components/indicator/index.ts

@@ -1,9 +1,7 @@
 import {Component} from './indicator.component.js'
 import {Controller} from './indicator.controller.js'
 
-export const make = async (): Promise<{
-  update: (data: Payload) => void
-}> => {
+export const make = () => {
   if (customElements.get(`bud-activity-indicator`)) return
   customElements.define(`bud-activity-indicator`, Component)
 

package/src/hot/components/overlay/index.ts

@@ -1,9 +1,9 @@
 import {Component} from './overlay.component.js'
 import {Controller} from './overlay.controller.js'
 
-export const make = async (): Promise<{
+export const make = (): {
   update: (data: Payload) => void
-}> => {
+} => {
   if (customElements.get(`bud-error`)) return
 
   customElements.define(`bud-error`, Component)

package/src/hot/events.ts

@@ -1,8 +1,8 @@
-/* eslint-disable no-console */
+interface EventSourceFactory {
+  new (path: string): EventSource
+}
 
-export const injectEvents = (
-  eventSource: new (path: string) => EventSource,
-) => {
+export const injectEvents = (eventSource: EventSourceFactory) => {
   /**
    * EventSource wrapper
    *
@@ -13,14 +13,11 @@ export const injectEvents = (
   return class Events extends eventSource {
     /**
      * Registered listeners
-     *
-     * @public
      */
     public listeners: Set<Listener> = new Set<Listener>()
 
     /**
      * EventSource `onmessage` handler
-     * @public
      */
     public override onmessage = async function (payload: MessageEvent) {
       if (!payload?.data || payload.data == `\uD83D\uDC93`) {
@@ -41,7 +38,6 @@ export const injectEvents = (
 
     /**
      * EventSource `onopen` handler
-     * @public
      */
     public override onopen = function () {}
 
@@ -51,7 +47,6 @@ export const injectEvents = (
      * @remarks
      * Singleton interface, so this is private.
      *
-     * @public
      */
     private constructor(
       public options: Partial<Options> & {name: string; path: string},
@@ -66,7 +61,6 @@ export const injectEvents = (
     /**
      * Singleton constructor
      *
-     * @public
      */
     public static make(
       options: Partial<Options> & {name: string; path: string},
@@ -81,7 +75,6 @@ export const injectEvents = (
 
     /**
      * EventSource `addMessageListener` handler
-     * @public
      */
     public addListener(listener: Listener): this {
       this.listeners.add(listener)

package/src/hot/index.ts

@@ -4,14 +4,13 @@
 
 import {client} from './client.js'
 
-try {
-  client(__resourceQuery, import.meta.webpackHot)
-} catch (err) {
-  console.error(err)
-
+/**
+ * Client entrypoint
+ */
+;(async function () {
   try {
-    client(__resourceQuery, module.hot)
-  } catch (error) {
-    console.error(error)
+    await client(__resourceQuery, import.meta.webpackHot)
+  } catch (err) {
+    console.error(err)
   }
-}
+})()

package/src/hot/log.ts

@@ -9,34 +9,30 @@ export const makeLogger = (options: Options) => {
   }
 }
 
-let lastLog: string = null
-export const makeLog = options => {
-  return (...args) => {
+export const makeLog = (options: Options) => {
+  return (...args: Array<unknown>) => {
     if (options.log) {
-      if (lastLog === args.join(``)) return
-      lastLog = args.join(``)
-
       console.log(`[${options.name}]`, ...args)
     }
   }
 }
 
-export const makeInfo = options => {
-  return (...args) => {
+export const makeInfo = (options: Options) => {
+  return (...args: Array<unknown>) => {
     if (options.log) {
       console.info(`[${options.name}]`, ...args)
     }
   }
 }
 
-export const makeError = options => {
-  return (...args) => {
+export const makeError = (options: Options) => {
+  return (...args: Array<unknown>) => {
     console.error(`[${options.name}]`, ...args)
   }
 }
 
-export const makeWarn = options => {
-  return (...args) => {
+export const makeWarn = (options: Options) => {
+  return (...args: Array<unknown>) => {
     console.warn(`[${options.name}]`, ...args)
   }
 }