Skip to content

Commit 02aea44

Browse files
Merge branch 'refs/heads/master' into chore/upgrade-storybook-8
# Conflicts: # pnpm-lock.yaml
2 parents 9e48562 + b4f78b4 commit 02aea44

File tree

7 files changed

+20
-32
lines changed

7 files changed

+20
-32
lines changed

modernjs-ssr/dynamic-provider/modern.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
33

44
// https://modernjs.dev/en/configure/app/usage
55
export default defineConfig({
6-
dev:{
7-
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
8-
host: '0.0.0.0',
9-
},
106
runtime: {
117
router: true,
128
},

modernjs-ssr/dynamic-provider/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"dist/"
2828
],
2929
"dependencies": {
30-
"@modern-js/runtime": "2.56.2",
30+
"@modern-js/runtime": "2.57.0",
3131
"react": "~18.3.0",
3232
"react-dom": "~18.3.0",
33-
"@module-federation/modern-js":"0.0.0-next-20240725061440"
33+
"@module-federation/modern-js":"0.3.3"
3434
},
3535
"devDependencies": {
36-
"@modern-js/app-tools": "2.56.2",
37-
"@modern-js/eslint-config": "2.56.2",
38-
"@modern-js/tsconfig": "2.56.2",
39-
"@modern-js-app/eslint-config": "2.56.2",
36+
"@modern-js/app-tools": "2.57.0",
37+
"@modern-js/eslint-config": "2.57.0",
38+
"@modern-js/tsconfig": "2.57.0",
39+
"@modern-js-app/eslint-config": "2.57.0",
4040
"lint-staged": "15.2.7",
4141
"prettier": "3.3.2",
4242
"husky": "9.0.11",

modernjs-ssr/host/modern.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
33

44
// https://modernjs.dev/en/configure/app/usage
55
export default defineConfig({
6-
dev: {
7-
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
8-
host: '0.0.0.0',
9-
},
106
runtime: {
117
router: true,
128
},

modernjs-ssr/host/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"dist/"
2828
],
2929
"dependencies": {
30-
"@modern-js/runtime": "2.56.2",
30+
"@modern-js/runtime": "2.57.0",
3131
"react": "^18.2.0",
3232
"react-dom": "^18.2.0",
33-
"@module-federation/modern-js":"0.0.0-next-20240725061440"
33+
"@module-federation/modern-js":"0.3.3"
3434
},
3535
"devDependencies": {
36-
"@modern-js/app-tools": "2.56.2",
37-
"@modern-js/eslint-config": "2.56.2",
38-
"@modern-js/tsconfig": "2.56.2",
39-
"@modern-js-app/eslint-config": "2.56.2",
36+
"@modern-js/app-tools": "2.57.0",
37+
"@modern-js/eslint-config": "2.57.0",
38+
"@modern-js/tsconfig": "2.57.0",
39+
"@modern-js-app/eslint-config": "2.57.0",
4040
"lint-staged": "15.2.7",
4141
"prettier": "3.3.2",
4242
"husky": "9.0.11",

modernjs-ssr/host/src/routes/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createRemoteSSRComponent, loadRemote, registerRemotes } from '@modern-js/runtime/mf';
2-
import {DynamicRemoteSSRComponents} from '../components/dynamic-remote'
1+
import { createRemoteSSRComponent } from '@modern-js/runtime/mf';
2+
import {DynamicRemoteSSRComponents } from '../components/dynamic-remote'
33
import './index.css';
44

55
const RemoteSSRComponent = createRemoteSSRComponent({

modernjs-ssr/provider/modern.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
33

44
// https://modernjs.dev/en/configure/app/usage
55
export default defineConfig({
6-
dev:{
7-
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
8-
host: '0.0.0.0',
9-
},
106
runtime: {
117
router: true,
128
},

modernjs-ssr/provider/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"dist/"
2828
],
2929
"dependencies": {
30-
"@modern-js/runtime": "2.56.2",
30+
"@modern-js/runtime": "2.57.0",
3131
"react": "~18.3.0",
3232
"react-dom": "~18.3.0",
33-
"@module-federation/modern-js":"0.0.0-next-20240725061440"
33+
"@module-federation/modern-js":"0.3.3"
3434
},
3535
"devDependencies": {
36-
"@modern-js/app-tools": "2.56.2",
37-
"@modern-js/eslint-config": "2.56.2",
38-
"@modern-js/tsconfig": "2.56.2",
39-
"@modern-js-app/eslint-config": "2.56.2",
36+
"@modern-js/app-tools": "2.57.0",
37+
"@modern-js/eslint-config": "2.57.0",
38+
"@modern-js/tsconfig": "2.57.0",
39+
"@modern-js-app/eslint-config": "2.57.0",
4040
"lint-staged": "15.2.7",
4141
"prettier": "3.3.2",
4242
"husky": "9.0.11",

0 commit comments

Comments
 (0)