catalyst-core 0.3.0-beta.4 → 0.3.0-beta.5

package/dist/index.jsx

@@ -1,4 +1,4 @@
-export * from "react-router-dom"
+export * from "react-router"
 export * from "./web-router/components/RouterDataProvider.jsx"
 export * from "./web-router/components/MetaTag.jsx"
 export { split, hydrationReady } from "./web-router/components/Split.jsx"

package/dist/native/bridge/hooks/useNativeTransition.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useNativeTransition = void 0;
 var _react = require("react");
-var _reactRouterDom = require("react-router-dom");
+var _reactRouter = require("react-router");
 var _NativeBridge = _interopRequireDefault(require("../utils/NativeBridge.js"));
 var _NativeInterfaces = require("../constants/NativeInterfaces.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -34,7 +34,7 @@ const MIN_TIMEOUT = 800;
  *   timeout: ms safety timer (default: max(duration*3, 800))
  */
 const useNativeTransition = (defaults = {}) => {
-  const router = (0, _reactRouterDom.useNavigate)();
+  const router = (0, _reactRouter.useNavigate)();
   const isNative = typeof window !== "undefined" && _NativeBridge.default.isAvailable();
   const [transitioning, setTransitioning] = (0, _react.useState)(false);
   const overlayRef = (0, _react.useRef)(null);

package/dist/server/renderer/handler.jsx

@@ -4,7 +4,7 @@ import { Provider } from "react-redux"
 import { Body } from "./document/Body.jsx"
 import { Head } from "./document/Head.jsx"
 
-import { StaticRouter } from "react-router-dom/server"
+import { StaticRouter } from "react-router"
 import ServerRouter from "../../router/ServerRouter.js"
 import { renderToPipeableStream } from "react-dom/server"
 import { getUserAgentDetails } from "../utils/userAgentUtil.js"

package/dist/vite/vite.config.js

@@ -288,6 +288,7 @@ const browserOptimizeDeps = [
     "react-dom",
     "react-dom/client",
     "react-redux",
+    "react-router",
     "react-router-dom",
     "redux",
     "redux-thunk",
@@ -396,6 +397,7 @@ export const sharedViteConfig = {
             exclude: [
                 "react",
                 "react-dom",
+                "react-router",
                 "react-router-dom",
                 "@tata1mg/router",
                 // "@tata1mg/slowoi-react",
@@ -427,8 +429,15 @@ export const sharedViteConfig = {
     resolve: {
         alias: alias(),
         // Ensure only one copy of React-related packages is used (prevents
-        // duplicate instances from hoisted/linked packages in monorepos)
-        dedupe: ["react", "react-dom", "react-router-dom", "@tata1mg/slowboi-react"],
+        // duplicate instances from hoisted/linked packages in monorepos).
+        // NOTE: react-router deliberately excluded from dedupe. Consumer apps
+        // that still have an older react-router (e.g. v6, hoisted transitively
+        // through another dependency) at their own node_modules root would
+        // have that copy forced onto catalyst-core's v7 import too, silently
+        // resolving to the wrong package version (wrong export list, e.g.
+        // missing StaticRouter/Link) instead of an error. See tata1mg/1mg_web
+        // fix/react-router-v7-upgrade-staging for the confirmed repro.
+        dedupe: ["react", "react-dom", "react-router-dom"],
     },
     define: {
         ...getClientEnvVariables(),

package/dist/web-router/components/MetaTag.jsx

@@ -3,7 +3,7 @@ import { HelmetProvider, Helmet } from "react-helmet-async"
 import { OneMgRouterContext } from "../context.jsx"
 import { useRouterData } from "./RouterDataProvider.jsx"
 import { deleteHeadTagsByDataAttribute, getMetaData } from "../utils/metaDataUtils.jsx"
-import { useLocation } from "react-router-dom"
+import { useLocation } from "react-router"
 
 /**
  * @description renders meta tags component assigned to setMetaData

package/dist/web-router/components/RouterDataProvider.jsx

@@ -7,7 +7,7 @@ import {
     useSearchParams,
     UNSAFE_RouteContext,
     matchRoutes,
-} from "react-router-dom"
+} from "react-router"
 import { OneMgRouterContext } from "../context.jsx"
 // import sanitizeHtml from "sanitize-html"
 
@@ -41,15 +41,15 @@ const INITIAL_DATA_STATE = {
 /**
  * @typedef RouterFetcherProps
  * @property {any} route route object
- * @property {import("react-router-dom").Location} location the current location object, which represents the current URL in web browsers.
- * @property {import("react-router-dom").Params} params object of key/value pairs of the dynamic params from the current URL that were matched by the route path.
+ * @property {import("react-router").Location} location the current location object, which represents the current URL in web browsers.
+ * @property {import("react-router").Params} params object of key/value pairs of the dynamic params from the current URL that were matched by the route path.
  * @property {URLSearchParams} searchParams search parameters via URLSearchParams interface.
- * @property {import("react-router-dom").NavigateFunction} navigate function to navigate to other pages based on response.
+ * @property {import("react-router").NavigateFunction} navigate function to navigate to other pages based on response.
  */
 
 /**
  * @typedef ServerFetchDataProps
- * @property {import("react-router-dom").RouteObject[]} routes routes Array
+ * @property {import("react-router").RouteObject[]} routes routes Array
  * @property {string} url current url
  * @property {import("express").Request} req Express request object
  */
@@ -139,7 +139,7 @@ const fetchRouteData = async (routerProps, fetcherArgs, refetchArgs) => {
 /**
  *
  * @param {RouteContextObject} routeContext route context object
- * @returns {import('react-router-dom').RouteMatch[]} Array of matched routes
+ * @returns {import('react-router').RouteMatch[]} Array of matched routes
  */
 const getMatchedRoutes = ({ matches, outlet }) => {
     if (outlet) {
@@ -150,7 +150,7 @@ const getMatchedRoutes = ({ matches, outlet }) => {
 
 /**
  * Generates route key for given route using pathname and query params
- * @param {import('react-router-dom').RouteMatch} match Router Match Object
+ * @param {import('react-router').RouteMatch} match Router Match Object
  * @param {string} searchParamsString Query params string
  * @returns {string} routerKey
  */
@@ -190,7 +190,7 @@ export const RouterDataProvider = ({ children, initialState, fetcherArgs = {}, c
 
     /**
      * @description HOF which returns a function to refetch the route data
-     * @param {import("react-router-dom").RouteObject} route
+     * @param {import("react-router").RouteObject} route
      * @param {string} routeKey
      * @returns
      */
@@ -214,7 +214,7 @@ export const RouterDataProvider = ({ children, initialState, fetcherArgs = {}, c
 
     /**
      * @description HOF which returns a function to clear the route data immediately or after given time in ms
-     * @param {import("react-router-dom").RouteObject} route
+     * @param {import("react-router").RouteObject} route
      * @param {string} routeKey
      * @returns
      */
@@ -235,7 +235,7 @@ export const RouterDataProvider = ({ children, initialState, fetcherArgs = {}, c
 
     /**
      * @description Check the config for refetching the data
-     * @param {import('react-router-dom').RouteObject} route
+     * @param {import('react-router').RouteObject} route
      * @returns {boolean}
      */
     const shouldFetch = (route) => {

package/dist/web-router/context.jsx

@@ -2,7 +2,7 @@ import { createContext } from "react"
 
 /**
  * @typedef oneMgRouterContext
- * @property {import("react-router-dom").RouteMatch<string, import("react-router-dom").RouteObject>[]=} matchedRoutes
+ * @property {import("react-router").RouteMatch<string, import("react-router").RouteObject>[]=} matchedRoutes
  */
 
 /**

package/dist/web-router/hooks.jsx

@@ -1,4 +1,4 @@
-import { useNavigate, useLocation } from "react-router-dom"
+import { useNavigate, useLocation } from "react-router"
 
 /**
  * @param {number} delay

package/dist/web-router/types/components/RouterDataProvider.d.ts

@@ -47,11 +47,11 @@ export type RouterFetcherProps = {
     /**
      * the current location object, which represents the current URL in web browsers.
      */
-    location: import("react-router-dom").Location
+    location: import("react-router").Location
     /**
      * object of key/value pairs of the dynamic params from the current URL that were matched by the route path.
      */
-    params: import("react-router-dom").Params
+    params: import("react-router").Params
     /**
      * search parameters via URLSearchParams interface.
      */
@@ -59,13 +59,13 @@ export type RouterFetcherProps = {
     /**
      * function to navigate to other pages based on response.
      */
-    navigate: import("react-router-dom").NavigateFunction
+    navigate: import("react-router").NavigateFunction
 }
 export type ServerFetchDataProps = {
     /**
      * routes Array
      */
-    routes: import("react-router-dom").RouteObject[]
+    routes: import("react-router").RouteObject[]
     /**
      * current url
      */

package/dist/web-router/types/context.d.ts

@@ -1,6 +1,6 @@
 /**
  * @typedef oneMgRouterContext
- * @property {import("react-router-dom").RouteMatch<string, import("react-router-dom").RouteObject>[]=} matchedRoutes
+ * @property {import("react-router").RouteMatch<string, import("react-router").RouteObject>[]=} matchedRoutes
  */
 /**
  * @description This is internal context made for sharing data among router components
@@ -9,6 +9,6 @@
 export const OneMgRouterContext: import("react").Context<oneMgRouterContext>
 export type oneMgRouterContext = {
     matchedRoutes?:
-        | import("react-router-dom").RouteMatch<string, import("react-router-dom").RouteObject>[]
+        | import("react-router").RouteMatch<string, import("react-router").RouteObject>[]
         | undefined
 }

package/dist/web-router/types/hooks.d.ts

@@ -1 +1 @@
-export function useNavigateWithTransition(): import("react-router-dom").NavigateFunction
+export function useNavigateWithTransition(): import("react-router").NavigateFunction

package/dist/web-router/types/index.d.ts

@@ -1,3 +1,3 @@
-export * from "react-router-dom"
+export * from "react-router"
 declare const _default: any
 export default _default

package/dist/web-router/types/utils/metaDataUtils.d.ts

@@ -22,3 +22,19 @@ export function deleteHeadTagsByDataAttribute(attributeName: string, attributeVa
  * @returns {Array<JSX.Element>} - List of all meta tags for the matched location.
  */
 export function getMetaData(matchedRoutes: Array<Match>, routeData: Object): Array<JSX.Element>
+/**
+ * Static function defined on a route component that returns metadata elements
+ * to be rendered in the document head for that route.
+ * Must return an array of JSX elements (e.g. <title>, <meta>), NOT a plain
+ * object. Returning an object fails silently: no error is thrown, but the
+ * tags will not appear in the rendered <head>.
+ *
+ * @param {any} fetcherData - Data returned from the route's fetcher (serverFetcher/clientFetcher).
+ * @returns {Array<JSX.Element>} - Array of JSX head elements (title, meta, link, etc).
+ *
+ * @example
+ * HomePage.setMetaData = (apiResponse) => [
+ *   <title key="title">{apiResponse?.title || "Home"}</title>,
+ * ];
+ */
+export type SetMetaData = (fetcherData: any) => Array<JSX.Element>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "catalyst-core",
-    "version": "0.3.0-beta.4",
+    "version": "0.3.0-beta.5",
     "type": "module",
     "main": "./dist/index.jsx",
     "description": "Web framework that provides great performance out of the box",
@@ -50,7 +50,7 @@
         "react-helmet-async": "^1.3.0",
         "react-redux": "^9.2.0",
         "react-refresh": "^0.14.0",
-        "react-router-dom": "^6.16.0",
+        "react-router": "^7.18.2",
         "redux": "^4.2.1",
         "sanitize-html": "^2.17.6",
         "sass": "^1.89.2",