Skip to content

Commit

Permalink
Merge branch 'main' into disable-trans-import-hoist
Browse files Browse the repository at this point in the history
  • Loading branch information
ScriptedAlchemy authored Nov 1, 2024
2 parents 328c2aa + 5524bf3 commit c97b3a4
Show file tree
Hide file tree
Showing 64 changed files with 1,167 additions and 594 deletions.
6 changes: 0 additions & 6 deletions .changeset/blue-poets-play.md

This file was deleted.

14 changes: 11 additions & 3 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"@module-federation/modern-js",
"@module-federation/retry-plugin",
"@module-federation/data-prefetch",
"@module-federation/rsbuild-plugin",
"@module-federation/storybook-addon"
"@module-federation/rsbuild-plugin"
]
],
"ignorePatterns": ["^alpha|^beta"],
Expand All @@ -36,6 +35,15 @@
"node-host-e2e",
"node-host-e2e",
"node-local-remote",
"node-remote"
"node-remote",
"remote1",
"remote2",
"remote3",
"remote4",
"host",
"host-v5",
"host-vue3",
"3008-runtime-remote",
"modernjs-ssr-*"
]
}
4 changes: 0 additions & 4 deletions .changeset/mean-jokes-remember.md

This file was deleted.

4 changes: 0 additions & 4 deletions .changeset/tasty-birds-dress.md

This file was deleted.

8 changes: 7 additions & 1 deletion apps/modernjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# @module-federation/modernjs
# @module-federation/modernjsapp

## 0.1.61

### Patch Changes

- @module-federation/enhanced@0.6.15

## 0.1.60

Expand Down
4 changes: 2 additions & 2 deletions apps/modernjs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@module-federation/modernjs",
"name": "@module-federation/modernjsapp",
"private": true,
"version": "0.1.60",
"version": "0.1.61",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
6 changes: 6 additions & 0 deletions apps/website-new/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# website-new

## 1.0.4

### Patch Changes

- 283574b: feat(retry-plugin): allow fallback function to receive failed URL

## 1.0.3

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions apps/website-new/docs/en/plugin/plugins/retry-plugin.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ type FetchWithRetryOptions = {
options?: RequestInit;
retryTimes?: number;
retryDelay?: number;
fallback?: () => string;
fallback?: (() => string) | ((url: string | URL | globalThis.Request) => string);
}

