@umijs/plugins 4.0.0-canary.20220614.2 → 4.0.0-canary.20220620.1

package/dist/initial-state.js

@@ -60,8 +60,10 @@ export default function InitialStateProvider(props: any) {
 import { useState, useEffect, useCallback } from 'react';
 import { getInitialState } from '@/app';
 
+export type InitialStateType = Awaited<ReturnType<typeof getInitialState>> | undefined;
+
 const initState = {
-  initialState: undefined,
+  initialState: undefined as InitialStateType,
   loading: true,
   error: undefined,
 };
@@ -76,8 +78,6 @@ export default () => {
     } catch (e) {
       setState((s) => ({ ...s, error: e, loading: false }));
     }
-    // [?]
-    // await sleep(10);
   }, []);
 
   const setInitialState = useCallback(async (initialState) => {
@@ -87,8 +87,6 @@ export default () => {
       }
       return { ...s, initialState, loading: false };
     });
-    // [?]
-    // await sleep(10)
   }, []);
 
   useEffect(() => {

package/dist/layout.js

@@ -52,7 +52,7 @@ exports.default = (api) => {
         return false;
     });
     const getPkgPath = () => {
-        // 如果  layout 和 techui至少有一个在，找到他们的地址
+        // 如果 layout 和 techui 至少有一个在，找到他们的地址
         if (pkgHasDep &&
             (0, fs_1.existsSync)((0, path_1.join)(api.cwd, 'node_modules', pkgHasDep, 'package.json'))) {
             return (0, path_1.join)(api.cwd, 'node_modules', pkgHasDep);
@@ -60,7 +60,7 @@ exports.default = (api) => {
         // 如果项目中没有去找插件以来的
         return (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
     };
-    const pkgPath = getPkgPath();
+    const pkgPath = (0, plugin_utils_1.winPath)(getPkgPath());
     api.modifyAppData((memo) => {
         const version = require(`${pkgPath}/package.json`).version;
         memo.pluginLayout = {
@@ -87,7 +87,7 @@ import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, match
 import { useMemo } from 'react';
 import  {
   ProLayout,
-} from "${pkgHasDep || '@ant-design/pro-layout'}";
+} from "${pkgPath || '@ant-design/pro-layout'}";
 import './Layout.less';
 import Logo from './Logo';
 import Exception from './Exception';
@@ -202,6 +202,26 @@ const { formatMessage } = useIntl();
   );
 }
       `,
+        });
+        // 写入类型, RunTimeLayoutConfig 是 app.tsx 中 layout 配置的类型
+        // 对于动态 layout 配置很有用
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `
+    import type { ProLayoutProps } from "${pkgPath || '@ant-design/pro-layout'}";
+    ${hasInitialStatePlugin
+                ? `import { Models } from '@@/plugin-model/useModel';
+           type InitDataType = Models<'@@initialState'>;
+        `
+                : 'type InitDataType = any;'}
+    
+    export type RunTimeLayoutConfig = (
+      initData: InitDataType,
+    ) => BasicLayoutProps & {
+      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode,
+      unAccessible?: JSX.Element,
+      noFound?: JSX.Element,
+    };`,
         });
         const iconsMap = Object.keys(api.appData.routes).reduce((memo, id) => {
             const { icon } = api.appData.routes[id];

package/dist/request.js

@@ -272,6 +272,8 @@ export type {
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse,
+  IRequestOptions as RequestOptions,
+  IRequest as Request,
 };
 
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220614.2",
+  "version": "4.0.0-canary.20220620.1",
   "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": "^7.0.1-beta.17",
-    "@umijs/bundler-utils": "4.0.0-canary.20220614.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220620.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.20220614.2"
+    "umi": "4.0.0-canary.20220620.1"
   },
   "publishConfig": {
     "access": "public"