Skip to content

Commit 4ef21d2

Browse files
authored
chore(bridge-react): adjust bridge-react to structure directory (module-federation#3509)
1 parent 0e6f1f5 commit 4ef21d2

File tree

14 files changed

+27
-21
lines changed

14 files changed

+27
-21
lines changed

.changeset/thirty-llamas-live.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/bridge-react': patch
3+
---
4+
5+
chore: adjust bridge-react to structure directory

packages/bridge/bridge-react/__tests__/router.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
Outlet,
99
createBrowserRouter,
1010
} from 'react-router-dom';
11-
import { BrowserRouter, RouterProvider } from '../src/router';
12-
import { RouterContext } from '../src/context';
11+
import { BrowserRouter, RouterProvider } from '../src/router/default';
12+
import { RouterContext } from '../src/provider/context';
1313
import { getHtml, getWindowImpl } from './util';
1414

1515
describe('react router proxy', () => {

packages/bridge/bridge-react/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export { createRemoteComponent } from './create';
2-
export { createBridgeComponent } from './provider';
1+
export { createRemoteComponent } from './remote/create';
2+
export { createBridgeComponent } from './provider/create';
33
export type {
44
ProviderParams,
55
RenderFnParams,

packages/bridge/bridge-react/src/provider.tsx renamed to packages/bridge/bridge-react/src/provider/create.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {
66
} from '@module-federation/bridge-shared';
77
import { ErrorBoundary } from 'react-error-boundary';
88
import { RouterContext } from './context';
9-
import { LoggerInstance } from './utils';
9+
import { LoggerInstance } from '../utils';
1010
import { federationRuntime } from './plugin';
1111
import { createRoot } from './compat';
1212

packages/bridge/bridge-react/src/plugin.ts renamed to packages/bridge/bridge-react/src/provider/plugin.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import type { FederationRuntimePlugin } from '@module-federation/runtime';
2-
import type { FederationHost } from '@module-federation/runtime';
1+
import type {
2+
FederationRuntimePlugin,
3+
FederationHost,
4+
} from '@module-federation/runtime';
35

46
export type FederationRuntimeType = {
57
instance: FederationHost | null;

packages/bridge/bridge-react/src/remote/index.tsx renamed to packages/bridge/bridge-react/src/remote/component.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { ProviderParams } from '@module-federation/bridge-shared';
1010
import { dispatchPopstateEnv } from '@module-federation/bridge-shared';
1111
import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary';
1212
import { LoggerInstance, pathJoin, getRootDomDefaultClassName } from '../utils';
13-
import { federationRuntime } from '../plugin';
13+
import { federationRuntime } from '../provider/plugin';
1414

1515
declare const __APP_VERSION__: string;
1616
export interface RenderFnParams extends ProviderParams {

packages/bridge/bridge-react/src/create.tsx renamed to packages/bridge/bridge-react/src/remote/create.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {
33
ErrorBoundary,
44
ErrorBoundaryPropsWithComponent,
55
} from 'react-error-boundary';
6-
import { LoggerInstance } from './utils';
7-
import RemoteApp from './remote';
6+
import { LoggerInstance } from '../utils';
7+
import RemoteApp from './component';
88
import type { ProviderParams } from '@module-federation/bridge-shared';
99

1010
export interface RenderFnParams extends ProviderParams {

packages/bridge/bridge-react/src/router.tsx renamed to packages/bridge/bridge-react/src/router/default.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useContext } from 'react';
22
// The upper alias react-router-dom$ into this file avoids the loop
33
import * as ReactRouterDom from 'react-router-dom/';
4-
import { RouterContext } from './context';
5-
import { LoggerInstance } from './utils';
4+
import { RouterContext } from '../provider/context';
5+
import { LoggerInstance } from '../utils';
66

77
function WrapperRouter(
88
props:

packages/bridge/bridge-react/src/router-v5.tsx renamed to packages/bridge/bridge-react/src/router/v5.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React, { useContext } from 'react';
22
// The upper alias react-router-dom$ into this file avoids the loop
33
// @ts-ignore
44
import * as ReactRouterDom from 'react-router-dom/index.js';
5-
import { RouterContext } from './context';
6-
import { LoggerInstance } from './utils';
5+
import { RouterContext } from '../provider/context';
6+
import { LoggerInstance } from '../utils';
77

88
function WraperRouter(
99
props:

packages/bridge/bridge-react/src/router-v6.tsx renamed to packages/bridge/bridge-react/src/router/v6.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React, { useContext } from 'react';
22
// The upper alias react-router-dom$ into this file avoids the loop
33
import * as ReactRouterDom from 'react-router-dom/dist/index.js';
4-
5-
import { RouterContext } from './context';
6-
import { LoggerInstance } from './utils';
4+
import { RouterContext } from '../provider/context';
5+
import { LoggerInstance } from '../utils';
76

87
function WraperRouter(
98
props:

packages/bridge/bridge-react/vite.config.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export default defineConfig({
2121
lib: {
2222
entry: {
2323
index: path.resolve(__dirname, 'src/index.ts'),
24-
plugin: path.resolve(__dirname, 'src/plugin.ts'),
25-
router: path.resolve(__dirname, 'src/router.tsx'),
26-
'router-v5': path.resolve(__dirname, 'src/router-v5.tsx'),
27-
'router-v6': path.resolve(__dirname, 'src/router-v6.tsx'),
24+
plugin: path.resolve(__dirname, 'src/provider/plugin.ts'),
25+
router: path.resolve(__dirname, 'src/router/default.tsx'),
26+
'router-v5': path.resolve(__dirname, 'src/router/v5.tsx'),
27+
'router-v6': path.resolve(__dirname, 'src/router/v6.tsx'),
2828
},
2929
formats: ['cjs', 'es'],
3030
fileName: (format, entryName) => `${entryName}.${format}.js`,

0 commit comments

Comments
 (0)