Skip to content

Commit

Permalink
Merge branch 'main' into feat/embed-runtime
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/enhanced/src/lib/container/ModuleFederationPlugin.ts
#	packages/enhanced/src/lib/container/runtime/FederationRuntimePlugin.ts
#	packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
#	packages/nextjs-mf/src/plugins/container/runtimePlugin.ts
#	packages/sdk/src/types/plugins/ModuleFederationPlugin.ts
#	webpack/lib/Compiler.d.ts
#	webpack/types.d.ts
  • Loading branch information
ScriptedAlchemy committed Aug 29, 2024
2 parents f14d9db + a5d41fd commit 5315492
Show file tree
Hide file tree
Showing 161 changed files with 3,097 additions and 10,662 deletions.
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/dynamic-nested-remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-dynamic-nested-remote

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.19

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.18

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-nested-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-dynamic-nested-remote",
"private": true,
"version": "0.1.17",
"version": "0.1.20",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/dynamic-remote-new-version/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-dynamic-remote-new-version

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.19

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.18

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-remote-new-version/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-dynamic-remote-new-version",
"private": true,
"version": "0.1.17",
"version": "0.1.20",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/dynamic-remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-dynamic-remote

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.19

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.18

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-dynamic-remote",
"private": true,
"version": "0.1.17",
"version": "0.1.20",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/host/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-host

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.19

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.18

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/host/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-host",
"private": true,
"version": "0.1.17",
"version": "0.1.20",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/nested-remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-nested-remote

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.19

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.18

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/nested-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-nested-remote",
"private": true,
"version": "0.1.17",
"version": "0.1.20",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/remote-new-version/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-remote-new-version

## 0.1.22

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.21

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.19

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/remote-new-version/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-remote-new-version",
"private": true,
"version": "0.1.19",
"version": "0.1.22",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
18 changes: 18 additions & 0 deletions apps/modernjs-ssr/remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# modernjs-ssr-remote

## 0.1.22

### Patch Changes

- @module-federation/modern-js@0.6.0

## 0.1.21

### Patch Changes

- @module-federation/modern-js@0.5.2

## 0.1.20

### Patch Changes

- @module-federation/modern-js@0.5.1

## 0.1.19

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/remote/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modernjs-ssr-remote",
"private": true,
"version": "0.1.19",
"version": "0.1.22",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
21 changes: 21 additions & 0 deletions apps/modernjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# @module-federation/modernjs

## 0.1.46

### Patch Changes

- Updated dependencies [f245bb3]
- Updated dependencies [1d9bb77]
- @module-federation/enhanced@0.6.0

## 0.1.45

### Patch Changes

- Updated dependencies [b90fa7d]
- @module-federation/enhanced@0.5.2

## 0.1.44

### Patch Changes

- @module-federation/enhanced@0.5.1

## 0.1.43

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@module-federation/modernjs",
"private": true,
"version": "0.1.43",
"version": "0.1.46",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
24 changes: 24 additions & 0 deletions apps/router-demo/router-host-2000/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# host

## 1.0.20

### Patch Changes

- Updated dependencies [f245bb3]
- Updated dependencies [1d9bb77]
- @module-federation/enhanced@0.6.0
- @module-federation/bridge-react@0.6.0

## 1.0.19

### Patch Changes

- Updated dependencies [b90fa7d]
- @module-federation/enhanced@0.5.2
- @module-federation/bridge-react@0.5.2

## 1.0.18

### Patch Changes

- @module-federation/enhanced@0.5.1
- @module-federation/bridge-react@0.5.1

## 1.0.17

### Patch Changes
Expand Down
5 changes: 3 additions & 2 deletions apps/router-demo/router-host-2000/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "host",
"private": true,
"version": "1.0.17",
"version": "1.0.20",
"scripts": {
"dev": "FEDERATION_DEBUG=true rsbuild dev --open",
"build": "rsbuild build",
Expand All @@ -10,7 +10,8 @@
"dependencies": {
"@ant-design/icons": "^5.3.6",
"@module-federation/bridge-react": "workspace:*",
"@module-federation/enhanced": "workspace:*"
"@module-federation/enhanced": "workspace:*",
"react-router-dom": "^6.24.1"
},
"devDependencies": {
"@rsbuild/core": "^0.6.15",
Expand Down
24 changes: 24 additions & 0 deletions apps/router-demo/router-host-v5-2200/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# host-v5

## 1.0.20

### Patch Changes

- Updated dependencies [f245bb3]
- Updated dependencies [1d9bb77]
- @module-federation/enhanced@0.6.0
- @module-federation/bridge-react@0.6.0

## 1.0.19

### Patch Changes

- Updated dependencies [b90fa7d]
- @module-federation/enhanced@0.5.2
- @module-federation/bridge-react@0.5.2

## 1.0.18

### Patch Changes

- @module-federation/enhanced@0.5.1
- @module-federation/bridge-react@0.5.1

## 1.0.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/router-demo/router-host-v5-2200/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "host-v5",
"private": true,
"version": "1.0.17",
"version": "1.0.20",
"scripts": {
"dev": "FEDERATION_DEBUG=true rsbuild dev",
"build": "rsbuild build",
Expand Down
24 changes: 24 additions & 0 deletions apps/router-demo/router-host-vue3-2100/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# host-vue3

## 1.0.20

### Patch Changes

- Updated dependencies [f245bb3]
- Updated dependencies [1d9bb77]
- @module-federation/enhanced@0.6.0
- @module-federation/bridge-vue3@0.6.0

## 1.0.19

### Patch Changes

- Updated dependencies [b90fa7d]
- @module-federation/enhanced@0.5.2
- @module-federation/bridge-vue3@0.5.2

## 1.0.18

### Patch Changes

- @module-federation/enhanced@0.5.1
- @module-federation/bridge-vue3@0.5.1

## 1.0.17

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/router-demo/router-host-vue3-2100/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "host-vue3",
"private": true,
"version": "1.0.17",
"version": "1.0.20",
"scripts": {
"dev": "rsbuild dev",
"build": "rsbuild build",
Expand Down
Loading

0 comments on commit 5315492

Please sign in to comment.