Skip to content

Commit 76427c2

Browse files
danpeendanpeen
committed
chore: merge main branch
2 parents a2573c6 + e44d7fa commit 76427c2

File tree

87 files changed

+3234
-2221
lines changed

Some content is hidden

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

87 files changed

+3234
-2221
lines changed

‎.changeset/chilly-berries-look.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/cyan-emus-prove.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/runtime': patch
3+
---
4+
5+
fix(runtime): use document.defaultView to get real window object to solve csp issue

‎.changeset/little-insects-lick.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@module-federation/retry-plugin': patch
3+
'website-new': patch
4+
---
5+
6+
fix: parameter url for fetch options should not be necessary

‎.changeset/ninety-dragons-chew.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@module-federation/bridge-react-webpack-plugin': patch
3+
'@module-federation/bridge-shared': patch
4+
'@module-federation/bridge-react': patch
5+
'@module-federation/bridge-vue3': patch
6+
'@module-federation/devtools': patch
7+
---
8+
9+
add license information

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.25.7",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/dynamic-remote-new-version/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.24.4",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.24.4",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/host/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.24.4",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/nested-remote/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.24.4",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

‎apps/modernjs-ssr/remote-new-version/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
],
2727
"dependencies": {
2828
"@babel/runtime": "7.24.4",
29-
"@modern-js/runtime": "2.60.3",
29+
"@modern-js/runtime": "2.60.6",
3030
"@module-federation/modern-js": "workspace:*",
3131
"antd": "4.24.15",
3232
"react": "~18.3.1",
3333
"react-dom": "~18.3.1"
3434
},
3535
"devDependencies": {
3636
"@modern-js-app/eslint-config": "2.59.0",
37-
"@modern-js/app-tools": "2.60.3",
37+
"@modern-js/app-tools": "2.60.6",
3838
"@modern-js/eslint-config": "2.59.0",
39-
"@modern-js/tsconfig": "2.60.3",
39+
"@modern-js/tsconfig": "2.60.6",
4040
"@types/jest": "~29.5.0",
4141
"@types/node": "~16.11.7",
4242
"@types/react": "~18.2.0",

0 commit comments

Comments
 (0)