chore: merge main branch

module-federation · Nov 5, 2024 · 76427c2 · 76427c2
2 parents a2573c6 + e44d7fa
commit 76427c2
Show file tree

Hide file tree

Showing 87 changed files with 3,234 additions and 2,221 deletions.
diff --git a/.changeset/chilly-berries-look.md b/.changeset/chilly-berries-look.md
diff --git a/.changeset/cyan-emus-prove.md b/.changeset/cyan-emus-prove.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/runtime': patch
+---
+
+fix(runtime): use document.defaultView to get real window object to solve csp issue
diff --git a/.changeset/little-insects-lick.md b/.changeset/little-insects-lick.md
@@ -0,0 +1,6 @@
+---
+'@module-federation/retry-plugin': patch
+'website-new': patch
+---
+
+fix: parameter url for fetch options should not be necessary
diff --git a/.changeset/ninety-dragons-chew.md b/.changeset/ninety-dragons-chew.md
@@ -0,0 +1,9 @@
+---
+'@module-federation/bridge-react-webpack-plugin': patch
+'@module-federation/bridge-shared': patch
+'@module-federation/bridge-react': patch
+'@module-federation/bridge-vue3': patch
+'@module-federation/devtools': patch
+---
+
+add license information
diff --git a/apps/modernjs-ssr/dynamic-nested-remote/package.json b/apps/modernjs-ssr/dynamic-nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.25.7",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/dynamic-remote-new-version/package.json b/apps/modernjs-ssr/dynamic-remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/dynamic-remote/package.json b/apps/modernjs-ssr/dynamic-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/host/package.json b/apps/modernjs-ssr/host/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/nested-remote/package.json b/apps/modernjs-ssr/nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/remote-new-version/package.json b/apps/modernjs-ssr/remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/remote/package.json b/apps/modernjs-ssr/remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs/CHANGELOG.md b/apps/modernjs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @module-federation/modernjsapp
 
+## 0.1.62
+
+### Patch Changes
+
+- @module-federation/enhanced@0.6.16
+
 ## 0.1.61
 
 ### Patch Changes

diff --git a/apps/modernjs/package.json b/apps/modernjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/modernjsapp",
   "private": true,
-  "version": "0.1.61",
+  "version": "0.1.62",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,16 +26,16 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.5",
-    "@modern-js/runtime": "2.60.3",
+    "@modern-js/runtime": "2.60.6",
     "@module-federation/enhanced": "workspace:*",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.3",
+    "@modern-js/app-tools": "2.60.6",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/tsconfig": "2.60.6",
     "@types/jest": "~29.5.0",
     "@types/node": "~20.12.12",
     "@types/react": "~18.2.0",

