Skip to content

Commit 88e0f88

Browse files
fix(ci): restore modernjs ssr parity
1 parent 441fb26 commit 88e0f88

File tree

15 files changed

+1033
-712
lines changed

15 files changed

+1033
-712
lines changed

apps/modernjs-ssr/dynamic-nested-remote/module-federation.config.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ export default createModuleFederationConfig({
66
'./Content': './src/components/Content.tsx',
77
},
88
shared: {
9-
react: { singleton: false, requiredVersion: false },
10-
'react-dom': { singleton: false, requiredVersion: false },
9+
react: { singleton: true },
10+
'react-dom': { singleton: true },
1111
},
12-
dts: false,
1312
});

apps/modernjs-ssr/dynamic-remote-new-version/module-federation.config.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ export default createModuleFederationConfig({
55
'.': './src/components/Image.tsx',
66
},
77
shared: {
8-
react: { singleton: false, requiredVersion: false },
9-
'react-dom': { singleton: false, requiredVersion: false },
8+
react: { singleton: true },
9+
'react-dom': { singleton: true },
1010
},
11-
dts: false,
1211
});

apps/modernjs-ssr/dynamic-remote/module-federation.config.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ export default createModuleFederationConfig({
66
'.': './src/Index.tsx',
77
},
88
shared: {
9-
react: { singleton: false, requiredVersion: false },
10-
'react-dom': { singleton: false, requiredVersion: false },
9+
react: { singleton: true },
10+
'react-dom': { singleton: true },
1111
},
12-
dts: false,
1312
});

apps/modernjs-ssr/dynamic-remote/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
"main": "./dist/cjs/index.js",
1414
"module": "./dist/esm/index.mjs",
1515
"types": "./dist/cjs/index.d.ts",
16+
"dependencies": {
17+
"react": "~18.3.1",
18+
"react-dom": "~18.3.1"
19+
},
1620
"devDependencies": {
1721
"@module-federation/enhanced": "workspace:*",
1822
"@module-federation/modern-js-v3": "workspace:*",
1923
"@module-federation/rsbuild-plugin": "workspace:*",
2024
"@rsbuild/plugin-react": "^1.4.5",
2125
"@rslib/core": "^0.9.0",
2226
"@types/react": "^18.3.11",
23-
"http-server": "^14.1.1",
24-
"react": "^18.3.1",
25-
"react-dom": "^18.3.1"
27+
"http-server": "^14.1.1"
2628
}
2729
}

apps/modernjs-ssr/host/module-federation.config.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import { createModuleFederationConfig } from '@module-federation/modern-js-v3';
22
export default createModuleFederationConfig({
33
name: 'host',
44
remotes: {
5-
remote: 'remote@http://localhost:3055/static/mf-manifest.json',
5+
remote: 'remote@http://localhost:3051/static/mf-manifest.json',
66
nested_remote: 'nested_remote@http://localhost:3052/mf-manifest.json',
77
},
88
shared: {
9-
react: { singleton: false, requiredVersion: false },
10-
'react-dom': { singleton: false, requiredVersion: false },
9+
react: { singleton: true },
10+
'react-dom': { singleton: true },
1111
},
12-
dts: false,
1312
});

apps/modernjs-ssr/host/src/modern-app-env.d.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@
22
/// <reference types='@modern-js/runtime/types' />
33
/// <reference types='@modern-js/runtime/types/router' />
44
/// <reference types='@module-federation/modern-js-v3/types' />
5-
6-
declare module 'remote/Image' {
7-
import type { ComponentType } from 'react';
8-
const RemoteImage: ComponentType<any>;
9-
export default RemoteImage;
10-
}

apps/modernjs-ssr/nested-remote/module-federation.config.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ export default createModuleFederationConfig({
66
'./Content': './src/components/Content.tsx',
77
},
88
remotes: {
9-
remote: 'remote@http://localhost:3055/static/mf-manifest.json',
9+
remote: 'remote@http://localhost:3051/static/mf-manifest.json',
1010
},
1111
shared: {
12-
react: { singleton: false, requiredVersion: false },
13-
'react-dom': { singleton: false, requiredVersion: false },
12+
react: { singleton: true },
13+
'react-dom': { singleton: true },
1414
},
15-
dts: false,
1615
});

apps/modernjs-ssr/nested-remote/src/modern-app-env.d.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,3 @@
22
/// <reference types='@modern-js/runtime/types' />
33
/// <reference types='@modern-js/runtime/types/router' />
44
/// <reference types='@module-federation/modern-js-v3/types' />
5-
6-
declare module 'remote/Image' {
7-
import type { ComponentType } from 'react';
8-
const RemoteImage: ComponentType<any>;
9-
export default RemoteImage;
10-
}
11-
12-
declare module 'remote/Button' {
13-
import type { ComponentType } from 'react';
14-
const RemoteButton: ComponentType<any>;
15-
export default RemoteButton;
16-
}

apps/modernjs-ssr/nested-remote/src/routes/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ getInstance()!.registerPlugins([lazyLoadComponentPlugin()]);
99
const RemoteSSRComponent = getInstance()!.createLazyComponent({
1010
loader: () => import('remote/Button'),
1111
loading: 'loading...',
12-
export: 'default',
12+
export: 'Button',
1313
fallback: ({ error }) => {
1414
if (error instanceof Error && error.message.includes('not exist')) {
1515
return <div>fallback - not existed id</div>;

apps/modernjs-ssr/remote-new-version/module-federation.config.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ export default createModuleFederationConfig({
55
'./Image': './src/components/Image.tsx',
66
},
77
shared: {
8-
react: { singleton: false, requiredVersion: false },
9-
'react-dom': { singleton: false, requiredVersion: false },
8+
react: { singleton: true },
9+
'react-dom': { singleton: true },
1010
},
11-
dts: false,
1211
});

0 commit comments

Comments
 (0)