Skip to content

Commit a0baeb0

Browse files
Merge branch 'main' into pr8-unified-api
2 parents 154516f + 41ee332 commit a0baeb0

File tree

7 files changed

+17
-21
lines changed

7 files changed

+17
-21
lines changed

.changeset/cool-avocados-wave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/bridge-react': patch
3+
---
4+
5+
fix(bridge-react): correct createRemoteComponent warning info

.changeset/hip-tips-confess.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/modern-js': patch
3+
---
4+
5+
chore(modern-js-plugin): re-export all bridge react

apps/website-new/src/components/en/data-fetch/consumer.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ In the consumer, we need to use the [createLazyComponent](/practice/bridge/react
77
```tsx
88
import { getInstance } from '@module-federation/enhanced/runtime';
99
import {
10-
createLazyComponent,
1110
ERROR_TYPE,
1211
lazyLoadComponentPlugin,
1312
} from '@module-federation/bridge-react';

apps/website-new/src/components/zh/data-fetch/consumer.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SSR 场景中,只能在 [Modern.js](/guide/framework/modernjs) 中使用。
77
```tsx
88
import { getInstance } from '@module-federation/enhanced/runtime';
99
import {
10-
createLazyComponent,
1110
ERROR_TYPE,
1211
lazyLoadComponentPlugin,
1312
} from '@module-federation/bridge-react';

packages/bridge/bridge-react/src/remote/component.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const RemoteAppWrapper = forwardRef(function (
2323
className,
2424
style,
2525
fallback,
26+
loading,
2627
...resProps
2728
} = props;
2829

@@ -104,7 +105,9 @@ const RemoteAppWrapper = forwardRef(function (
104105
// bridge-remote-root
105106
const rootComponentClassName = `${getRootDomDefaultClassName(moduleName)} ${className || ''}`;
106107
return (
107-
<div className={rootComponentClassName} style={style} ref={rootRef}></div>
108+
<div className={rootComponentClassName} style={style} ref={rootRef}>
109+
{loading}
110+
</div>
108111
);
109112
});
110113

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function createLazyRemoteComponent<
4444
providerInfo={exportFn}
4545
exportName={info.export || 'default'}
4646
fallback={info.fallback}
47+
loading={info.loading}
4748
ref={ref}
4849
{...props}
4950
/>
@@ -96,7 +97,7 @@ export function createRemoteComponent<
9697
E extends keyof T = keyof T,
9798
>(info: LazyRemoteComponentInfo<T, E>) {
9899
LoggerInstance.warn(
99-
`createRemoteAppComponent is deprecated, please use createRemoteAppComponent instead!`,
100+
`createRemoteComponent is deprecated, please use createRemoteAppComponent instead!`,
100101
);
101102
return createRemoteAppComponent(info);
102103
}

packages/modernjs/src/react/index.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
export {
2-
ERROR_TYPE,
3-
CacheSize,
4-
CacheTime,
5-
configureCache,
6-
generateKey,
7-
cache,
8-
revalidateTag,
9-
clearStore,
10-
lazyLoadComponentPlugin,
11-
} from '@module-federation/bridge-react';
12-
13-
export type {
14-
DataFetchParams,
15-
CacheStatus,
16-
CacheStatsInfo,
17-
} from '@module-federation/bridge-react';
1+
export * from '@module-federation/bridge-react';

0 commit comments

Comments
 (0)