Merge branch 'main' into pr7-enhanced-filtering

Author: ScriptedAlchemy

.changeset/chatty-avocados-vanish.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/runtime': patch
+---
+
+fix(runtime): support TypeScript moduleResolution NodeNext

apps/router-demo/router-remote2-2002/package.json

@@ -14,7 +14,8 @@
     "@module-federation/rsbuild-plugin": "workspace:*",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.24.1"
+    "react-router-dom": "6.24.1",
+    "@module-federation/runtime": "workspace:*"
   },
   "devDependencies": {
     "@rsbuild/core": "^1.3.21",

apps/router-demo/router-remote2-2002/src/bootstrap.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import App from './App';
+import App from './App.jsx';
 
 //@ts-ignore
 const root = createRoot(document.getElementById('root')!);

apps/router-demo/router-remote2-2002/src/export-App.tsx

@@ -1,5 +1,6 @@
-import App from './App';
+import App from './App.jsx';
 import { createBridgeComponent } from '@module-federation/bridge-react/v18';
+import { createInstance, getInstance } from '@module-federation/runtime';
 
 // @ts-ignore
 export const provider = createBridgeComponent({

apps/router-demo/router-remote2-2002/tsconfig.json

@@ -3,13 +3,13 @@
     "baseUrl": "./",
     "target": "ES2020",
     "lib": ["DOM", "ES2020"],
-    "module": "ESNext",
+    "module": "NodeNext",
     "jsx": "react-jsx",
     "strict": true,
     "skipLibCheck": true,
     "isolatedModules": true,
     "resolveJsonModule": true,
-    "moduleResolution": "bundler",
+    "moduleResolution": "NodeNext",
     "useDefineForClassFields": true
   },
   "include": ["src"]

packages/runtime/rollup.config.cjs

@@ -76,6 +76,67 @@ module.exports = (rollupConfig, projectOptions) => {
         { src: 'packages/runtime/LICENSE', dest: 'packages/runtime/dist' },
       ],
     }),
+    {
+      name: 'fix-types-for-nodenext',
+      writeBundle() {
+        const path = require('path');
+        const fs = require('fs');
+
+        try {
+          // Read package.json exports to get the list of entries to fix
+          const pkgPath = path.join(__dirname, 'package.json');
+          const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+
+          if (!pkg.exports) {
+            console.warn(
+              '⚠️ No exports found in package.json, skipping type fix',
+            );
+            return;
+          }
+
+          // Extract entry names from exports (excluding "./*" pattern)
+          const typesToFix = Object.keys(pkg.exports)
+            .filter((key) => key !== './*')
+            .map((key) => (key === '.' ? 'index' : key.replace('./', '')))
+            .filter((name) => name); // Remove empty strings
+
+          if (typesToFix.length === 0) {
+            console.warn('⚠️ No valid exports found to fix types for');
+            return;
+          }
+
+          console.log('🔧 Auto-detected types to fix:', typesToFix);
+
+          let fixedCount = 0;
+          typesToFix.forEach((name) => {
+            const srcPath = path.join(__dirname, 'dist', 'src', `${name}.d.ts`);
+            const targetPath = path.join(__dirname, 'dist', `${name}.d.ts`);
+
+            try {
+              if (fs.existsSync(srcPath)) {
+                const content = fs.readFileSync(srcPath, 'utf8');
+                fs.writeFileSync(targetPath, content);
+                console.log(`✅ Fixed ${name}.d.ts for NodeNext compatibility`);
+                fixedCount++;
+              } else {
+                console.log(`⚠️ Source file not found: ${srcPath}`);
+              }
+            } catch (error) {
+              console.error(`❌ Error fixing ${name}.d.ts:`, error.message);
+            }
+          });
+
+          console.log(
+            `🎉 NodeNext compatibility fix completed! Fixed ${fixedCount}/${typesToFix.length} files`,
+          );
+        } catch (error) {
+          console.error(
+            '❌ Failed to read package.json or apply type fixes:',
+            error.message,
+          );
+        }
+      },
+    },
   );
 
   return rollupConfig;