From ca1d182795c043f52bfa1530f1a4b9a45d778ac9 Mon Sep 17 00:00:00 2001
From: superlbr <superlbr@126.com>
Date: Sat, 30 Apr 2022 06:41:00 +0800
Subject: [PATCH] upgrade dep: umi^4.0.0-canary.20220429.4

---
 .umirc                              |  5 -----
 config/config.ts                    |  2 ++
 config/routes.ts                    |  2 +-
 package.json                        | 29 +++++++++++++++++++++--------
 src/layouts/BaseLayout.tsx          |  3 ++-
 src/layouts/PrimaryLayout/index.tsx |  4 ++--
 src/layouts/PublicLayout.tsx        |  3 ++-
 src/pages/login/index.tsx           |  2 +-
 8 files changed, 31 insertions(+), 19 deletions(-)
 delete mode 100644 .umirc

diff --git a/.umirc b/.umirc
deleted file mode 100644
index 3da267f..0000000
--- a/.umirc
+++ /dev/null
@@ -1,5 +0,0 @@
-import routes from './config/routes'
-
-export default {
-    routes
-}
\ No newline at end of file
diff --git a/config/config.ts b/config/config.ts
index c3a2d79..95371ba 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -3,6 +3,7 @@
  */
 import lessToJs from 'less-vars-to-js'
 import fs from 'fs'
+import routes from './routes'
 import path from 'path'
 import proxy from './proxy'
 
@@ -16,6 +17,7 @@ const config = {
   targets: { ie: 11 },
   theme,
   proxy,
+  routes,
   devtool: 'eval',
   mock: {
     exclude: ['utils/index'],
diff --git a/config/routes.ts b/config/routes.ts
index c890a50..970c4c8 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -2,7 +2,7 @@ const routes = [
   {
     exact: false,
     path: '/',
-    component: '@/layouts/index',
+    // component: '@/layouts/index', // comment due to double layout
     routes: [
       { exact: true, path: '/login', component: '@/pages/login' },
       { exact: true, path: '/user', component: '@/pages/user' },
diff --git a/package.json b/package.json
index 55e917f..6fcd57a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "An admin dashboard application demo built upon Ant Design and UmiJS",
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.35.0",
+    "@ant-design/pro-layout": "^6.37.0",
     "@lingui/core": "^3.13.3",
     "@lingui/detect-locale": "^3.13.3",
     "@lingui/react": "^3.13.3",
@@ -66,8 +66,8 @@
     "stylelint": "^14.8.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^25.0.0",
-    "typescript": "^4.6.3",
-    "umi": "4.0.0-canary.20220428.1"
+    "typescript": "^4.6.4",
+    "umi": "4.0.0-canary.20220429.4"
   },
   "engines": {
     "node": ">= 10.0.0"
@@ -83,18 +83,31 @@
     ]
   },
   "lingui": {
-    "fallbackLocales": { "default": "en" },
+    "fallbackLocales": {
+      "default": "en"
+    },
     "sourceLocale": "en",
-    "locales": [ "en", "zh", "pt-br"],
+    "locales": [
+      "en",
+      "zh",
+      "pt-br"
+    ],
     "catalogs": [
       {
         "path": "src/locales/{locale}/messages",
-        "include": ["src"],
-        "exclude": ["**/node_modules/**"]
+        "include": [
+          "src"
+        ],
+        "exclude": [
+          "**/node_modules/**"
+        ]
       }
     ],
     "format": "minimal",
-    "runtimeConfigModule": ["@/hooks/useIntlProvider", "i18n"]
+    "runtimeConfigModule": [
+      "@/hooks/useIntlProvider",
+      "i18n"
+    ]
   },
   "scripts": {
     "start": "umi dev",
diff --git a/src/layouts/BaseLayout.tsx b/src/layouts/BaseLayout.tsx
index f2a3c1b..ea115ff 100644
--- a/src/layouts/BaseLayout.tsx
+++ b/src/layouts/BaseLayout.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import { useLocation } from '@/hooks'
 import { queryLayout } from '@/utils'
 import { config } from '@/configs'
+import { Outlet } from 'umi'
 import PublicLayout from './PublicLayout'
 import PrimaryLayout from './PrimaryLayout/index'
 import './BaseLayout.less'
@@ -14,7 +15,7 @@ const LayoutMap = {
 const BaseLayout: React.FC = (props) => {
   const location = useLocation()
   const Container = LayoutMap[queryLayout(config.layouts, location.pathname)]
-  return <Container>{props.children}</Container>
+  return <Container><Outlet /></Container>
 }
 
 export default BaseLayout
diff --git a/src/layouts/PrimaryLayout/index.tsx b/src/layouts/PrimaryLayout/index.tsx
index 6e59ccb..628344d 100644
--- a/src/layouts/PrimaryLayout/index.tsx
+++ b/src/layouts/PrimaryLayout/index.tsx
@@ -4,7 +4,7 @@ import ProBasicLayout, {
   MenuDataItem,
   SettingDrawerProps,
 } from '@ant-design/pro-layout'
-import { Link } from 'umi'
+import { Link, Outlet } from 'umi'
 import { useLocation } from '@/hooks'
 import { menus, menuIcon, config } from '@/configs'
 import defaultSettings from '@/defaultSettings'
@@ -68,7 +68,7 @@ const PrimaryLayout: React.FC = (props) => {
         menuProps={menuProps}
         rightContentRender={() => <HeaderRightContent />}
       >
-        {props.children}
+        <Outlet />
       </ProBasicLayout>
     </>
   )
diff --git a/src/layouts/PublicLayout.tsx b/src/layouts/PublicLayout.tsx
index 801fb5e..fab316c 100644
--- a/src/layouts/PublicLayout.tsx
+++ b/src/layouts/PublicLayout.tsx
@@ -1,7 +1,8 @@
 import React from 'react'
+import { Outlet } from 'umi'
 
 const PublicLayout: React.FC = (props) => {
-  return <>{props.children}</>
+  return <><Outlet /></>
 }
 
 export default PublicLayout
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index bf5965f..913e313 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -34,7 +34,7 @@ const Login: React.FC = () => {
   const handleFinish = (values: ILoginUserParams) => {
     runLogin(values).then(() => {
       queryUserInfo()
-      history.push('/dashborad')
+      history.push('/user')
     })
   }