diff --git a/apps/rslib-module/.storybook/main.ts b/apps/rslib-module/.storybook/main.ts
@@ -17,7 +17,7 @@ const config: StorybookConfig = {
   },
   addons: [
     {
-      name: '@module-federation/storybook-addon/preset.js',
+      name: '@module-federation/storybook-addon/preset',
       options: {
         remotes: {
           'rslib-module':

diff --git a/apps/rslib-module/README.md b/apps/rslib-module/README.md
@@ -18,8 +18,16 @@ nx serve rslib-module
 
 Dev package
 
+1. 
+
+```
+nx serve rslib-module
+```
+
+2.
+
 ```
-nx serve rslib-module & nx storybook rslib-module
+nx storybook rslib-module
 ```
 
 visit http://localhost:6006
diff --git a/apps/website-new/docs/en/guide/framework/nextjs.mdx b/apps/website-new/docs/en/guide/framework/nextjs.mdx
@@ -4,6 +4,10 @@ import { Badge } from '@theme';
 
 # Next.js
 
+:::danger Project Deprecation
+Support for Next.js is ending [read more](https://github.com/module-federation/core/issues/3153)
+:::
+
 This plugin enables Module Federation on Next.js
 
 ## Supports

diff --git a/apps/website-new/docs/en/plugin/plugins/retry-plugin.mdx b/apps/website-new/docs/en/plugin/plugins/retry-plugin.mdx
@@ -184,7 +184,7 @@ init({
         // the retry resource url
         url: 'http://localhost:2001/-mf-manifest.json',
         // after all retried failed, set a fallback function to guarantee a fallback resource
-        fallback: () => 'http://localhost:2002/mf-manifest.json',
+        fallback: (url: string) => 'http://localhost:2002/mf-manifest.json',
       },
       script: {
         // the retry times

diff --git a/apps/website-new/docs/en/practice/frameworks/next/index.mdx b/apps/website-new/docs/en/practice/frameworks/next/index.mdx
@@ -6,6 +6,9 @@ title: "Basic Example"
 
 import {Steps, Tabs, Tab, Badge, SourceCode} from '@theme';
 
+:::danger Project Deprecation
+Support for Next.js is ending [read more](https://github.com/module-federation/core/issues/3153)
+:::
 
 <span className="badge-info">
  <Badge text="Next 12" type="info" />

diff --git a/apps/website-new/docs/zh/guide/start/quick-start.mdx b/apps/website-new/docs/zh/guide/start/quick-start.mdx
@@ -95,11 +95,8 @@ import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
 
 export default defineConfig({
-  plugins: [pluginReact()],
-  server: {
-    port: 3000,
-  },
   plugins: [
+    pluginReact(),
     pluginModuleFederation({
       name: 'federation_provider',
       exposes: {
@@ -108,6 +105,9 @@ export default defineConfig({
       shared: ['react', 'react-dom'],
     }),
   ],
+  server: {
+    port: 3000,
+  },
 });
 ```
 

diff --git a/apps/website-new/docs/zh/plugin/plugins/retry-plugin.mdx b/apps/website-new/docs/zh/plugin/plugins/retry-plugin.mdx
@@ -95,7 +95,7 @@ type FetchWithRetryOptions = {
   options?: RequestInit;
   retryTimes?: number;
   retryDelay?: number;
-  fallback?: () => string;
+  fallback?: (url: string) => string;
 }
 
 type ScriptWithRetryOptions = {

diff --git a/package.json b/package.json
@@ -82,13 +82,8 @@
     "unplugin": "1.9.0"
   },
   "devDependencies": {
-    "@antora/cli": "3.1.9",
-    "@antora/lunr-extension": "1.0.0-alpha.8",
-    "@antora/site-generator": "3.1.9",
-    "@asciidoctor/core": "3.0.4",
-    "@asciidoctor/tabs": "1.0.0-beta.6",
     "@babel/core": "^7.24.7",
-    "@babel/plugin-transform-react-jsx": "7.25.7",
+    "@babel/plugin-transform-react-jsx": "7.25.9",
     "@babel/preset-react": "^7.24.7",
     "@changesets/cli": "^2.27.9",
     "@chromatic-com/storybook": "^1.7.0",

diff --git a/packages/bridge/bridge-react-webpack-plugin/CHANGELOG.md b/packages/bridge/bridge-react-webpack-plugin/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @module-federation/bridge-react-webpack-plugin
 
+## 0.6.16
+
+### Patch Changes
+
+- Updated dependencies [f779188]
+- Updated dependencies [024df60]
+  - @module-federation/sdk@0.6.16
+
 ## 0.6.15
 
 ### Patch Changes

diff --git a/packages/bridge/bridge-react-webpack-plugin/package.json b/packages/bridge/bridge-react-webpack-plugin/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@module-federation/bridge-react-webpack-plugin",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "publishConfig": {
     "access": "public"
   },
   "author": "zhouxiao <[email protected]>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/module-federation/core",
+    "directory": "packages/bridge-react-webpack-plugin"
+  },
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.cjs.d.ts",

diff --git a/packages/bridge/bridge-react/CHANGELOG.md b/packages/bridge/bridge-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @module-federation/bridge-react
 
+## 0.6.16
+
+### Patch Changes
+
+- Updated dependencies [f779188]
+- Updated dependencies [024df60]
+  - @module-federation/sdk@0.6.16
+  - @module-federation/bridge-shared@0.6.16
+
 ## 0.6.15
 
 ### Patch Changes

diff --git a/packages/bridge/bridge-react/package.json b/packages/bridge/bridge-react/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "publishConfig": {
     "access": "public"
   },
   "author": "zhouxiao <[email protected]>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/module-federation/core",
+    "directory": "packages/bridge-react"
+  },
   "type": "module",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",

diff --git a/packages/bridge/bridge-shared/CHANGELOG.md b/packages/bridge/bridge-shared/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @module-federation/bridge-shared
 
+## 0.6.16
+
 ## 0.6.15
 
 ## 0.6.14