@umijs/plugins 4.0.33 → 4.0.35

package/dist/qiankun/slave.js

@@ -247,9 +247,10 @@ export { connectMaster } from './connectMaster';
             });
           },
           onProxyRes: (0, import_http_proxy_middleware.responseInterceptor)(async (responseBuffer, proxyRes, req2, res2) => {
+            var _a2;
             if (proxyRes.statusCode === 302) {
               const hostname = req2.hostname;
-              const port = process.env.PORT;
+              const port = process.env.PORT || ((_a2 = api.appData) == null ? void 0 : _a2.port);
               const goto = `${hostname}:${port}`;
               const redirectUrl = proxyRes.headers.location.replace(encodeURIComponent(new URL(masterEntry).hostname), encodeURIComponent(goto)) || masterEntry;
               const redirectMessage = `[@umijs/plugin-qiankun]: redirect to ${redirectUrl}`;

package/dist/styled-components.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from 'umi';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/styled-components.js

@@ -0,0 +1,61 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/styled-components.ts
+var styled_components_exports = {};
+__export(styled_components_exports, {
+  default: () => styled_components_default
+});
+module.exports = __toCommonJS(styled_components_exports);
+var import_path = require("path");
+var styled_components_default = (api) => {
+  api.describe({
+    key: "styledComponents",
+    config: {
+      schema(Joi) {
+        return Joi.object({
+          babelPlugin: Joi.object()
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.modifyBabelPresetOpts((memo) => {
+    if (api.env === "development") {
+      memo.pluginStyledComponents = {
+        ...api.config.styledComponents.babelPlugin
+      };
+    }
+    return memo;
+  });
+  const libPath = (0, import_path.dirname)(require.resolve("styled-components/package"));
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: "index.tsx",
+      content: `
+import styled, { ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetManager, useTheme } from '${libPath}';
+export { styled, ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetManager, useTheme };
+      `
+    });
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/utils/modelUtils.d.ts

@@ -26,7 +26,6 @@ export declare class ModelUtils {
         sort?: object;
         extraModels: string[];
     }): Model[];
-    getSortedNamespaces(models: Model[]): string[];
     getModels(opts: {
         base: string;
         pattern?: string;
@@ -35,6 +34,7 @@ export declare class ModelUtils {
         content: string;
         file: string;
     }): boolean;
+    static topologicalSort: (models: Model[]) => string[];
     static getModelsContent(models: Model[]): string;
 }
 export {};

package/dist/utils/modelUtils.js

@@ -89,7 +89,7 @@ var Model = class {
     return [...deps];
   }
 };
-var ModelUtils = class {
+var _ModelUtils = class {
   constructor(api, opts) {
     this.opts = {};
     this.count = 1;
@@ -120,44 +120,11 @@ var ModelUtils = class {
       throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(", ")}`);
     }
     if (opts.sort) {
-      const namespaces2 = this.getSortedNamespaces(models);
+      const namespaces2 = _ModelUtils.topologicalSort(models);
       models.sort((a, b) => namespaces2.indexOf(a.namespace) - namespaces2.indexOf(b.namespace));
     }
     return models;
   }
-  getSortedNamespaces(models) {
-    let final = [];
-    models.forEach((model, index) => {
-      const { deps, namespace } = model;
-      if (deps && deps.length) {
-        const itemGroup = [...deps, namespace];
-        const cannotUse = [namespace];
-        for (let i = 0; i <= index; i += 1) {
-          if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
-            if (!cannotUse.includes(models[i].namespace)) {
-              cannotUse.push(models[i].namespace);
-              i = -1;
-            }
-          }
-        }
-        const errorList = deps.filter((v) => cannotUse.includes(v));
-        if (errorList.length) {
-          throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(", ")}`);
-        }
-        const intersection = final.filter((v) => itemGroup.includes(v));
-        if (intersection.length) {
-          const finalIndex = final.indexOf(intersection[0]);
-          final = final.slice(0, finalIndex).concat(itemGroup).concat(final.slice(finalIndex + 1));
-        } else {
-          final.push(...itemGroup);
-        }
-      }
-      if (!final.includes(namespace)) {
-        final.push(namespace);
-      }
-    });
-    return [...new Set(final)];
-  }
   getModels(opts) {
     return import_plugin_utils.glob.sync(opts.pattern || "**/*.{ts,js}", {
       cwd: opts.base,
@@ -222,6 +189,55 @@ ${modelProps.join("\n")}
 } as const`;
   }
 };
+var ModelUtils = _ModelUtils;
+ModelUtils.topologicalSort = (models) => {
+  const graph = [];
+  const namespaceToNode = {};
+  models.forEach((model, index) => {
+    const node = {
+      namespace: model.namespace,
+      deps: model.deps,
+      index,
+      in: 0,
+      childs: []
+    };
+    if (namespaceToNode[model.namespace]) {
+      throw new Error(`Duplicate namespace in models: ${model.namespace}`);
+    }
+    namespaceToNode[model.namespace] = node;
+    graph.push(node);
+  });
+  graph.forEach((node) => {
+    node.deps.forEach((dep) => {
+      const depNode = namespaceToNode[dep];
+      if (!depNode) {
+        throw new Error(`Model namespace not found: ${dep}`);
+      }
+      depNode.childs.push(node);
+      node.in++;
+    });
+  });
+  const queue = [];
+  while (true) {
+    const zeronode = graph.find((n) => {
+      return n && n.in === 0;
+    });
+    if (!zeronode) {
+      break;
+    }
+    queue.push(zeronode.namespace);
+    zeronode.childs.forEach((child) => {
+      child.in--;
+    });
+    zeronode.childs = [];
+    delete graph[zeronode.index];
+  }
+  const leftNodes = graph.filter(Boolean);
+  if (leftNodes.length > 0) {
+    throw new Error(`Circle dependency detected in models: ${leftNodes.map((m) => import_plugin_utils.chalk.red(m.namespace)).join(", ")}`);
+  }
+  return queue;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Model,

package/dist/valtio.js

@@ -34,7 +34,8 @@ var valtio_default = (api) => {
       schema(joi) {
         return joi.object();
       }
-    }
+    },
+    enableBy: api.EnableBy.config
   });
   const libPath = (0, import_utils.winPath)((0, import_path.dirname)(require.resolve("@umijs/valtio/package.json")));
   api.onGenerateFiles(() => {
@@ -42,12 +43,18 @@ var valtio_default = (api) => {
       path: "index.ts",
       content: `
 export {
-  proxy, useSnapshot, snapshot, subscribe,
+  proxy,
+  useSnapshot,
+  snapshot,
+  subscribe,
+  subscribeKey,
   proxyWithComputed,
   proxyWithHistory,
   proxyWithDevtools,
   proxyMap,
   proxySet,
+  derive,
+  underive,
 } from '${libPath}';
       `
     });

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -33,7 +33,11 @@ function patchMicroAppRouteComponent(routes: any[]) {
   });
 
   const getRootRoutes = (routes: any[]) => {
-    const rootRoute = routes.find((route) => route.path === '/');
+    // 重定向根路由不能用作 microAppRuntimeRoutes 的父节点
+    const rootRoute = routes.find(
+      // 基于是否有 .to props 判断是否为 redirect
+      (route) => route.path === '/' && !route.element?.props?.to,
+    );
     if (rootRoute) {
       // 如果根路由是叶子节点，则直接返回其父节点
       if (!rootRoute.children?.length) {

package/libs/qiankun/slave/lifecycles.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { getPluginManager } from '@@/core/plugin';
 import ReactDOM from 'react-dom';
-import { ApplyPluginsType, __getRoot } from 'umi';
+import { ApplyPluginsType, __getRoot, history } from 'umi';
 import { setModelState } from './qiankunModel';
 
 const noop = () => {};
@@ -23,22 +23,22 @@ let hasMountedAtLeastOnce = false;
 export default () => defer.promise;
 export const contextOptsStack: any[] = [];
 
-// function normalizeHistory(
-//   history?: 'string' | Record<string, any>,
-//   base?: string,
-// ) {
-//   let normalizedHistory: Record<string, any> = {};
-//   if (base) normalizedHistory.basename = base;
-//   if (history) {
-//     if (typeof history === 'string') {
-//       normalizedHistory.type = history;
-//     } else {
-//       normalizedHistory = history;
-//     }
-//   }
-//
-//   return normalizedHistory;
-// }
+function normalizeHistory(
+  history?: 'string' | Record<string, any>,
+  base?: string,
+) {
+  let normalizedHistory: Record<string, any> = {};
+  if (base) normalizedHistory.basename = base;
+  if (history) {
+    if (typeof history === 'string') {
+      normalizedHistory.type = history;
+    } else {
+      normalizedHistory = history;
+    }
+  }
+
+  return normalizedHistory;
+}
 
 async function getSlaveRuntime() {
   const config = await getPluginManager().applyPlugins({
@@ -73,21 +73,24 @@ export function genMount(mountElementId: string) {
         await slaveRuntime.mount(props);
       }
 
-      const { type, ...historyOpts } = props?.history || {};
+      const { type, ...historyOpts } = normalizeHistory(
+        props?.history || {},
+        props?.base,
+      );
 
       // 更新 clientRender 配置
       const clientRenderOpts = {
-        // 默认开启
-        // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
         callback: () => {
+          // 默认开启
+          // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
           if (props.autoSetLoading && typeof props.setLoading === 'function') {
             props.setLoading(false);
           }
 
-          // // 支持将子应用的 history 回传给父应用
-          // if (typeof props?.onHistoryInit === 'function') {
-          //   props.onHistoryInit(history);
-          // }
+          // 支持将子应用的 history 回传给父应用
+          if (typeof props?.onHistoryInit === 'function') {
+            props.onHistoryInit(history);
+          }
         },
         // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
@@ -125,14 +128,6 @@ export function genMount(mountElementId: string) {
       defer.resolve();
     }
 
-    // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
-    // 考虑到 react 18 之后 callback 不再准
-    // 所以在这里直接返回，而不使用 ReactDOM.render 的第三个参数
-    if (typeof props !== 'undefined') {
-      if (props.autoSetLoading && typeof props.setLoading === 'function') {
-        props.setLoading(false);
-      }
-    }
     hasMountedAtLeastOnce = true;
   };
 }

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -1,13 +1,21 @@
 // @ts-nocheck
 import qiankunRender, { contextOptsStack } from './lifecycles';
+import { createHistory } from '@@/core/history';
 
 export function render(oldRender: any) {
   return qiankunRender().then(oldRender);
 }
 
-export function modifyContextOpts(memo: any) {
+export function modifyClientRenderOpts(memo: any) {
   // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
   const clientRenderOpts = contextOptsStack.shift();
+  if (clientRenderOpts) {
+    clientRenderOpts.history = createHistory({
+      type: clientRenderOpts.historyType,
+      basename: clientRenderOpts.basename,
+      ...clientRenderOpts.historyOpts,
+    });
+  }
   return {
     ...memo,
     ...clientRenderOpts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.33",
+  "version": "4.0.35",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,8 +27,8 @@
     "@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.33",
-    "@umijs/valtio": "^1.0.0",
+    "@umijs/bundler-utils": "4.0.35",
+    "@umijs/valtio": "^1.0.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -45,11 +45,12 @@
     "react-intl": "3.12.1",
     "react-redux": "^8.0.2",
     "redux": "^4.2.0",
+    "styled-components": "6.0.0-beta.6",
     "warning": "^4.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.33"
+    "umi": "4.0.35"
   },
   "publishConfig": {
     "access": "public"