@umijs/plugins 4.0.0-canary.20220729.2 → 4.0.0-canary.20220819.1

package/dist/dva.js

@@ -30,6 +30,7 @@ module.exports = __toCommonJS(dva_exports);
 var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_modelUtils = require("./utils/modelUtils");
 var import_withTmpPath = require("./utils/withTmpPath");
@@ -65,6 +66,28 @@ var dva_default = (api) => {
       path: "models.ts",
       content: import_modelUtils.ModelUtils.getModelsContent(models)
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  dva?: {
+    config?: {
+        initialState?: Record<string, any>;
+        onError?: any;
+        onStateChange?: any;
+        onAction?: any;
+        onHmr?: any;
+        onReducer?: any;
+        onEffect?: any;
+        extraReducers?: any;
+        extraEnhancers?: any;
+        [key: string]: any;
+    },
+    plugins?: string[];
+  }
+}
+      `
+    });
     api.writeTmpFile({
       path: "dva.tsx",
       tpl: `

package/dist/initial-state.js

@@ -22,6 +22,7 @@ __export(initial_state_exports, {
   default: () => initial_state_default
 });
 module.exports = __toCommonJS(initial_state_exports);
+var import_umi = require("umi");
 var import_withTmpPath = require("./utils/withTmpPath");
 var initial_state_default = (api) => {
   api.describe({
@@ -132,6 +133,14 @@ import React from 'react';
 import Provider from './Provider';
 export function dataflowProvider(container) {
   return <Provider>{ container }</Provider>;
+}
+      `
+    });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  getInitialState?: () => Promise<Record<string, any>>
 }
       `
     });

package/dist/layout.js

@@ -28,6 +28,7 @@ module.exports = __toCommonJS(layout_exports);
 var allIcons = __toESM(require("@ant-design/icons"));
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("./utils/withTmpPath");
 var layout_default = (api) => {
@@ -251,15 +252,16 @@ const { formatMessage } = useIntl();
     ${hasInitialStatePlugin ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}
-    import { IConfigFromPlugins } from '@@/core/pluginConfig';
-    
+
+    import type { IConfigFromPlugins } from '@@/core/pluginConfig';
+
     export type RunTimeLayoutConfig = (initData: InitDataType) => Omit<
       ProLayoutProps,
       'rightContentRender'
     > & {
       childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode;
-      noAccessible?: JSX.Element;
-      notFound?: JSX.Element;
+      unAccessible?: JSX.Element;
+      noFound?: JSX.Element;
       logout?: (initialState: InitDataType['initialState']) => Promise<void> | void;
       rightContentRender?: (
         headerProps: HeaderProps,
@@ -280,6 +282,15 @@ const { formatMessage } = useIntl();
     };
     `
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import type { RunTimeLayoutConfig } from './types.d';
+export interface IRuntimeConfig {
+  layout?: RunTimeLayoutConfig
+}
+      `
+    });
     const iconsMap = Object.keys(api.appData.routes).reduce((memo, id) => {
       const { icon } = api.appData.routes[id];
       if (icon) {
@@ -579,11 +590,13 @@ const Exception: React.FC<{
   route?: IRoute;
   notFound?: React.ReactNode;
   noAccessible?: React.ReactNode;
+  unAccessible?: React.ReactNode;
+  noFound?: React.ReactNode;
 }> = (props) => (
   // render custom 404
-  (!props.route && props.notFound) ||
+  (!props.route && (props.noFound || props.notFound)) ||
   // render custom 403
-  (props.route.unaccessible && props.noAccessible) ||
+  (props.route.unaccessible && (props.unAccessible || props.noAccessible)) ||
   // render default exception
   ((!props.route || props.route.unaccessible) && (
     <Result

package/dist/locale.js

@@ -202,7 +202,7 @@ var locale_default = (api) => {
     api.writeTmpFile({
       path: "index.ts",
       content: `
-export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales } from './localeExports';
+export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales, FormattedDate, FormattedDateParts, FormattedDisplayName, FormattedHTMLMessage, FormattedList, FormattedNumber, FormattedNumberParts, FormattedPlural, FormattedRelativeTime, FormattedTime, FormattedTimeParts, IntlProvider, RawIntlProvider } from './localeExports';
 export { SelectLang } from './SelectLang';
 `
     });

package/dist/qiankun/master.js

@@ -45,6 +45,7 @@ __export(master_exports, {
 module.exports = __toCommonJS(master_exports);
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("../utils/withTmpPath");
 var import_constants = require("./constants");
@@ -103,6 +104,21 @@ var master_default = (api) => {
   }
   api.onGenerateFiles(() => {
     var _a;
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import { MasterOptions } from './types'
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = (Without<T, U> & U) | (Without<U, T> & T);
+interface Config {
+  master?: MasterOptions;
+}
+export interface IRuntimeConfig {
+  qiankun?: XOR<MasterOptions, Config>;
+  ${import_constants.MODEL_EXPORT_NAME}?: () => Record<string, any>;
+}
+      `
+    });
     api.writeTmpFile({
       path: "masterOptions.ts",
       content: `

package/dist/qiankun/slave.js

@@ -45,6 +45,7 @@ module.exports = __toCommonJS(slave_exports);
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("../utils/withTmpPath");
 var import_constants = require("./constants");
@@ -75,6 +76,30 @@ var slave_default = (api) => {
       ];
     }
   });
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+interface LifeCycles {
+    bootstrap?: (props?: any) => Promise<any>;
+    mount?: (props?: any) => Promise<any>;
+    unmount?: (props?: any) => Promise<any>;
+    update?: (props?: any) => Promise<any>;
+}
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = (Without<T, U> & U) | (Without<U, T> & T);
+interface SlaveOption extends LifeCycles {
+    enable?: boolean;
+}
+interface Config {
+    slave?: SlaveOption;
+}
+export interface IRuntimeConfig {
+    qiankun?: XOR<Config, LifeCycles>
+}
+      `
+    });
+  });
   api.modifyDefaultConfig((memo) => {
     var _a, _b, _c;
     const initialSlaveOptions = __spreadValues(__spreadValues({

package/dist/request.js

@@ -26,6 +26,7 @@ __export(request_exports, {
 });
 module.exports = __toCommonJS(request_exports);
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var request_default = (api) => {
   api.describe({
@@ -341,9 +342,19 @@ export {
   useRequest,
   UseRequestProvider,
   request,
+  getRequestInstance,
 } from './request';
 `
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import type { RequestConfig } from './types.d'
+export type IRuntimeConfig = {
+  request?: RequestConfig
+};
+      `
+    });
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/tailwindcss.js

@@ -40,15 +40,19 @@ var tailwindcss_default = (api) => {
     const inputPath = (0, import_path.join)(api.cwd, "tailwind.css");
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
     const binPath = (0, import_path.join)(api.cwd, "node_modules/.bin/tailwind");
+    const configPath = (0, import_path.join)(process.env.APP_ROOT || api.cwd, "tailwind.config.js");
     return new Promise((resolve) => {
       tailwind = (0, import_plugin_utils.crossSpawn)(`${binPath}`, [
+        "-c",
+        configPath,
         "-i",
         inputPath,
         "-o",
         generatedPath,
         api.env === "development" ? "--watch" : ""
       ], {
-        stdio: "inherit"
+        stdio: "inherit",
+        cwd: process.env.APP_ROOT || api.cwd
       });
       tailwind.on("error", (m) => {
         api.logger.error("tailwindcss service encounter an error: " + m);

package/libs/qiankun/master/MicroApp.tsx

@@ -18,13 +18,12 @@ import React, {
   useRef,
   useState,
 } from 'react';
+import { qiankunStateForSlaveModelNamespace } from './constants';
 import { ErrorBoundary } from './ErrorBoundary';
 import { getMasterOptions } from './masterOptions';
 import MicroAppLoader from './MicroAppLoader';
 import { MasterOptions } from './types';
 
-const qiankunStateForSlaveModelNamespace = '@@qiankunStateForSlave';
-
 type HashHistory = {
   type?: 'hash';
 } & any;

package/libs/qiankun/master/common.ts

@@ -6,7 +6,7 @@
  */
 
 import React, { ReactComponentElement } from 'react';
-import type { IRouteProps } from 'umi';
+import { Navigate, type IRouteProps } from 'umi';
 
 export const defaultMountContainerId = 'root-subapp';
 
@@ -94,19 +94,30 @@ export function patchMicroAppRoute(
       routeProps,
     };
     route.element = React.createElement(getMicroAppRouteComponent(opts), null);
+  } else if (route.redirect) {
+    // patchClientRoutes 插入的 redirect 不会被转换，所以这里需要手动处理成重定向组件
+    route.element = React.createElement(Navigate, {
+      to: route.redirect,
+      replace: true,
+    });
   }
 }
 
 const recursiveSearch = (
   routes: IRouteProps[],
   path: string,
-): IRouteProps | null => {
+  parentPath: string,
+): [IRouteProps, IRouteProps[], number, string] | null => {
   for (let i = 0; i < routes.length; i++) {
     if (routes[i].path === path) {
-      return routes[i];
+      return [routes[i], routes, i, parentPath];
     }
     if (routes[i].children && routes[i].children?.length) {
-      const found = recursiveSearch(routes[i].children || [], path);
+      const found = recursiveSearch(
+        routes[i].children || [],
+        path,
+        routes[i].path,
+      );
       if (found) {
         return found;
       }
@@ -116,23 +127,48 @@ const recursiveSearch = (
 };
 
 export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
-  const found = recursiveSearch(routes, microAppRoute.insert);
+  const mod =
+    microAppRoute.appendChildTo || microAppRoute.insert
+      ? 'appendChildTo'
+      : microAppRoute.insertBefore
+      ? 'insertBefore'
+      : undefined;
+  const target =
+    microAppRoute.appendChildTo ||
+    microAppRoute.insert ||
+    microAppRoute.insertBefore;
+  const [found, foundParentRoutes = [], index = 0, parentPath] =
+    recursiveSearch(routes, target, '/') || [];
   if (found) {
-    if (
-      !microAppRoute.path ||
-      !found.path ||
-      !microAppRoute.path.startsWith(found.path)
-    ) {
-      throw new Error(
-        `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${found.path}"`,
-      );
+    switch (mod) {
+      case 'appendChildTo':
+        if (
+          !microAppRoute.path ||
+          !found.path ||
+          !microAppRoute.path.startsWith(found.path)
+        ) {
+          throw new Error(
+            `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${found.path}"`,
+          );
+        }
+        found.exact = false;
+        found.children = found.children || [];
+        found.children.push(microAppRoute);
+        break;
+      case 'insertBefore':
+        if (
+          !microAppRoute.path ||
+          !found.path ||
+          !microAppRoute.path.startsWith(parentPath)
+        ) {
+          throw new Error(
+            `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${parentPath}"`,
+          );
+        }
+        foundParentRoutes.splice(index, 0, microAppRoute);
+        break;
     }
-    found.exact = false;
-    found.children = found.children || [];
-    found.children.push(microAppRoute);
   } else {
-    throw new Error(
-      `[plugin-qiankun]: path "${microAppRoute.insert}" not found`,
-    );
+    throw new Error(`[plugin-qiankun]: path "${target}" not found`);
   }
 }

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -24,7 +24,9 @@ async function getMasterRuntime() {
 
 // modify route with "microApp" attribute to use real component
 function patchMicroAppRouteComponent(routes: any[]) {
-  const insertRoutes = microAppRuntimeRoutes.filter((r) => r.insert);
+  const insertRoutes = microAppRuntimeRoutes.filter(
+    (r) => r.insert || r.insertBefore || r.appendChildTo,
+  );
   // 先处理 insert 配置
   insertRoutes.forEach((route) => {
     insertRoute(routes, route);
@@ -60,7 +62,13 @@ function patchMicroAppRouteComponent(routes: any[]) {
       };
 
       patchRoute(microAppRoute);
-      !microAppRoute.insert && rootRoutes.unshift(microAppRoute);
+      if (
+        !microAppRoute.insert &&
+        !microAppRoute.insertBefore &&
+        !microAppRoute.appendChildTo
+      ) {
+        rootRoutes.unshift(microAppRoute);
+      }
     });
   }
 }

package/libs/qiankun/master/types.ts

@@ -13,7 +13,7 @@ export type App = {
   // 取 entry 时是否需要开启跨域 credentials
   credentials?: boolean;
   props?: any;
-} & Pick<BaseIConfig, 'mountElementId'>;
+} & Partial<Pick<BaseIConfig, 'mountElementId'>>;
 
 export type MicroAppRoute = {
   path: string;

package/package.json

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