Skip to content

Commit 2bd445d

Browse files
2heal1caohuilindanpeen
authored
feat: support modern.js@3 (#4209)
Co-authored-by: caohuilin <caohuilin@bytedance.com> Co-authored-by: fengdanping <fengdanping@bytedance.com> Co-authored-by: CocooDanielle <dapeen.feng@gmail.com>
1 parent b1dac16 commit 2bd445d

File tree

188 files changed

+7831
-6944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+7831
-6944
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@module-federation/bridge-vue3",
2020
"@module-federation/bridge-shared",
2121
"@module-federation/bridge-react-webpack-plugin",
22-
"@module-federation/modern-js",
22+
"@module-federation/modern-js-v3",
2323
"@module-federation/retry-plugin",
2424
"@module-federation/data-prefetch",
2525
"@module-federation/rsbuild-plugin",

.changeset/silly-beans-show.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
'shared-tree-shaking-with-server-provider': major
3+
'shared-tree-shaking-no-server-provider': major
4+
'shared-tree-shaking-with-server-host': major
5+
'shared-tree-shaking-no-server-host': major
6+
'remote5': major
7+
'remote6': major
8+
'create-module-federation': major
9+
'@module-federation/devtools': major
10+
'@module-federation/storybook-addon': major
11+
'@module-federation/rsbuild-plugin': major
12+
'@module-federation/modern-js-v3': major
13+
'@module-federation/rspack': major
14+
---
15+
16+
feat: upgrade to modern js 3.0

apps/modern-component-data-fetch/host/modern.config.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
import { appTools, defineConfig } from '@modern-js/app-tools';
2-
import { moduleFederationPlugin } from '@module-federation/modern-js';
2+
import { moduleFederationPlugin } from '@module-federation/modern-js-v3';
33

44
// https://modernjs.dev/en/configure/app/usage
55
export default defineConfig({
6-
runtime: {
7-
router: true,
8-
},
96
server: {
107
ssr: {
118
mode: 'stream',
129
},
1310
port: 5001,
1411
},
1512
plugins: [
16-
appTools({
17-
bundler: 'rspack',
18-
}),
13+
appTools(),
1914
moduleFederationPlugin({
2015
fetchServerQuery: { extraQuery: true },
2116
}),

apps/modern-component-data-fetch/host/module-federation.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createModuleFederationConfig } from '@module-federation/modern-js';
1+
import { createModuleFederationConfig } from '@module-federation/modern-js-v3';
22
export default createModuleFederationConfig({
33
name: 'host',
44
remotes: {

apps/modern-component-data-fetch/host/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
],
2828
"dependencies": {
2929
"@babel/runtime": "7.28.2",
30-
"@modern-js/runtime": "2.68.0",
31-
"@module-federation/modern-js": "workspace:*",
30+
"@modern-js/runtime": "3.0.0",
31+
"@module-federation/modern-js-v3": "workspace:*",
3232
"antd": "4.24.15",
3333
"react": "~18.3.1",
3434
"react-dom": "~18.3.1"
3535
},
3636
"devDependencies": {
3737
"@modern-js-app/eslint-config": "2.59.0",
38-
"@modern-js/app-tools": "2.68.0",
38+
"@modern-js/app-tools": "3.0.0",
3939
"@modern-js/eslint-config": "2.59.0",
40-
"@modern-js/tsconfig": "2.68.0",
40+
"@modern-js/tsconfig": "3.0.0",
4141
"@types/jest": "~29.5.0",
4242
"@types/node": "^20.19.5",
4343
"@types/react": "~18.2.0",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/// <reference types='@modern-js/app-tools/types' />
22
/// <reference types='@modern-js/runtime/types' />
33
/// <reference types='@modern-js/runtime/types/router' />
4-
/// <reference types='@module-federation/modern-js/types' />
4+
/// <reference types='@module-federation/modern-js-v3/types' />

apps/modern-component-data-fetch/host/src/routes/basic/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getInstance } from '@module-federation/modern-js/runtime';
2-
import { ERROR_TYPE } from '@module-federation/modern-js/react';
1+
import { getInstance } from '@module-federation/modern-js-v3/runtime';
2+
import { ERROR_TYPE } from '@module-federation/modern-js-v3/react';
33

44
const Basic = getInstance()!.createLazyComponent({
55
loader: () => {

apps/modern-component-data-fetch/host/src/routes/client-downgrade/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getInstance } from '@module-federation/modern-js/runtime';
1+
import { getInstance } from '@module-federation/modern-js-v3/runtime';
22

33
const ClientDowngrade = getInstance()!.createLazyComponent({
44
loader: () => {

apps/modern-component-data-fetch/host/src/routes/csr/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getInstance } from '@module-federation/modern-js/runtime';
1+
import { getInstance } from '@module-federation/modern-js-v3/runtime';
22

33
const CsrWithFetchDataFromServerComponent = getInstance()!.createLazyComponent({
44
noSSR: true,

apps/modern-component-data-fetch/host/src/routes/layout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import { Outlet, useNavigate, useLocation } from '@modern-js/runtime/router';
33
import { Layout, Menu } from 'antd';
4-
import { getInstance } from '@module-federation/modern-js/runtime';
5-
import { lazyLoadComponentPlugin } from '@module-federation/modern-js/react';
4+
import { getInstance } from '@module-federation/modern-js-v3/runtime';
5+
import { lazyLoadComponentPlugin } from '@module-federation/modern-js-v3/react';
66

77
getInstance()!.registerPlugins([lazyLoadComponentPlugin()]);
88
console.log('layout');

0 commit comments

Comments
 (0)