@squide/firefly 4.0.0 → 4.0.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @squide/firefly
 
+## 4.0.2
+
+### Patch Changes
+
+- [#135](https://github.com/gsoft-inc/wl-squide/pull/135) [`8e73083`](https://github.com/gsoft-inc/wl-squide/commit/8e73083bb90a6f23495ac6a8dca0245862ee2c9a) Thanks [@patricklafrance](https://github.com/patricklafrance)! - Fixing a remaining issue with deferred registrations that depends on protected data.
+
+- Updated dependencies [[`8e73083`](https://github.com/gsoft-inc/wl-squide/commit/8e73083bb90a6f23495ac6a8dca0245862ee2c9a)]:
+  - @squide/react-router@4.0.2
+
+## 4.0.1
+
+### Patch Changes
+
+- [#133](https://github.com/gsoft-inc/wl-squide/pull/133) [`1cda1be`](https://github.com/gsoft-inc/wl-squide/commit/1cda1be30779d1a1d5d2e21eac043baff20c0f7e) Thanks [@patricklafrance](https://github.com/patricklafrance)! - - To prevent the consumer from always handling the AbortSignal error, a default catch has been added to the `AppRouter` component. The consumer can still handler the AbortSignal error if he needs to.
+
+  - When a user makes a direct hit to a deferred route that depends on protected data, the protected data was undefined. The reason was that by default, an unregistered route was considered as a public route. The code has been updated to consider an uregistered route as a protected route. The upside is that deferred routes can now depends on protected data. The downside is that a public deferred route will trigger the loading of the protected data. As we don't expect to have public deferred route at the moment it doesn't seems like an issue.
+
+- Updated dependencies [[`1cda1be`](https://github.com/gsoft-inc/wl-squide/commit/1cda1be30779d1a1d5d2e21eac043baff20c0f7e), [`1cda1be`](https://github.com/gsoft-inc/wl-squide/commit/1cda1be30779d1a1d5d2e21eac043baff20c0f7e), [`1cda1be`](https://github.com/gsoft-inc/wl-squide/commit/1cda1be30779d1a1d5d2e21eac043baff20c0f7e)]:
+  - @squide/webpack-module-federation@3.0.4
+  - @squide/react-router@4.0.1
+  - @squide/core@3.2.1
+  - @squide/webpack-configs@1.1.3
+  - @squide/msw@2.0.9
+
 ## 4.0.0
 
 ### Major Changes

package/dist/AppRouter.js

@@ -1 +1 @@
-export { AppRouter, BootstrappingRoute } from './chunk-QZACR5NK.js';
+export { AppRouter, BootstrappingRoute } from './chunk-M533VVCI.js';

package/dist/NoMatchRouteFallback.d.ts

@@ -0,0 +1,6 @@
+import * as react_jsx_runtime from 'react/jsx-runtime';
+
+declare function NoMatchRouteFallback(): react_jsx_runtime.JSX.Element;
+declare const Component: typeof NoMatchRouteFallback;
+
+export { Component, NoMatchRouteFallback };

package/dist/NoMatchRouteFallback.js

@@ -0,0 +1 @@
+export { Component, NoMatchRouteFallback } from './chunk-MCU5TIOP.js';

package/dist/{chunk-QZACR5NK.js → chunk-M533VVCI.js}

@@ -1,6 +1,6 @@
 import { useLogOnceLogger, isNil } from '@squide/core';
 import { useIsMswStarted } from '@squide/msw';
-import { useIsRouteMatchProtected, useRoutes } from '@squide/react-router';
+import { useRouteMatch, useIsRouteProtected, useRoutes } from '@squide/react-router';
 import { useAreModulesRegistered, useAreModulesReady } from '@squide/webpack-module-federation';
 import { useEffect, useCallback, cloneElement, useMemo } from 'react';
 import { ErrorBoundary, useErrorBoundary } from 'react-error-boundary';
@@ -16,14 +16,17 @@ function useLoadPublicData(areModulesRegistered, areModulesReady, isMswStarted,
       if ((areModulesRegistered || areModulesReady) && isMswStarted) {
         logger.debugOnce("loading-public-data", "[shell] Loading public data.");
         const abortController = new AbortController();
-        const result = onLoadData(abortController.signal);
+        const signal = abortController.signal;
+        const result = onLoadData(signal);
         if (!isPromise(result)) {
           throw Error("[squide] An AppRouter onLoadPublicData handler must return a promise object.");
         }
         result.then(() => {
           logger.debugOnce("public-data-loaded", "[shell] Public data has been loaded.");
         }).catch((error) => {
-          showBoundary(error);
+          if (!signal.aborted) {
+            showBoundary(error);
+          }
         });
         return () => {
           abortController.abort();
@@ -41,14 +44,17 @@ function useLoadProtectedData(areModulesRegistered, areModulesReady, isMswStarte
         if (isActiveRouteProtected) {
           logger.debugOnce("loading-protected-data", `[shell] Loading protected data as "${location.pathname}" is a protected route.`);
           const abortController = new AbortController();
-          const result = onLoadData(abortController.signal);
+          const signal = abortController.signal;
+          const result = onLoadData(signal);
           if (!isPromise(result)) {
             throw Error("[squide] An AppRouter onLoadProtectedData handler must return a promise object.");
           }
           result.then(() => {
             logger.debugOnce("protected-data-loaded", "[shell] Protected data has been loaded.");
           }).catch((error) => {
-            showBoundary(error);
+            if (!signal.aborted) {
+              showBoundary(error);
+            }
           });
           return () => {
             abortController.abort();
@@ -88,7 +94,8 @@ function BootstrappingRoute(props) {
     }
   }, [logger, areModulesRegistered, areModulesReady, isMswStarted, waitForMsw]);
   useLoadPublicData(areModulesRegistered, areModulesReady, isMswStarted, isPublicDataLoaded, onLoadPublicData);
-  const isActiveRouteProtected = useIsRouteMatchProtected(location2, { throwWhenThereIsNoMatch: areModulesReady });
+  const activeRoute = useRouteMatch(location2, { throwWhenThereIsNoMatch: areModulesReady });
+  const isActiveRouteProtected = useIsRouteProtected(activeRoute);
   useLoadProtectedData(areModulesRegistered, areModulesReady, isMswStarted, isActiveRouteProtected, isProtectedDataLoaded, onLoadProtectedData);
   useEffect(() => {
     if (onCompleteRegistrations) {
@@ -99,7 +106,7 @@ function BootstrappingRoute(props) {
       }
     }
   }, [areModulesRegistered, areModulesReady, isMswStarted, isPublicDataLoaded, isProtectedDataLoaded, isActiveRouteProtected, onCompleteRegistrations]);
-  if (!areModulesReady || !isMswStarted || !isPublicDataLoaded || isActiveRouteProtected && !isProtectedDataLoaded) {
+  if (!areModulesReady || !isMswStarted || !activeRoute || !isPublicDataLoaded || isActiveRouteProtected && !isProtectedDataLoaded) {
     return fallbackElement;
   }
   return /* @__PURE__ */ jsx(Outlet, {});
@@ -125,6 +132,12 @@ function AppRouter(props) {
     });
   }, [errorElement]);
   return useMemo(() => {
+    if (!routes.some((x) => x.path === "*")) {
+      routes.push({
+        path: "*",
+        lazy: () => import('./NoMatchRouteFallback.js')
+      });
+    }
     return renderRouterProvider([
       {
         element: /* @__PURE__ */ jsx(ErrorBoundary, { fallbackRender: errorRenderer, children: /* @__PURE__ */ jsx(

package/dist/chunk-MCU5TIOP.js

@@ -0,0 +1,27 @@
+import { jsxs, jsx } from 'react/jsx-runtime';
+
+// src/NoMatchRouteFallback.tsx
+function NoMatchRouteFallback() {
+  return /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx("h1", { children: "404 not found" }),
+    /* @__PURE__ */ jsxs("p", { children: [
+      "This page has been dynamically added by Squide to fix an issue with the ",
+      /* @__PURE__ */ jsx("code", { children: "AppRouter" }),
+      " component. ",
+      /* @__PURE__ */ jsxs("strong", { children: [
+        "Please replace this page in your application by a ",
+        /* @__PURE__ */ jsx("a", { href: "https://reactrouter.com/en/main/start/tutorial#handling-not-found-errors", children: "custom match page" }),
+        "."
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx("p", { children: "The code should be like the following:" }),
+    /* @__PURE__ */ jsx("pre", { style: { backgroundColor: "rgb(243, 245, 249)", color: "rgb(21, 25, 40)", padding: "4px 10px", border: "1px solid rgb(225, 229, 239)" }, children: `runtime.registerRoute({
+    $visibility: "public",
+    path: "*",
+    lazy: import("./NoMatchPage.tsx")
+});` })
+  ] });
+}
+var Component = NoMatchRouteFallback;
+
+export { Component, NoMatchRouteFallback };

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export * from '@squide/msw';
 export * from '@squide/react-router';
 export * from '@squide/webpack-module-federation';
 export { AppRouter, AppRouterProps, BootstrappingRoute, OnCompleteRegistrationsFunction, OnLoadProtectedDataFunction, OnLoadPublicDataFunction, RenderRouterProviderFunction } from './AppRouter.js';
+export { Component, NoMatchRouteFallback } from './NoMatchRouteFallback.js';
 export { FireflyRuntime } from './fireflyRuntime.js';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.js

@@ -1,4 +1,5 @@
-export { AppRouter, BootstrappingRoute } from './chunk-QZACR5NK.js';
+export { AppRouter, BootstrappingRoute } from './chunk-M533VVCI.js';
+export { Component, NoMatchRouteFallback } from './chunk-MCU5TIOP.js';
 export { FireflyRuntime } from './chunk-6R4K3V6F.js';
 export * from '@squide/core';
 export * from '@squide/msw';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@squide/firefly",
   "author": "Workleap",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Helpers to facilitate the creation of a shell package with Squide firefly technology stack.",
   "license": "Apache-2.0",
   "repository": {
@@ -88,13 +88,13 @@
     "tsup": "8.0.1",
     "typescript": "5.2.2",
     "webpack": "5.89.0",
-    "@squide/webpack-configs": "1.1.2"
+    "@squide/webpack-configs": "1.1.3"
   },
   "dependencies": {
-    "@squide/core": "3.2.0",
-    "@squide/msw": "2.0.8",
-    "@squide/react-router": "4.0.0",
-    "@squide/webpack-module-federation": "3.0.3"
+    "@squide/core": "3.2.1",
+    "@squide/react-router": "4.0.2",
+    "@squide/webpack-module-federation": "3.0.4",
+    "@squide/msw": "2.0.9"
   },
   "sideEffects": false,
   "engines": {