@umijs/plugins 4.0.35 → 4.0.37

package/dist/mf.js

@@ -71,7 +71,7 @@ function mf(api) {
     const mfConfig = {
       name,
       remotes,
-      filename: "remote.js",
+      filename: api.config.hash ? "remote.[contenthash:8].js" : "remote.js",
       exposes,
       shared,
       library: api.config.mf.library

package/libs/model.tsx

@@ -160,6 +160,8 @@ export function useModel<N extends Namespaces, S>(
           : data;
         const previousState = stateRef.current;
         if (!isEqual(currentState, previousState)) {
+          // 避免 currentState 拿到的数据是老的，从而导致 isEqual 比对逻辑有问题
+          stateRef.current = currentState;
           setState(currentState);
         }
       }

package/libs/qiankun/master/MicroApp.tsx

@@ -262,16 +262,19 @@ export const MicroApp = forwardRef(
         ? (loading) => <MicroAppLoader loading={loading} />
         : null);
 
+    const microAppWrapperClassName = wrapperClassName ? `${wrapperClassName} qiankun-micro-app-wrapper` : 'qiankun-micro-app-wrapper';
+    const microAppClassName = className ? `${className} qiankun-micro-app-container` : 'qiankun-micro-app-container';
+
     return Boolean(microAppLoader) || Boolean(microAppErrorBoundary) ? (
-      <div style={{ position: 'relative' }} className={wrapperClassName}>
+      <div style={{ position: 'relative' }} className={microAppWrapperClassName}>
         {Boolean(microAppLoader) && microAppLoader(loading)}
         {Boolean(microAppErrorBoundary) &&
           Boolean(error) &&
           microAppErrorBoundary(error)}
-        <div ref={containerRef} className={className} />
+        <div ref={containerRef} className={microAppClassName} />
       </div>
     ) : (
-      <div ref={containerRef} className={className} />
+      <div ref={containerRef} className={microAppClassName} />
     );
   },
 );

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -9,15 +9,22 @@ export function render(oldRender: any) {
 export function modifyClientRenderOpts(memo: any) {
   // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
   const clientRenderOpts = contextOptsStack.shift();
-  if (clientRenderOpts) {
+  const { basename, historyType } = memo;
+
+  const newBasename = clientRenderOpts?.basename || basename;
+  const newHistoryType = clientRenderOpts?.historyType || historyType;
+
+  if (newHistoryType !== historyType || newBasename !== basename) {
     clientRenderOpts.history = createHistory({
-      type: clientRenderOpts.historyType,
-      basename: clientRenderOpts.basename,
+      type: newHistoryType,
+      basename: newBasename,
       ...clientRenderOpts.historyOpts,
     });
   }
   return {
     ...memo,
     ...clientRenderOpts,
+    basename: newBasename,
+    historyType: newHistoryType,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.35",
+  "version": "4.0.37",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.35",
+    "@umijs/bundler-utils": "4.0.37",
     "@umijs/valtio": "^1.0.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.35"
+    "umi": "4.0.37"
   },
   "publishConfig": {
     "access": "public"