Merge branch 'main' into rsbuild-rslib

Author: ScriptedAlchemy

.changeset/beige-meals-wash.md

@@ -0,0 +1,6 @@
+---
+'@module-federation/retry-plugin': minor
+'website-new': minor
+---
+
+Refactor(retry-plugin): unify retry behavior and improve resilience

.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

@@ -0,0 +1,57 @@
+# https://github.com/stackblitz-labs/pkg.pr.new
+name: Preview Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Release preview version branch (confirm release branch)'
+        required: true
+        default: 'main'
+
+permissions:
+  contents: read
+
+jobs:
+  preview:
+    if: github.repository == 'module-federation/core'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        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 [email protected] --activate
+          corepack enable
+
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      # Update npm to the latest version to enable OIDC
+      - name: Update npm
+        run: |
+          npm install -g npm@latest
+          npm --version
+
+      - name: Install deps
+        run: pnpm install
+
+      - name: Build and test Packages
+        run: |
+          git fetch origin main
+          npx nx run-many --targets=build --projects=tag:type:pkg --skip-nx-cache
+          ls -l packages/*/dist packages/*/package.json
+
+      - name: Publish Preview
+        run: |
+          pnpx [email protected] publish --compact --pnpm ./packages/*

.github/workflows/release.yml

@@ -25,23 +25,33 @@ jobs:
     name: Release
     if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' }}
     runs-on: ubuntu-latest
+    environment: npm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 25
+          ref: ${{ github.event.inputs.branch }}
 
-      - name: Install Pnpm
+      # Use corepack to install pnpm
+      - name: Setup Pnpm
         run: |
+          npm install -g corepack@latest --force
           corepack prepare [email protected] --activate
           corepack enable
 
-      - name: Setup Node.js 18
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          node-version: '18'
+          node-version: 22
           cache: 'pnpm'
 
+      # Update npm to the latest version to enable OIDC
+      - name: Update npm
+        run: |
+          npm install -g npm@latest
+          npm --version
+
       - name: Install deps
         run: pnpm install
 
@@ -52,15 +62,17 @@ jobs:
           npx nx run-many --targets=build --projects=tag:type:metro
           ls -l packages/*/dist packages/*/package.json
 
-      - name: Release
-        uses: module-federation/actions@v2
+      - uses: actions/github-script@v7
+        id: version_to_release
         with:
-          version: ${{ github.event.inputs.version  || 'next' }}
-          branch: ${{ github.event.inputs.branch }}
-          type: 'release'
-          tools: 'changeset'
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_SCOPED_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          REPOSITORY: ${{ github.repository }}
-          REF: ${{ github.ref }}
+          result-encoding: string
+          script: |
+            const fs = require('fs');
+            const packageJson = JSON.parse(fs.readFileSync('./packages/runtime/package.json', 'utf8'));
+            return 'v' + packageJson.version;
+
+      - name: Publish to npm
+        run: |
+          git tag ${{ steps.version_to_release.outputs.result }}
+          git push origin ${{ steps.version_to_release.outputs.result }}
+          pnpm -r publish --tag ${{ github.event.inputs.npm_tag }} --publish-branch ${{ github.event.inputs.branch }}

apps/router-demo/router-host-2000/src/App.tsx

@@ -5,7 +5,10 @@ import React, {
   Suspense,
 } from 'react';
 import { Route, Routes, useLocation } from 'react-router-dom';
-import { init, loadRemote } from '@module-federation/enhanced/runtime';
+import {
+  loadRemote,
+  createInstance,
+} from '@module-federation/enhanced/runtime';
 import { RetryPlugin } from '@module-federation/retry-plugin';
 import { createRemoteAppComponent } from '@module-federation/bridge-react';
 import Navigation from './navigation';
@@ -17,7 +20,6 @@ import { ErrorBoundary } from 'react-error-boundary';
 import Remote1AppNew from 'remote1/app';
 import type { ModuleFederationRuntimePlugin } from '@module-federation/enhanced/runtime';
 import { Spin } from 'antd';
-import { createInstance } from '@module-federation/enhanced/runtime';
 
 const fallbackPlugin: () => ModuleFederationRuntimePlugin = function () {
   return {

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

@@ -2,29 +2,32 @@ import { RetryPlugin } from '@module-federation/retry-plugin';
 
 const retryPlugin = () =>
   RetryPlugin({
-    fetch: {
-      // fallback: () => 'http://localhost:2001/mf-manifest.json',
-      // getRetryPath: (url) => {
-      //   return 'http://localhost:2001/mf-manifest.json?test=1';
-      // },
+    retryTimes: 3,
+    retryDelay: 1000,
+    onRetry: (params) => {
+      console.log('onRetry', params);
     },
-    script: {
-      retryTimes: 3,
-      retryDelay: 1000,
-      // moduleName: ['remote1'],
-      cb: (resolve, error) => {
-        if (error) {
-          throw new Error(
-            'The request failed three times and has now been abandoned',
-          );
-        }
-        return setTimeout(() => {
-          resolve(error);
-        }, 1000);
-      },
-      getRetryPath: (url) => {
-        return 'http://localhost:2001/remote1.js?test=2';
-      },
+    onSuccess: (params) => {
+      console.log('onSuccess', params);
+    },
+    onError: (params) => {
+      console.log('onError', params);
+    },
+    manifestDomains: [
+      'https://m1.example.com',
+      'https://m2.example.com',
+      'https://m3.example.com',
+    ],
+    domains: [
+      'http://localhost:2011',
+      'http://localhost:2021',
+      'http://localhost:2031',
+    ],
+    addQuery: ({ times, originalQuery }) => {
+      return `${originalQuery}&retry=${times}&retryTimeStamp=${new Date().valueOf()}`;
+    },
+    fetchOptions: {
+      method: 'GET',
     },
   });
 export default retryPlugin;