@umijs/plugins 4.0.0-canary.20220506.2 → 4.0.0-canary.20220506.3

package/dist/layout.js

@@ -137,7 +137,8 @@ const { formatMessage } = useIntl();
         }
         if (menuItemProps.path && location.pathname !== menuItemProps.path) {
           return (
-            <Link to={menuItemProps.path} target={menuItemProps.target}>
+            // handle wildcard route path, for example /slave/* from qiankun
+            <Link to={menuItemProps.path.replace('/*', '')} target={menuItemProps.target}>
               {defaultDom}
             </Link>
           );

package/dist/qiankun/master.js

@@ -48,7 +48,7 @@ exports.default = (api) => {
                 const normalizedRouteProps = JSON.stringify(routeProps).replace(/"/g, "'");
                 route.file = `(async () => {
           const { getMicroAppRouteComponent } = await import('@@/plugin-qiankun-master/getMicroAppRouteComponent');
-          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
+          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', routePath: '${route.path}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
         })()`;
             }
         });

package/libs/qiankun/master/common.ts

@@ -48,6 +48,7 @@ export function patchMicroAppRoute(
   getMicroAppRouteComponent: (opts: {
     appName: string;
     base: string;
+    routePath: string;
     masterHistoryType: string;
     routeProps?: any;
   }) => string | ReactComponentElement<any>,
@@ -88,6 +89,7 @@ export function patchMicroAppRoute(
     const opts = {
       appName: microAppName,
       base,
+      routePath: route.path,
       masterHistoryType,
       routeProps,
     };

package/libs/qiankun/master/getMicroAppRouteComponent.tsx.tpl

@@ -1,22 +1,20 @@
 import React from 'react';
 import { MicroApp } from './MicroApp';
-import { useRouteData } from 'umi';
 
 export function getMicroAppRouteComponent(opts: {
   appName: string;
   base: string;
+  routePath: string;
   masterHistoryType: string;
   routeProps?: any;
 }) {
-  const { base, masterHistoryType, appName, routeProps } = opts;
+  const { base, masterHistoryType, appName, routeProps, routePath } = opts;
   const RouteComponent = () => {
-    const { route } = useRouteData();
-
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 
     // 拼接子应用挂载路由
-    let runtimeMatchedBase = umiConfigBase + route.path.replace('/*', '');
+    let runtimeMatchedBase = umiConfigBase + routePath.replace('/*', '');
 
     {{#dynamicRoot}}
     // @see https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/htmlUtils.ts#L102

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -50,6 +50,7 @@ function patchMicroAppRouteComponent(routes: any[]) {
       const patchRoute = (route: any) => {
         patchMicroAppRoute(route, getMicroAppRouteComponent, {
           base,
+          routePath: route.path,
           masterHistoryType,
           routeBindingAlias,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220506.2",
+  "version": "4.0.0-canary.20220506.3",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.35.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220506.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220506.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220506.2"
+    "umi": "4.0.0-canary.20220506.3"
   },
   "publishConfig": {
     "access": "public"

package/dist/access.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../src/access.ts"],"names":[],"mappings":";AAKA,wBA8IE"}

package/dist/analytics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../src/analytics.ts"],"names":[],"mappings":";AAEA,wBAqEE"}

package/dist/antd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"antd.d.ts","sourceRoot":"","sources":["../src/antd.ts"],"names":[],"mappings":";AAMA,wBAgJE"}

package/dist/dva.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dva.d.ts","sourceRoot":"","sources":["../src/dva.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;;AAGvD,wBA8IE;AAEF,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,GAAG,IAAI,cAmB5C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,WAIrC"}

package/dist/icons.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../src/icons.ts"],"names":[],"mappings":";AAEA,wBAEE"}

package/dist/initial-state.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initial-state.d.ts","sourceRoot":"","sources":["../src/initial-state.ts"],"names":[],"mappings":";AAGA,wBAuHE"}

package/dist/layout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":";AAQA,wBAqhBE"}

package/dist/locale.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"locale.d.ts","sourceRoot":"","sources":["../src/locale.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WACb,CAAC;;AAGxC,wBAkOE"}

package/dist/model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";AAQA,wBA+DE"}

package/dist/moment2dayjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"moment2dayjs.d.ts","sourceRoot":"","sources":["../src/moment2dayjs.ts"],"names":[],"mappings":";AASA,wBAgGE"}

package/dist/qiankun/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/qiankun/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,kCAAkC,2BAA2B,CAAC;AAC3E,eAAO,MAAM,oCAAoC,6BAA6B,CAAC;AAC/E,eAAO,MAAM,iBAAiB,4BAA4B,CAAC"}

package/dist/qiankun/master.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"master.d.ts","sourceRoot":"","sources":["../../src/qiankun/master.ts"],"names":[],"mappings":"AAYA,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,GAAG,CAAA;CAAE,WAMvD;;AAED,wBA0IE"}

package/dist/qiankun/slave.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"slave.d.ts","sourceRoot":"","sources":["../../src/qiankun/slave.ts"],"names":[],"mappings":";AAmBA,wBAkLE"}

package/dist/qiankun.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"qiankun.d.ts","sourceRoot":"","sources":["../src/qiankun.ts"],"names":[],"mappings":";AAEA,wBAkBE"}

package/dist/request.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":";AAIA,wBAsTE"}

package/dist/tailwindcss.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tailwindcss.d.ts","sourceRoot":"","sources":["../src/tailwindcss.ts"],"names":[],"mappings":";AAIA,wBA2CE"}

package/dist/unocss.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"unocss.d.ts","sourceRoot":"","sources":["../src/unocss.ts"],"names":[],"mappings":";AAMA,wBA6CE"}

package/dist/utils/astUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"astUtils.d.ts","sourceRoot":"","sources":["../../src/utils/astUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,0CAA0C,CAAC;AAClE,OAAO,KAAK,CAAC,MAAM,2CAA2C,CAAC;AAE/D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,oBAS1E"}

package/dist/utils/localeUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"localeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/localeUtils.ts"],"names":[],"mappings":"AAIA,oBAAY,eAAe,GAAG,CAAC,IAAI,EAAE;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAExB,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,eAAe,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,SACpB,MAAM,WACH,MAAM,cACH,MAAM,KACjB;IAAE,YAAY,EAAE,MAAM,CAAA;CAqBxB,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,MAAM,WAAW,MAAM,KAAG,MACV,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAiBD,eAAO,MAAM,aAAa,SAClB,sBAAsB,KAC3B,QAAQ,wBAAwB,EAAE,CA4DpC,CAAC;AAEF,eAAO,MAAM,gBAAgB,SACrB,wBAAwB,EAAE,KAC/B,MAAM,EAER,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,KAAK,WA4B1C"}

package/dist/utils/modelUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,2CAA2C,CAAC;AAI/D,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAI3B,UAAU,KAAK;IACb,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAC3C,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;CAChE;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;gBACH,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM;IAgB1D,QAAQ,CAAC,IAAI,EAAE,MAAM;CAiCtB;AAED,qBAAa,UAAU;IACrB,GAAG,EAAE,IAAI,CAAC;IACV,IAAI,EAAE,KAAK,CAAM;IACjB,KAAK,EAAE,MAAM,CAAK;gBACN,GAAG,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK;IAKzC,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE;IAsC3D,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE;IA6CnC,SAAS,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAelD,YAAY,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAsCpD,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE;CAsBxC"}

package/dist/utils/resolveProjectDep.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveProjectDep.d.ts","sourceRoot":"","sources":["../../src/utils/resolveProjectDep.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,sBAWA"}

package/dist/utils/withTmpPath.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"withTmpPath.d.ts","sourceRoot":"","sources":["../../src/utils/withTmpPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAG3B,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,UAUA"}