Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/rambda-9.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ScriptedAlchemy authored Jul 12, 2024
2 parents d6a7583 + ccba6d5 commit c4390f5
Show file tree
Hide file tree
Showing 69 changed files with 2,017 additions and 736 deletions.
5 changes: 0 additions & 5 deletions .changeset/dull-paws-judge.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eight-kids-smash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/friendly-doors-pull.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/red-pants-yawn.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/sour-wasps-fry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/swift-parrots-marry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/yellow-cats-doubt.md

This file was deleted.

7 changes: 7 additions & 0 deletions apps/modernjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @module-federation/modernjs

## 0.1.33

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6

## 0.1.32

### 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.32",
"version": "0.1.33",
"scripts": {
"reset": "npx rimraf ./**/node_modules",
"dev": "modern dev",
Expand Down
8 changes: 8 additions & 0 deletions apps/router-demo/router-host-2000/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# host

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-react@0.2.6

## 1.0.6

### Patch Changes
Expand Down
6 changes: 3 additions & 3 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.6",
"version": "1.0.7",
"scripts": {
"dev": "FEDERATION_DEBUG=true rsbuild dev --open",
"build": "rsbuild build",
Expand All @@ -14,8 +14,8 @@
"react-error-boundary": "^4.0.13"
},
"devDependencies": {
"@rsbuild/core": "^0.6.3",
"@rsbuild/plugin-react": "^0.6.3",
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^0.6.15",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"tailwindcss": "^3.4.3",
Expand Down
8 changes: 8 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,13 @@
# host-v5

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-react@0.2.6

## 1.0.6

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions 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.6",
"version": "1.0.7",
"scripts": {
"dev": "FEDERATION_DEBUG=true rsbuild dev",
"build": "rsbuild build",
Expand All @@ -15,12 +15,12 @@
"antd": "^5.16.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.4",
"react-error-boundary": "^4.0.13"
"react-error-boundary": "^4.0.13",
"react-router-dom": "^5.3.4"
},
"devDependencies": {
"@rsbuild/core": "^0.6.3",
"@rsbuild/plugin-react": "^0.6.3",
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^0.6.15",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"tailwindcss": "^3.4.3",
Expand Down
8 changes: 8 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,13 @@
# host-vue3

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-vue3@0.2.6

## 1.0.6

### 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.6",
"version": "1.0.7",
"scripts": {
"dev": "rsbuild dev",
"build": "rsbuild build",
Expand Down
8 changes: 8 additions & 0 deletions apps/router-demo/router-remote1-2001/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# remote1

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-react@0.2.6

## 1.0.6

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions apps/router-demo/router-remote1-2001/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "remote1",
"private": true,
"version": "1.0.6",
"version": "1.0.7",
"scripts": {
"dev": "rsbuild dev",
"build": "DEBUG=true rsbuild build",
Expand All @@ -18,9 +18,9 @@
},
"devDependencies": {
"@ant-design/cssinjs": "^1.20.0",
"@rsbuild/core": "^0.6.3",
"@rsbuild/plugin-react": "^0.6.3",
"@rsbuild/shared": "^0.7.3",
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^0.6.15",
"@rsbuild/shared": "^0.7.10",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "^5.4.5"
Expand Down
12 changes: 6 additions & 6 deletions apps/router-demo/router-remote1-2001/rsbuild.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ export default defineConfig({
'./export-app': './src/export-App.tsx',
},
shared: {
react: {
singleton: true,
},
'react-dom': {
singleton: true,
},
// react: {
// singleton: true,
// },
// 'react-dom': {
// singleton: true,
// },
// 'react-router-dom': {
// singleton: true,
// },
Expand Down
8 changes: 8 additions & 0 deletions apps/router-demo/router-remote2-2002/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# remote2

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-react@0.2.6

## 1.0.6

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions apps/router-demo/router-remote2-2002/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"name": "remote2",
"private": true,
"version": "1.0.6",
"version": "1.0.7",
"scripts": {
"dev": "rsbuild dev",
"build": "rsbuild build",
"preview": "rsbuild preview"
},
"dependencies": {
"@module-federation/enhanced": "workspace:*",
"@module-federation/bridge-react": "workspace:*",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5"
"@emotion/styled": "^11.11.5",
"@module-federation/bridge-react": "workspace:*",
"@module-federation/enhanced": "workspace:*"
},
"devDependencies": {
"@rsbuild/core": "^0.6.3",
"@rsbuild/plugin-react": "^0.6.3",
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^0.6.15",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "^5.4.5"
Expand Down
8 changes: 8 additions & 0 deletions apps/router-demo/router-remote3-2003/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# remote3

## 1.0.7

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6
- @module-federation/bridge-vue3@0.2.6

## 1.0.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/router-demo/router-remote3-2003/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "remote3",
"private": true,
"version": "1.0.6",
"version": "1.0.7",
"scripts": {
"dev": "rsbuild dev",
"build": "rsbuild build",
Expand Down
23 changes: 22 additions & 1 deletion apps/runtime-demo/3005-runtime-host/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,28 @@ module.exports = composePlugins(withNx(), withReact(), (config, context) => {
name: 'runtime_host',
remotes: {
// remote2: 'runtime_remote2@http://localhost:3007/remoteEntry.js',
remote1: 'runtime_remote1@http://127.0.0.1:3006/mf-manifest.json',
// remote1: 'runtime_remote1@http://127.0.0.1:3006/mf-manifest.json',
remote1: `promise new Promise((resolve)=>{
const raw = 'runtime_remote1@http://127.0.0.1:3006/remoteEntry.js'
const [_, remoteUrlWithVersion] = raw.split('@')
const script = document.createElement('script')
script.src = remoteUrlWithVersion
script.onload = () => {
const proxy = {
get: (request) => window.runtime_remote1.get(request),
init: (arg) => {
try {
return window.runtime_remote1.init(arg)
} catch(e) {
console.log('runtime_remote1 container already initialized')
}
}
}
resolve(proxy)
}
document.head.appendChild(script);
})`,
},
// library: { type: 'var', name: 'runtime_remote' },
filename: 'remoteEntry.js',
Expand Down
7 changes: 7 additions & 0 deletions apps/runtime-demo/3008-runtime-remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 3008-runtime-remote

## 1.0.17

### Patch Changes

- Updated dependencies [4488064]
- @module-federation/enhanced@0.2.6

## 1.0.16

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions apps/runtime-demo/3008-runtime-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "3008-runtime-remote",
"private": true,
"version": "1.0.16",
"version": "1.0.17",
"scripts": {
"dev": "rsbuild dev",
"build": "rsbuild build",
"preview": "rsbuild preview"
},
"dependencies": {
"@module-federation/enhanced": "workspace:*",
"react": "^18.3.0",
"react-dom": "^18.3.0",
"@module-federation/enhanced": "workspace:*"
"react-dom": "^18.3.0"
},
"devDependencies": {
"@rsbuild/core": "^0.6.7",
"@rsbuild/plugin-react": "^0.6.7"
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^0.6.15"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@rollup/plugin-alias": "5.1.0",
"@rollup/plugin-replace": "5.0.7",
"@rspack/core": "^0.5.4",
"@rspack/dev-server": "^0.5.4",
"@rspack/core": "^0.5.9",
"@rspack/dev-server": "^0.5.9",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
Expand Down
7 changes: 7 additions & 0 deletions packages/bridge/bridge-react-webpack-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @module-federation/bridge-react-webpack-plugin

## 0.2.6

### Patch Changes

- Updated dependencies [91bf689]
- @module-federation/sdk@0.2.6

## 0.2.5

### 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.2.5",
"version": "0.2.6",
"publishConfig": {
"access": "public"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/bridge/bridge-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @module-federation/bridge-react

## 0.2.6

### Patch Changes

- @module-federation/bridge-shared@0.2.6

## 0.2.5

### Patch Changes
Expand Down
Loading

0 comments on commit c4390f5

Please sign in to comment.