@module-federation/bridge-react 0.0.0-next-20240620034636 → 0.0.0-next-20240620052430

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20240620034636
+## 0.0.0-next-20240620052430
 
 ### Patch Changes
 
-- @module-federation/bridge-shared@0.0.0-next-20240620034636
+- @module-federation/bridge-shared@0.0.0-next-20240620052430

package/dist/index.cjs.js

@@ -96,13 +96,6 @@ function createRemoteComponent(lazyComponent, info) {
     } catch {
       enableDispathPopstate = false;
     }
-    if (ReactRouterDOM__namespace.UNSAFE_RouteContext && enableDispathPopstate) {
-      routerContextVal = React.useContext(ReactRouterDOM__namespace.UNSAFE_RouteContext);
-      if (routerContextVal && routerContextVal.matches && routerContextVal.matches[0] && routerContextVal.matches[0].pathnameBase) {
-        basename = routerContextVal.matches[0].pathnameBase;
-      }
-      enableDispathPopstate = (routerContextVal == null ? void 0 : routerContextVal.matches) && (routerContextVal == null ? void 0 : routerContextVal.matches.length) > 0;
-    }
     const LazyComponent = React.useMemo(() => {
       return React.lazy(async () => {
         context.LoggerInstance.log(`createRemoteComponent LazyComponent create >>>`, {

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import React__default, { useContext, useMemo, useRef, useState, useEffect } from "react";
+import React__default, { useMemo, useRef, useState, useEffect } from "react";
 import * as ReactRouterDOM from "react-router-dom";
 import { L as LoggerInstance, f, a as atLeastReact18, R as RouterContext } from "./context-CPtN38Ur.js";
 import ReactDOM from "react-dom";
@@ -77,13 +77,6 @@ function createRemoteComponent(lazyComponent, info) {
     } catch {
       enableDispathPopstate = false;
     }
-    if (ReactRouterDOM.UNSAFE_RouteContext && enableDispathPopstate) {
-      routerContextVal = useContext(ReactRouterDOM.UNSAFE_RouteContext);
-      if (routerContextVal && routerContextVal.matches && routerContextVal.matches[0] && routerContextVal.matches[0].pathnameBase) {
-        basename = routerContextVal.matches[0].pathnameBase;
-      }
-      enableDispathPopstate = (routerContextVal == null ? void 0 : routerContextVal.matches) && (routerContextVal == null ? void 0 : routerContextVal.matches.length) > 0;
-    }
     const LazyComponent = useMemo(() => {
       return React__default.lazy(async () => {
         LoggerInstance.log(`createRemoteComponent LazyComponent create >>>`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.0.0-next-20240620034636",
+  "version": "0.0.0-next-20240620052430",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
   "dependencies": {
     "@loadable/component": "^5.16.4",
     "react-error-boundary": "^4.0.13",
-    "@module-federation/bridge-shared": "0.0.0-next-20240620034636"
+    "@module-federation/bridge-shared": "0.0.0-next-20240620052430"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

package/src/create.tsx

@@ -1,11 +1,4 @@
-import React, {
-  ReactNode,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import React, { ReactNode, useEffect, useMemo, useRef, useState } from 'react';
 import * as ReactRouterDOM from 'react-router-dom';
 import type { ProviderParams } from '@module-federation/bridge-shared';
 import { LoggerInstance } from './utils';
@@ -135,19 +128,44 @@ export function createRemoteComponent<T, E extends keyof T>(
       enableDispathPopstate = false;
     }
 
-    if (ReactRouterDOM.UNSAFE_RouteContext && enableDispathPopstate) {
-      routerContextVal = useContext(ReactRouterDOM.UNSAFE_RouteContext);
-      if (
-        routerContextVal &&
-        routerContextVal.matches &&
-        routerContextVal.matches[0] &&
-        routerContextVal.matches[0].pathnameBase
-      ) {
-        basename = routerContextVal.matches[0].pathnameBase;
-      }
-      enableDispathPopstate =
-        routerContextVal?.matches && routerContextVal?.matches.length > 0;
-    }
+    // if (props.basename) {
+    //   basename = props.basename
+    // } else if (enableDispathPopstate) {
+    //   const routerV5Api = 'useRoute' + 'Match';
+    //   const routerV6Api = 'useMatches';
+    //   const routerV5History = 'use' + 'History';
+    //   const useHref = 'useHref';
+
+    //   const match = (ReactRouterDOM as any)[routerV5Api]?.();
+    //   const matchs = (ReactRouterDOM as any)[routerV6Api]?.();
+    //   const location = ReactRouterDOM.useLocation();
+
+    //   if ((ReactRouterDOM as any)[routerV5History] /* react-router@5 */) {
+    //     // there is no dynamic switching of the router version in the project
+    //     // so hooks can be used in conditional judgment
+    //     // eslint-disable-next-line react-hooks/rules-of-hooks
+    //     const history = (ReactRouterDOM as any)[routerV5History]?.();
+    //     // To be compatible to history@4.10.1 and @5.3.0 we cannot write like this `history.createHref(pathname)`
+    //     basename = history?.createHref?.({ pathname: '/' });
+    //   } else if (useHref /* react-router@6 */) {
+    //     // eslint-disable-next-line react-hooks/rules-of-hooks
+    //     basename = useHref?.('/');
+    //   }
+    // }
+
+    // if (ReactRouterDOM.UNSAFE_RouteContext && enableDispathPopstate) {
+    //   routerContextVal = eval('useContext(ReactRouterDOM.UNSAFE_RouteContext)');
+    //   if (
+    //     routerContextVal &&
+    //     routerContextVal.matches &&
+    //     routerContextVal.matches[0] &&
+    //     routerContextVal.matches[0].pathnameBase
+    //   ) {
+    //     basename = routerContextVal.matches[0].pathnameBase;
+    //   }
+    //   enableDispathPopstate =
+    //     routerContextVal?.matches && routerContextVal?.matches.length > 0;
+    // }
 
     const LazyComponent = useMemo(() => {
       //@ts-ignore