@squide/firefly 13.3.1 → 14.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@squide/firefly",
   "author": "Workleap",
-  "version": "13.3.1",
+  "version": "14.1.0",
   "description": "Helpers to facilitate the creation of an application with the Squide firefly technology stack.",
   "license": "Apache-2.0",
   "repository": {
@@ -29,34 +29,34 @@
   ],
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@tanstack/react-query": "^5.83.0",
-    "msw": "^2.10.4",
+    "@tanstack/react-query": "^5.87.1",
+    "msw": "^2.11.1",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
-    "react-router": "^7.7.0"
+    "react-router": "^7.8.2"
   },
   "dependencies": {
-    "@workleap/logging": "^1.2.5",
-    "uuid": "^11.1.0",
-    "@squide/core": "5.7.0",
-    "@squide/module-federation": "6.5.0",
-    "@squide/react-router": "7.3.0",
-    "@squide/msw": "3.5.0"
+    "@workleap/logging": "^1.3.0",
+    "uuid": "^12.0.0",
+    "@squide/core": "6.1.0",
+    "@squide/module-federation": "7.0.1",
+    "@squide/msw": "4.0.1",
+    "@squide/react-router": "8.1.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.4.7",
-    "@rslib/core": "0.10.6",
+    "@rsbuild/core": "1.5.4",
+    "@rslib/core": "0.12.4",
     "@testing-library/react": "16.3.0",
-    "@types/react": "19.1.8",
-    "@types/react-dom": "19.1.6",
-    "@typescript-eslint/parser": "8.37.0",
-    "@vitejs/plugin-react": "4.6.0",
+    "@types/react": "19.1.12",
+    "@types/react-dom": "19.1.9",
+    "@typescript-eslint/parser": "8.42.0",
+    "@vitejs/plugin-react": "5.0.2",
     "@workleap/eslint-plugin": "3.5.0",
     "@workleap/rslib-configs": "1.1.0",
     "@workleap/typescript-configs": "3.0.4",
     "eslint": "8.57.0",
     "happy-dom": "18.0.1",
-    "typescript": "5.8.3",
+    "typescript": "5.9.2",
     "vitest": "3.2.4"
   },
   "sideEffects": false,

package/src/AppRouterReducer.ts

