Skip to content

Commit

Permalink
Merge branch 'remove-hoisted-runtime-experiment' into refactor-runtim…
Browse files Browse the repository at this point in the history
…e-hoist-plugins
  • Loading branch information
ScriptedAlchemy committed Feb 6, 2025
2 parents cf04e7e + 2b7ba18 commit 22941fb
Show file tree
Hide file tree
Showing 63 changed files with 13,774 additions and 3,270 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-planets-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@module-federation/bridge-vue3': patch
---

fix(vue3-bridge): bridge-vue3 parameter lossing issue
5 changes: 5 additions & 0 deletions .changeset/bright-planets-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@module-federation/modern-js': patch
---

chore: use new modern.js plugin for improved functionality
4 changes: 3 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/devtools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-modern-ssr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-modern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-next-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-next-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-router.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
fetch-depth: 0

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
issues:
types: [labeled]

permissions:
contents: read
issues: write

jobs:
reply-labeled:
if: github.repository == 'module-federation/core'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pr-label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- opened
- edited

permissions:
pull-requests: write
contents: read

jobs:
change-labeling:
name: Labeling for changes
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
fetch-depth: 10

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ jobs:
fetch-depth: 25

- name: Install Pnpm
run: corepack enable
run: |
corepack prepare [email protected] --activate
corepack enable
- name: Setup Node.js 18
uses: actions/setup-node@v3
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/dynamic-nested-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/dynamic-remote-new-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/dynamic-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/nested-remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/remote-new-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs-ssr/remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~16.11.7",
"@types/react": "~18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/modernjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
],
"dependencies": {
"@babel/runtime": "7.26.0",
"@modern-js/runtime": "2.60.6",
"@modern-js/runtime": "2.64.0",
"@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.6",
"@modern-js/app-tools": "2.64.0",
"@modern-js/eslint-config": "2.59.0",
"@modern-js/tsconfig": "2.60.6",
"@modern-js/tsconfig": "2.64.0",
"@types/jest": "~29.5.0",
"@types/node": "~20.12.12",
"@types/react": "~18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/router-demo/router-host-2000/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const App = () => {
path="/remote2/*"
Component={() => <Remote2App style={{ padding: '20px' }} />}
/>
<Route path="/remote3/*" Component={() => <Remote3App />} />
<Route path="/remote3/*" Component={() => <Remote3App test="123" />} />
<Route path="/memory-router/*" Component={() => <Wraper3 />} />
<Route
path="/remote-render-error/*"
Expand Down
9 changes: 9 additions & 0 deletions apps/router-demo/router-remote3-2003/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@
</template>

<style scoped></style>

<script lang="ts" setup>
interface Props {
test?: string;
}
const props = defineProps<Props>();
console.log('props', props);
</script>
11 changes: 6 additions & 5 deletions apps/router-demo/router-remote3-2003/src/export-app.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { createApp } from 'vue';
import App from './App.vue';
import './index.css';
import router from './router';
import { createBridgeComponent } from '@module-federation/bridge-vue3';
import './index.css';

export default createBridgeComponent({
rootComponent: App,
appOptions: () => ({
router,
}),
appOptions: ({ app }) => {
// Optional: adding a plugin to the new Vue instance on the host application side
// app.use(customPlugin);
return { router };
},
});
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"changegen": "./changeset-gen.js --path ./packages/enhanced --staged && ./changeset-gen.js --path ./packages/node --staged && ./changeset-gen.js --path ./packages/runtime --staged && ./changeset-gen.js --path ./packages/data-prefetch --staged && ./changeset-gen.js --path ./packages/nextjs-mf --staged && ./changeset-gen.js --path ./packages/dts-plugin --staged",
"commitgen:staged": "./commit-gen.js --path ./packages --staged",
"commitgen:main": "./commit-gen.js --path ./packages",
"changeset:status": "changeset status"
"changeset:status": "changeset status",
"generate:schema": "nx run enhanced:generate:schema && nx format:write"
},
"pnpm": {
"packageExtensions": {
Expand Down Expand Up @@ -91,7 +92,7 @@
"tapable": "2.2.1",
"tsup": "7.2.0",
"typedoc": "0.25.8",
"undici": "5.28.4",
"undici": "5.28.5",
"unplugin": "1.9.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 22941fb

Please sign in to comment.