@umijs/plugins 4.6.65 → 4.6.67

package/dist/qiankun/slave.js

@@ -92,6 +92,59 @@ function isSlaveEnable(opts) {
   }
   return !!process.env.INITIAL_QIANKUN_SLAVE_OPTIONS;
 }
+function isUtoopackEnable(api) {
+  return Boolean(
+    api.appData.bundler === "utoopack" || api.userConfig.utoopack || api.config.utoopack || process.env.FORCE_UTOOPACK
+  );
+}
+function getUtoopackQiankunLifecycleProxyScript(appName) {
+  return `(function() {
+  var appName = ${JSON.stringify(appName)};
+  var lifecycleNames = ['bootstrap', 'mount', 'unmount', 'update'];
+  var global = window;
+  var existed = global[appName];
+  if (existed && typeof existed.bootstrap === 'function' && typeof existed.mount === 'function' && typeof existed.unmount === 'function') {
+    return;
+  }
+  var resolveReady;
+  var ready = new Promise(function(resolve) {
+    resolveReady = resolve;
+  });
+  var proxy = {};
+  lifecycleNames.forEach(function(name) {
+    proxy[name] = function() {
+      var context = this;
+      var args = arguments;
+      return ready.then(function(lifecycles) {
+        var lifecycle = lifecycles && lifecycles[name];
+        if (typeof lifecycle !== 'function') {
+          if (name === 'update') {
+            return undefined;
+          }
+          throw new Error('[plugins/qiankun]: lifecycle ' + name + ' is not available for ' + appName + '.');
+        }
+        return lifecycle.apply(context, args);
+      });
+    };
+  });
+  Object.defineProperty(global, appName, {
+    configurable: true,
+    enumerable: true,
+    get: function() {
+      return proxy;
+    },
+    set: function(lifecycles) {
+      Object.defineProperty(global, appName, {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: lifecycles
+      });
+      resolveReady(lifecycles);
+    }
+  });
+})();`;
+}
 var slave_default = (api) => {
   api.describe({
     key: "qiankun-slave",
@@ -172,7 +225,7 @@ export interface IRuntimeConfig {
     ];
   });
   api.chainWebpack((config, { ssr }) => {
-    if (ssr || api.userConfig.utoopack) {
+    if (ssr || isUtoopackEnable(api)) {
       return;
     }
     (0, import_assert.default)(api.pkg.name, "You should have name in package.json.");
@@ -185,10 +238,16 @@ export interface IRuntimeConfig {
     return config;
   });
   api.modifyHTML(($) => {
+    var _a, _b;
+    const appName = ((_b = (_a = api.config.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.appName) || api.pkg.name;
+    const lifecycleProxyScript = isUtoopackEnable(api) && appName ? `<script>${getUtoopackQiankunLifecycleProxyScript(appName)}</script>` : "";
     $("script").each((_, el) => {
       const scriptEl = $(el);
       const umiEntry = /\/?umi(\.\w+)?\.js$/g;
       if (umiEntry.test(scriptEl.attr("src") ?? "")) {
+        if (lifecycleProxyScript) {
+          scriptEl.before(lifecycleProxyScript);
+        }
         scriptEl.attr("entry", "");
       }
     });
@@ -214,7 +273,7 @@ export const mount = isServer ? qiankun_noop : qiankun_genMount('${api.config.mo
 export const unmount = isServer ? qiankun_noop : qiankun_genUnmount('${api.config.mountElementId}');
 export const update = isServer ? qiankun_noop : qiankun_genUpdate();
 
-if (!isServer && ${Boolean(api.userConfig.utoopack)}) {
+if (!isServer && ${isUtoopackEnable(api)}) {
   window['${appName}'] = {
     bootstrap,
     mount,

package/libs/qiankun/slave/lifecycles.ts

@@ -146,14 +146,14 @@ export function genUnmount(mountElementId: string) {
   return async (props: any) => {
     const root = __getRoot();
 
-    // support react 18 unmount
+    // support react 18+ unmount
     if (typeof root?.unmount === 'function') {
       root.unmount();
     } else {
       const container = props?.container
         ? props.container.querySelector(`#${mountElementId}`)
         : document.getElementById(mountElementId);
-      if (container) {
+      if (container && typeof ReactDOM.unmountComponentAtNode === 'function') {
         ReactDOM.unmountComponentAtNode(container);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.65",
+  "version": "4.6.67",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -39,19 +39,19 @@
     "intl": "1.2.5",
     "lodash": "^4.18.1",
     "moment": "^2.29.4",
-    "qiankun": "^2.10.1",
+    "qiankun": "2.10.17-beta.0",
     "react-intl": "3.12.1",
     "react-redux": "^8.0.5",
     "redux": "^4.2.1",
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/valtio": "1.0.4",
-    "@umijs/bundler-utils": "4.6.65"
+    "@umijs/bundler-utils": "4.6.67",
+    "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.65"
+    "umi": "4.6.67"
   },
   "publishConfig": {
     "access": "public"