type ScriptWithRetryOptions = {
Expand Down Expand Up @@ -143,9 +143,9 @@ type ScriptWithRetryOptions = {
- The delay time between each retry (in milliseconds).

- **fallback**:
- `() => string`
- `() => string | ((url: string | URL | globalThis.Request) => string)`
- optional
- Returns the URL of a backup resource after all retries fail.
- A function, which can optionally receive the failed URL, that returns a fallback string to be used if all retries fail. This function is called when all retry attempts have failed.

### ScriptWithRetryOptions 类型说明

Expand Down
2 changes: 1 addition & 1 deletion apps/website-new/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "website-new",
"version": "1.0.3",
"version": "1.0.4",
"private": true,
"scripts": {
"dev": "rspress dev",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"@babel/core": "^7.24.7",
"@babel/plugin-transform-react-jsx": "7.25.7",
"@babel/preset-react": "^7.24.7",
"@changesets/cli": "^2.27.7",
"@changesets/cli": "^2.27.9",
"@chromatic-com/storybook": "^1.7.0",
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "19.5.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/bridge/bridge-react-webpack-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @module-federation/bridge-react-webpack-plugin

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/bridge-react-webpack-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/bridge-react-webpack-plugin",
"version": "0.6.14",
"version": "0.6.15",
"publishConfig": {
"access": "public"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/bridge/bridge-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @module-federation/bridge-react

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15
- @module-federation/bridge-shared@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/bridge-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/bridge-react",
"version": "0.6.14",
"version": "0.6.15",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/bridge/bridge-shared/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @module-federation/bridge-shared

## 0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/bridge-shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/bridge-shared",
"version": "0.6.14",
"version": "0.6.15",
"publishConfig": {
"access": "public"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/bridge/vue3-bridge/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @module-federation/bridge-vue3

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15
- @module-federation/bridge-shared@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/vue3-bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@module-federation/bridge-vue3",
"author": "zhouxiao <[email protected]>",
"version": "0.6.14",
"version": "0.6.15",
"publishConfig": {
"access": "public"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/chrome-devtools/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @module-federation/devtools

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome-devtools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/devtools",
"version": "0.6.14",
"version": "0.6.15",
"scripts": {
"build:storybook": "storybook build",
"storybook": "storybook dev -p 6006",
Expand Down
8 changes: 8 additions & 0 deletions packages/data-prefetch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @module-federation/data-prefetch

## 0.6.15

### Patch Changes

- Updated dependencies [ec31539]
- @module-federation/runtime@0.6.15
- @module-federation/sdk@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/data-prefetch/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@module-federation/data-prefetch",
"description": "Module Federation Data Prefetch",
"version": "0.6.14",
"version": "0.6.15",
"author": "nieyan <[email protected]>",
"homepage": "https://github.com/module-federation/core",
"license": "MIT",
Expand Down
8 changes: 8 additions & 0 deletions packages/dts-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @module-federation/dts-plugin

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15
- @module-federation/managers@0.6.15
- @module-federation/third-party-dts-extractor@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/dts-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/dts-plugin",
"version": "0.6.14",
"version": "0.6.15",
"author": "hanric <[email protected]>",
"main": "./dist/index.js",
"module": "./dist/index.js",
Expand Down
13 changes: 13 additions & 0 deletions packages/enhanced/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @module-federation/enhanced

## 0.6.15

### Patch Changes

- @module-federation/data-prefetch@0.6.15
- @module-federation/dts-plugin@0.6.15
- @module-federation/runtime-tools@0.6.15
- @module-federation/rspack@0.6.15
- @module-federation/sdk@0.6.15
- @module-federation/managers@0.6.15
- @module-federation/manifest@0.6.15
- @module-federation/bridge-react-webpack-plugin@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/enhanced/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/enhanced",
"version": "0.6.14",
"version": "0.6.15",
"main": "./dist/src/index.js",
"types": "./dist/src/index.d.ts",
"repository": "https://github.com/module-federation/core/tree/main/packages/enhanced",
Expand Down
6 changes: 6 additions & 0 deletions packages/esbuild/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @module-federation/esbuild

## 0.0.33

### Patch Changes

- @module-federation/sdk@0.6.15

## 0.0.32

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/esbuild/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/esbuild",
"version": "0.0.32",
"version": "0.0.33",
"author": "Zack Jackson (@ScriptedAlchemy)",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand Down
6 changes: 6 additions & 0 deletions packages/managers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @module-federation/managers

## 0.6.15

### Patch Changes

- @module-federation/sdk@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/managers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/managers",
"version": "0.6.14",
"version": "0.6.15",
"license": "MIT",
"description": "Provide managers for helping handle mf data .",
"keywords": [
Expand Down
8 changes: 8 additions & 0 deletions packages/manifest/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @module-federation/manifest

## 0.6.15

### Patch Changes

- @module-federation/dts-plugin@0.6.15
- @module-federation/sdk@0.6.15
- @module-federation/managers@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/manifest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/manifest",
"version": "0.6.14",
"version": "0.6.15",
"license": "MIT",
"description": "Provide manifest/stats for webpack/rspack MF project .",
"keywords": [
Expand Down
9 changes: 9 additions & 0 deletions packages/modernjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @module-federation/modern-js

## 0.6.15

### Patch Changes

- d1e0f3e: fix(modern-js-plugin): set cors responseHeaders as \*
- @module-federation/node@2.6.3
- @module-federation/enhanced@0.6.15
- @module-federation/sdk@0.6.15

## 0.6.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/modernjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@module-federation/modern-js",
"version": "0.6.14",
"version": "0.6.15",
"files": [
"dist/",
"types.d.ts",
Expand Down
5 changes: 2 additions & 3 deletions packages/modernjs/src/cli/configPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ export const moduleFederationConfigPlugin = (
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Methods':
'GET, POST, PUT, DELETE, PATCH, OPTIONS',
'Access-Control-Allow-Headers':
'X-Requested-With, content-type, Authorization',
'Access-Control-Allow-Headers': '*',
},
},
},
Expand All @@ -130,7 +129,7 @@ export const moduleFederationConfigPlugin = (
},
enableAsyncEntry:
bundlerType === 'rspack'
? modernjsConfig.source?.enableAsyncEntry ?? true
? (modernjsConfig.source?.enableAsyncEntry ?? true)
: modernjsConfig.source?.enableAsyncEntry,
},
dev: {
Expand Down
Loading

0 comments on commit c97b3a4

Please sign in to comment.