@@ -188,16 +188,11 @@ export function useModuleRegistrationStatusDispatcher(areModulesRegisteredValue:
             dispatch({ type: "modules-registered" });
 
             logger
-                .withText("[squide]")
-                .withText("Modules are registered", {
+                .withText("[squide] Modules are registered.", {
                     style: {
-                        color: "white",
-                        backgroundColor: "green"
+                        color: "green"
                     }
                 })
-                .withText(".", {
-                    leadingSpace: false
-                })
                 .information();
 
             return true;
@@ -211,16 +206,11 @@ export function useModuleRegistrationStatusDispatcher(areModulesRegisteredValue:
             dispatch({ type: "modules-ready" });
 
             logger
-                .withText("[squide]")
-                .withText("Modules are ready", {
+                .withText("[squide] Modules are ready.", {
                     style: {
-                        color: "white",
-                        backgroundColor: "green"
+                        color: "green"
                     }
                 })
-                .withText(".", {
-                    leadingSpace: false
-                })
                 .information();
 
             return true;
@@ -258,16 +248,11 @@ export function useMswStatusDispatcher(isMswReadyValue: boolean, dispatch: AppRo
             dispatch({ type: "msw-ready" });
 
             logger
-                .withText("[squide]")
-                .withText("MSW is ready", {
+                .withText("[squide] MSW is ready.", {
                     style: {
-                        color: "white",
-                        backgroundColor: "green"
+                        color: "green"
                     }
                 })
-                .withText(".", {
-                    leadingSpace: false
-                })
                 .information();
 
             return true;

package/src/AppRouterStore.ts

@@ -2,7 +2,7 @@
 // access to the state and ease the integration with third-party libraries such as the Platform Widgets.
 // Eventually, AppRouterReducer should be deprecated in favor of this new AppRouterStore.
 
-import type { RootLogger } from "@workleap/logging";
+import type { Logger } from "@workleap/logging";
 import type { AppRouterAction, AppRouterState } from "./AppRouterReducer.ts";
 
 export type AppRouterStoreState = Omit<AppRouterState, "waitForMsw" | "waitForPublicData" | "waitForProtectedData">;
@@ -13,9 +13,9 @@ export class AppRouterStore {
     #state: AppRouterStoreState;
 
     readonly #listeners = new Set<AppRouterStoreListenerFunction>();
-    readonly #logger: RootLogger;
+    readonly #logger: Logger;
 
-    constructor(initialialState: AppRouterStoreState, logger: RootLogger) {
+    constructor(initialialState: AppRouterStoreState, logger: Logger) {
         this.#state = initialialState;
         this.#logger = logger;
     }
@@ -160,7 +160,7 @@ export class AppRouterStore {
     }
 }
 
-export function createAppRouterStore(logger: RootLogger) {
+export function createAppRouterStore(logger: Logger) {
     const initialState: AppRouterStoreState = {
         areModulesRegistered: false,
         areModulesReady: false,

package/src/FireflyRuntime.tsx

@@ -1,6 +1,7 @@
-import type { RegisterRouteOptions, RuntimeOptions } from "@squide/core";
+import type { RegisterRouteOptions, RuntimeMethodOptions, RuntimeOptions } from "@squide/core";
 import { MswPlugin, MswPluginName } from "@squide/msw";
-import { ReactRouterRuntime, type Route } from "@squide/react-router";
+import { type IReactRouterRuntime, ReactRouterRuntime, ReactRouterRuntimeScope, type Route } from "@squide/react-router";
+import type { Logger } from "@workleap/logging";
 import type { RequestHandler } from "msw";
 import { getAreModulesRegistered } from "./AppRouterReducer.ts";
 import { type AppRouterStore, createAppRouterStore } from "./AppRouterStore.ts";
@@ -9,9 +10,18 @@ export interface FireflyRuntimeOptions extends RuntimeOptions {
     useMsw?: boolean;
 }
 
-export class FireflyRuntime extends ReactRouterRuntime {
-    readonly #appRouterStore: AppRouterStore;
-    readonly #useMsw: boolean;
+export interface RegisterRequestHandlersOptions extends RuntimeMethodOptions {}
+
+export interface IFireflyRuntime extends IReactRouterRuntime {
+    registerRequestHandlers: (handlers: RequestHandler[]) => void;
+    get requestHandlers(): RequestHandler[];
+    get appRouterStore(): AppRouterStore;
+    get isMswEnabled(): boolean;
+}
+
+export class FireflyRuntime extends ReactRouterRuntime implements IFireflyRuntime {
+    protected _appRouterStore: AppRouterStore;
+    protected _useMsw: boolean;
 
     constructor({ plugins, useMsw, ...options }: FireflyRuntimeOptions = {}) {
         if (useMsw) {
@@ -23,20 +33,21 @@ export class FireflyRuntime extends ReactRouterRuntime {
                 ...options
             });
 
-            this.#useMsw = true;
+            this._useMsw = true;
         } else {
             super({
                 plugins,
                 ...options
             });
 
-            this.#useMsw = false;
+            this._useMsw = false;
         }
 
-        this.#appRouterStore = createAppRouterStore(this._logger);
+        this._appRouterStore = createAppRouterStore(this._logger);
     }
 
-    registerRequestHandlers(handlers: RequestHandler[]) {
+    registerRequestHandlers(handlers: RequestHandler[], options: RegisterRequestHandlersOptions = {}) {
+        const logger = this._getLogger(options);
         const mswPlugin = this.getPlugin(MswPluginName) as MswPlugin;
 
         if (!mswPlugin) {
@@ -47,7 +58,9 @@ export class FireflyRuntime extends ReactRouterRuntime {
             throw new Error("[squide] Cannot register an MSW request handlers once the modules are registered. Are you trying to register an MSW request handler in a deferred registration function? Only navigation items can be registered in a deferred registration function.");
         }
 
-        mswPlugin.registerRequestHandlers(handlers);
+        mswPlugin.registerRequestHandlers(handlers, {
+            logger
+        });
     }
 
     // Must define a return type otherwise we get an "error TS2742: The inferred type of 'requestHandlers' cannot be named" error.
@@ -70,10 +83,35 @@ export class FireflyRuntime extends ReactRouterRuntime {
     }
 
     get appRouterStore() {
-        return this.#appRouterStore;
+        return this._appRouterStore;
+    }
+
+    get isMswEnabled() {
+        return this._useMsw;
+    }
+
+    startScope(logger: Logger): FireflyRuntime {
+        return (new FireflyRuntimeScope(this, logger) as unknown) as FireflyRuntime;
+    }
+}
+
+export class FireflyRuntimeScope<TRuntime extends FireflyRuntime = FireflyRuntime> extends ReactRouterRuntimeScope<TRuntime> implements IFireflyRuntime {
+    registerRequestHandlers(handlers: RequestHandler[], options: RegisterRequestHandlersOptions = {}) {
+        this._runtime.registerRequestHandlers(handlers, {
+            ...options,
+            logger: this._getLogger(options)
+        });
+    }
+
+    get requestHandlers(): RequestHandler[] {
+        return this._runtime.requestHandlers;
+    }
+
+    get appRouterStore() {
+        return this._runtime.appRouterStore;
     }
 
     get isMswEnabled() {
-        return this.#useMsw;
+        return this._runtime.isMswEnabled;
     }
 }

package/src/honeycomb/activeSpan.ts

@@ -1,6 +1,6 @@
 import type { Span } from "@opentelemetry/api";
 import { isPlainObject } from "@squide/core";
-import type { RootLogger } from "@workleap/logging";
+import type { Logger } from "@workleap/logging";
 import { v4 as uuidv4 } from "uuid";
 import { createTraceContextId } from "./createTraceContextId.ts";
 
@@ -97,7 +97,7 @@ export function popActiveSpan(span: ActiveSpan) {
     }
 }
 
-export function createOverrideFetchRequestSpanWithActiveSpanContext(logger: RootLogger) {
+export function createOverrideFetchRequestSpanWithActiveSpanContext(logger: Logger) {
     return (span: Span, request: Request | RequestInit) => {
         const activeSpan = getActiveSpan();