chore: update usage

module-federation · Jan 6, 2025 · f07aee4 · f07aee4
1 parent 6709d80
commit f07aee4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/apps/router-demo/router-remote4-2004/rsbuild.config.ts b/apps/router-demo/router-remote4-2004/rsbuild.config.ts
@@ -29,7 +29,7 @@ export default defineConfig({
       },
       shared: ['react', 'react-dom'],
       // getPublicPath: `return 'http://localhost:2004/'`,
-      getPublicPath: `function(){return 'http://localhost:2004/'}`,
+      getPublicPath: `function(originalPublicPath){console.log(originalPublicPath);__webpack_require__.p = 'http://localhost:2004/'}`,
     }),
   ],
 });
diff --git a/packages/rspack/package.json b/packages/rspack/package.json
@@ -34,7 +34,6 @@
     "@module-federation/sdk": "workspace:*"
   },
   "devDependencies": {
-    "@types/btoa": "1.2.5",
     "@rspack/core": "^1.0.2"
   },
   "exports": {

diff --git a/packages/rspack/src/RemoteEntryPlugin.ts b/packages/rspack/src/RemoteEntryPlugin.ts
@@ -1,4 +1,5 @@
 import type { Compiler, RspackPluginInstance } from '@rspack/core';
+// @ts-ignore
 import pBtoa from 'btoa';
 
 const charMap: Record<string, string> = {
@@ -39,9 +40,7 @@ export class RemoteEntryPlugin implements RspackPluginInstance {
         compiler.webpack.RuntimeGlobals.publicPath
       } = new Function(${JSON.stringify(sanitizedPublicPath)})()`;
     } else {
-      code = `${
-        compiler.webpack.RuntimeGlobals.publicPath
-      } = (${sanitizedPublicPath})()`;
+      code = `(${sanitizedPublicPath}(${compiler.webpack.RuntimeGlobals.publicPath}))`;
     }
     const base64Code = pBtoa(code);
     const dataUrl = `data:text/javascript;base64,${base64Code}`;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml