Merge branch 'main' into feat/metro-e2e

Author: 2heal1

.changeset/hungry-countries-sleep.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/retry-plugin': patch
+---
+
+fix(retry-plugin): prevent query parameter accumulation across retries

.github/workflows/preview.yml

@@ -2,9 +2,12 @@
 name: Preview Release
 
 on:
- push:
- branches: [main]
  workflow_dispatch:
+ inputs:
+ branch:
+ description: 'Release preview version branch (confirm release branch)'
+ required: true
+ default: 'main'
 
 permissions:
  contents: read
@@ -19,6 +22,14 @@ jobs:
  uses: actions/checkout@v4
  with:
  fetch-depth: 25
+ ref: ${{ github.event.inputs.branch }}
+
+ # Use corepack to install pnpm
+ - name: Setup Pnpm
+ run: |
+ npm install -g corepack@latest --force
+ corepack prepare pnpm@8.11.0 --activate
+ corepack enable
 
  - name: Setup Node.js
  uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
@@ -27,14 +38,10 @@ jobs:
  cache: 'pnpm'
 
  # Update npm to the latest version to enable OIDC
- # Use corepack to install pnpm
- - name: Setup Package Managers
+ - name: Update npm
  run: |
  npm install -g npm@latest
  npm --version
- npm install -g corepack@latest --force
- corepack prepare pnpm@8.11.0 --activate
- corepack enable
 
  - name: Install deps
  run: pnpm install
@@ -47,5 +54,4 @@ jobs:
 
  - name: Publish Preview
  run: |
- npm i -g pkg-pr-new@0.0.58
- pkg-pr-new publish --compact --pnpm ./packages/*
+ pnpx pkg-pr-new@0.0.58 publish --compact --pnpm ./packages/*

.github/workflows/release.yml

@@ -31,6 +31,14 @@ jobs:
  uses: actions/checkout@v4
  with:
  fetch-depth: 25
+ ref: ${{ github.event.inputs.branch }}
+
+ # Use corepack to install pnpm
+ - name: Setup Pnpm
+ run: |
+ npm install -g corepack@latest --force
+ corepack prepare pnpm@8.11.0 --activate
+ corepack enable
 
  - name: Setup Node.js
  uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
@@ -39,14 +47,10 @@ jobs:
  cache: 'pnpm'
 
  # Update npm to the latest version to enable OIDC
- # Use corepack to install pnpm
- - name: Setup Package Managers
+ - name: Update npm
  run: |
  npm install -g npm@latest
  npm --version
- npm install -g corepack@latest --force
- corepack prepare pnpm@8.11.0 --activate
- corepack enable
 
  - name: Install deps
  run: pnpm install

apps/router-demo/router-host-2000/src/runtime-plugin/retry.ts

@@ -13,13 +13,19 @@ const retryPlugin = () =>
  onError: (params) => {
  console.log('onError', params);
  },
- manifestDomains: ['https://m1.example.com', 'https://m2.example.com'],
+ manifestDomains: [
+ 'https://m1.example.com',
+ 'https://m2.example.com',
+ 'https://m3.example.com',
+ ],
  domains: [
  'http://localhost:2011',
  'http://localhost:2021',
  'http://localhost:2031',
  ],
- addQuery: true,
+ addQuery: ({ times, originalQuery }) => {
+ return `${originalQuery}&retry=${times}&retryTimeStamp=${new Date().valueOf()}`;
+ },
  fetchOptions: {
  method: 'GET',
  },

packages/assemble-release-plan/package.json

@@ -32,7 +32,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core/",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/assemble-release-plan"
  },
  "dependencies": {

packages/bridge/bridge-react-webpack-plugin/package.json

@@ -8,7 +8,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/bridge-react-webpack-plugin"
  },
  "main": "./dist/index.cjs.js",

packages/bridge/bridge-react/package.json

@@ -9,7 +9,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/bridge-react"
  },
  "main": "./dist/index.cjs.js",

packages/bridge/bridge-shared/package.json

@@ -8,7 +8,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/bridge-shared"
  },
  "type": "module",

packages/bridge/vue3-bridge/package.json

@@ -4,7 +4,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/vue3-bridge"
  },
  "version": "0.18.4",

packages/chrome-devtools/package.json

@@ -4,7 +4,7 @@
  "license": "MIT",
  "repository": {
  "type": "git",
- "url": "https://github.com/module-federation/core",
+ "url": "git+https://github.com/module-federation/core.git",
  "directory": "packages/chrome-devtools"
  },
  "scripts": {