Skip to content

Commit

Permalink
chore: upgrade [email protected] (#2815)
Browse files Browse the repository at this point in the history
  • Loading branch information
2heal1 authored Aug 1, 2024
1 parent be5f11a commit 951d705
Show file tree
Hide file tree
Showing 19 changed files with 284 additions and 296 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilly-llamas-complain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@module-federation/modern-js': patch
---

chore: upgrade [email protected]
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/dynamic-nested-remote/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3054,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/dynamic-nested-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/dynamic-remote-new-version/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3056,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/dynamic-remote-new-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/dynamic-remote/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3053,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/dynamic-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/host/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3050,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/nested-remote/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3052,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/nested-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/remote-new-version/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3055,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/remote-new-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
2 changes: 0 additions & 2 deletions apps/modernjs-ssr/remote/modern.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { moduleFederationPlugin } from '@module-federation/modern-js';
export default defineConfig({
dev: {
port: 3051,
// FIXME: it should be removed , related issue: https://github.com/web-infra-dev/modern.js/issues/5999
host: '0.0.0.0',
},
runtime: {
router: true,
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs-ssr/remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/modern-js": "workspace:*",
"@babel/runtime": "7.24.4",
"antd": "4.24.15"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
Expand Down
10 changes: 5 additions & 5 deletions apps/modernjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
"dist/"
],
"dependencies": {
"@modern-js/runtime": "2.56.2",
"@modern-js/runtime": "2.57.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"@module-federation/enhanced": "workspace:*",
"@babel/runtime": "7.24.5"
},
"devDependencies": {
"@modern-js/app-tools": "2.56.2",
"@modern-js/eslint-config": "2.56.2",
"@modern-js/tsconfig": "2.56.2",
"@modern-js-app/eslint-config": "2.56.2",
"@modern-js/app-tools": "2.57.0",
"@modern-js/eslint-config": "2.57.0",
"@modern-js/tsconfig": "2.57.0",
"@modern-js-app/eslint-config": "2.57.0",
"typescript": "~5.0.4",
"@types/jest": "~29.5.0",
"@types/node": "~20.12.12",
Expand Down
10 changes: 5 additions & 5 deletions packages/modernjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
"devDependencies": {
"@types/hoist-non-react-statics": "3.3.2",
"@module-federation/manifest": "workspace:*",
"@modern-js/app-tools": "2.56.2",
"@modern-js/core": "2.56.2",
"@modern-js/runtime": "2.56.2",
"@modern-js/module-tools": "2.56.2",
"@modern-js/tsconfig": "2.56.2"
"@modern-js/app-tools": "2.57.0",
"@modern-js/core": "2.57.0",
"@modern-js/runtime": "2.57.0",
"@modern-js/module-tools": "2.57.0",
"@modern-js/tsconfig": "2.57.0"
},
"peerDependencies": {
"react": ">=17",
Expand Down
7 changes: 2 additions & 5 deletions packages/modernjs/src/ssr-runtime/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ export const mfSSRPlugin = (): Plugin => ({
}
return next({ context });
},
hoc({ App, config }, next) {
wrapRoot(App) {
const AppWrapper = (props: any) => (
<>
<SSRLiveReload />
<App {...props} />
</>
);
return next({
App: hoistNonReactStatics(AppWrapper, App),
config,
});
return hoistNonReactStatics(AppWrapper, App);
},
};
},
Expand Down
Loading

0 comments on commit 951d705

Please sign in to comment.