upgrade umi@3 partly

src/components/Layout/Bread.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types'
 import { Breadcrumb } from 'antd'
 import { Link, withRouter } from 'umi'
 import { Icon as LegacyIcon } from '@ant-design/compatible'
-import { pathMatchRegexp, queryAncestors, addLangPrefix } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
+import { queryAncestors } from 'utils'
 import styles from './Bread.less'
 
 @withRouter
@@ -23,7 +24,7 @@ class Bread extends PureComponent {
         item && (
           <Breadcrumb.Item key={key}>
             {paths.length - 1 !== key ? (
-              <Link to={addLangPrefix(item.route) || '#'}>{content}</Link>
+              <Link to={item.route || '#'}>{content}</Link>
             ) : (
               content
             )}
@@ -37,7 +38,7 @@ class Bread extends PureComponent {
 
     // Find a route that matches the pathname.
     const currentRoute = routeList.find(
-      _ => _.route && pathMatchRegexp(_.route, location.pathname)
+      _ => _.route && pathToRegexp(_.route, location.pathname)
     )
 
     // Find the breadcrumb navigation of the current route match and all its ancestors.

src/components/Layout/Menu.js

@@ -3,11 +3,10 @@ import PropTypes from 'prop-types'
 import { Icon as LegacyIcon } from '@ant-design/compatible'
 import { Menu } from 'antd'
 import { NavLink, withRouter } from 'umi'
+const { pathToRegexp } = require("path-to-regexp")
 import {
   arrayToTree,
   queryAncestors,
-  pathMatchRegexp,
-  addLangPrefix,
 } from 'utils'
 import store from 'store'
 
@@ -57,7 +56,7 @@ class SiderMenu extends PureComponent {
       }
       return (
         <Menu.Item key={item.id}>
-          <NavLink to={addLangPrefix(item.route) || '#'}>
+          <NavLink to={item.route || '#'}>
             {item.icon && <LegacyIcon type={item.icon} />}
             <span>{item.name}</span>
           </NavLink>
@@ -81,7 +80,7 @@ class SiderMenu extends PureComponent {
 
     // Find a menu that matches the pathname.
     const currentMenu = menus.find(
-      _ => _.route && pathMatchRegexp(_.route, location.pathname)
+      _ => _.route && pathToRegexp(_.route, location.pathname)
     )
 
     // Find the key that should be selected according to the current menu.

src/components/Layout/Sider.js

@@ -1,12 +1,14 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
 import { Switch, Layout } from 'antd'
+import { withI18n, Trans } from '@lingui/react'
 import { BulbOutlined } from '@ant-design/icons'
 import ScrollBar from '../ScrollBar'
 import { config } from 'utils'
 import SiderMenu from './Menu'
 import styles from './Sider.less'
 
+@withI18n()
 class Sider extends PureComponent {
   render() {
     const {

src/layouts/PrimaryLayout.js

@@ -2,13 +2,14 @@
 /* global document */
 import React, { PureComponent, Fragment } from 'react'
 import PropTypes from 'prop-types'
-import { withRouter } from 'umi'
+import { withRouter, getLocale } from 'umi'
 import { connect } from 'dva'
 import { MyLayout } from 'components'
 import { BackTop, Layout, Drawer } from 'antd'
 import { GlobalFooter } from 'ant-design-pro'
 import { enquireScreen, unenquireScreen } from 'enquire-js'
-import { config, pathMatchRegexp, langFromPath } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
+import { config } from 'utils'
 import Error from '../pages/404'
 import styles from './PrimaryLayout.less'
 import store from 'store'
@@ -56,7 +57,7 @@ class PrimaryLayout extends PureComponent {
 
     // Localized route name.
 
-    const lang = langFromPath(location.pathname)
+    const lang = getLocale()
     const newRouteList =
       lang !== 'en'
         ? routeList.map(item => {
@@ -70,7 +71,7 @@ class PrimaryLayout extends PureComponent {
 
     // Find a route that matches the pathname.
     const currentRoute = newRouteList.find(
-      _ => _.route && pathMatchRegexp(_.route, location.pathname)
+      _ => _.route && pathToRegexp(_.route, location.pathname)
     )
 
     // Query whether you have permission to enter this page

src/models/app.js

@@ -1,10 +1,11 @@
 /* global window */
 
-import { router } from 'utils'
+import { history } from 'umi'
 import { stringify } from 'qs'
 import store from 'store'
+const { pathToRegexp } = require("path-to-regexp")
 import { ROLE_TYPE } from 'utils/constant'
-import { queryLayout, pathMatchRegexp } from 'utils'
+import { queryLayout } from 'utils'
 import { CANCEL_REQUEST_MESSAGE } from 'utils/constant'
 import api from 'api'
 import config from 'config'
@@ -12,8 +13,8 @@ import config from 'config'
 const { queryRouteList, logoutUser, queryUserInfo } = api
 
 const goDashboard = () => {
-  if (pathMatchRegexp(['/', '/login'], window.location.pathname)) {
-    router.push({
+  if (pathToRegexp(['/', '/login'], window.location.pathname)) {
+    history.push({
       pathname: '/dashboard',
     })
   }
@@ -112,7 +113,7 @@ export default {
         store.set('isInit', true)
         goDashboard()
       } else if (queryLayout(config.layouts, locationPathname) !== 'public') {
-        router.push({
+        history.push({
           pathname: '/login',
           search: stringify({
             from: locationPathname,

src/pages/dashboard/model.js

@@ -1,7 +1,7 @@
 import { parse } from 'qs'
 import modelExtend from 'dva-model-extend'
 import api from 'api'
-import { pathMatchRegexp } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
 import { model } from 'utils/model'
 
 const { queryDashboard, queryWeather } = api
@@ -35,8 +35,8 @@ export default modelExtend(model, {
     setup({ dispatch, history }) {
       history.listen(({ pathname }) => {
         if (
-          pathMatchRegexp('/dashboard', pathname) ||
-          pathMatchRegexp('/', pathname)
+          pathToRegexp('/dashboard', pathname) ||
+          pathToRegexp('/', pathname)
         ) {
           dispatch({ type: 'query' })
           dispatch({ type: 'queryWeather' })

src/pages/index.js

@@ -1,12 +1,12 @@
 import React, { PureComponent } from 'react'
-import { Redirect, useIntl } from 'umi'
+import { Redirect } from 'umi'
+import { withI18n } from '@lingui/react'
 
+@withI18n()
 class Index extends PureComponent {
   render() {
-    return <Redirect to={intl.formatMessage(
-      {
-        id: '/dashboard',
-      }) } />
+    const { i18n } = this.props
+    return <Redirect to={i18n.t`/dashboard`} />
   }
 }
 

src/pages/login/model.js

@@ -1,4 +1,5 @@
-import { router, pathMatchRegexp } from 'utils'
+import { history } from 'umi'
+const { pathToRegexp } = require("path-to-regexp")
 import api from 'api'
 
 const { loginUser } = api
@@ -15,11 +16,11 @@ export default {
       if (data.success) {
         const { from } = locationQuery
         yield put({ type: 'app/query' })
-        if (!pathMatchRegexp('/login', from)) {
-          if (['', '/'].includes(from)) router.push('/dashboard')
-          else router.push(from)
+        if (!pathToRegexp('/login', from)) {
+          if (['', '/'].includes(from)) history.push('/dashboard')
+          else history.push(from)
         } else {
-          router.push('/dashboard')
+          history.push('/dashboard')
         }
       } else {
         throw data

src/pages/post/index.js

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'dva'
 import { Tabs } from 'antd'
-import { router } from 'utils'
+import { history } from 'umi'
 import { stringify } from 'qs'
 import { Page } from 'components'
 import List from './components/List'
@@ -19,7 +19,7 @@ class Post extends PureComponent {
   handleTabClick = key => {
     const { pathname } = this.props.location
 
-    router.push({
+    history.push({
       pathname,
       search: stringify({
         status: key,
@@ -37,7 +37,7 @@ class Post extends PureComponent {
       dataSource: list,
       loading: loading.effects['post/query'],
       onChange(page) {
-        router.push({
+        history.push({
           pathname,
           search: stringify({
             ...query,

src/pages/post/model.js

@@ -1,6 +1,6 @@
 import modelExtend from 'dva-model-extend'
 import api from 'api'
-import { pathMatchRegexp } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
 import { pageModel } from 'utils/model'
 
 const { queryPostList } = api
@@ -11,7 +11,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(location => {
-        if (pathMatchRegexp('/post', location.pathname)) {
+        if (pathToRegexp('/post', location.pathname)) {
           dispatch({
             type: 'query',
             payload: {

src/pages/user/[id]/models/detail.js

@@ -1,4 +1,4 @@
-import { pathMatchRegexp } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
 import api from 'api'
 
 const { queryUser } = api
@@ -13,7 +13,7 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname }) => {
-        const match = pathMatchRegexp('/user/:id', pathname)
+        const match = pathToRegexp('/user/:id', pathname)
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } })
         }

src/pages/user/index.js

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
-import { router } from 'utils'
+import { history } from 'umi'
 import { connect } from 'dva'
 import { Row, Col, Button, Popconfirm } from 'antd'
 import { Page } from 'components'
@@ -16,7 +16,7 @@ class User extends PureComponent {
     const { location } = this.props
     const { query, pathname } = location
 
-    router.push({
+    history.push({
       pathname,
       search: stringify(
         {

src/pages/user/model.js

@@ -1,5 +1,5 @@
 import modelExtend from 'dva-model-extend'
-import { pathMatchRegexp } from 'utils'
+const { pathToRegexp } = require("path-to-regexp")
 import api from 'api'
 import { pageModel } from 'utils/model'
 
@@ -24,7 +24,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(location => {
-        if (pathMatchRegexp('/user', location.pathname)) {
+        if (pathToRegexp('/user', location.pathname)) {
           const payload = location.query || { page: 1, pageSize: 10 }
           dispatch({
             type: 'query',

src/utils/index.js

@@ -55,16 +55,6 @@ export function arrayToTree(
   return result
 }
 
-/**
- * Whether the path matches the regexp if the language prefix is ignored, https://github.com/pillarjs/path-to-regexp.
- * @param   {string|regexp|array}     regexp     Specify a string, array of strings, or a regular expression.
- * @param   {string}                  pathname   Specify the pathname to match.
- * @return  {array|null}              Return the result of the match or null.
- */
-export function pathMatchRegexp(regexp, pathname) {
-  return pathToRegexp(regexp).exec(deLangPrefix(pathname))
-}
-
 /**
  * In an array object, traverse all parent IDs based on the value of an object.
  * @param   {array}     array     The Array need to Converted.
@@ -127,7 +117,7 @@ export function queryLayout(layouts, pathname) {
   const isMatch = regepx => {
     return regepx instanceof RegExp
       ? regepx.test(pathname)
-      : pathMatchRegexp(regepx, pathname)
+      : pathToRegexp(regepx, pathname)
   }
 
   for (const item of layouts) {

src/utils/index.test.js

@@ -1,19 +1,18 @@
-import { pathMatchRegexp } from './index'
 const { pathToRegexp } = require("path-to-regexp")
 
-describe('test pathMatchRegexp', () => {
+describe('test pathToRegexp', () => {
   it('get right', () => {
-    expect(pathMatchRegexp('/user', '/zh/user')).toEqual(
+    expect(pathToRegexp('/user', '/zh/user')).toEqual(
       pathToRegexp('/user').exec('/user')
     )
-    expect(pathMatchRegexp('/user', '/user')).toEqual(
+    expect(pathToRegexp('/user', '/user')).toEqual(
       pathToRegexp('/user').exec('/user')
     )
 
-    expect(pathMatchRegexp('/user/:id', '/zh/user/1')).toEqual(
+    expect(pathToRegexp('/user/:id', '/zh/user/1')).toEqual(
       pathToRegexp('/user/:id').exec('/user/1')
     )
-    expect(pathMatchRegexp('/user/:id', '/user/1')).toEqual(
+    expect(pathToRegexp('/user/:id', '/user/1')).toEqual(
       pathToRegexp('/user/:id').exec('/user/1')
     )
   })

src/utils/request.js

@@ -1,9 +1,8 @@
 import axios from 'axios'
 import { cloneDeep, isEmpty } from 'lodash'
-const { pathToRegexp } = require("path-to-regexp")
+const { parse, compile } = require("path-to-regexp")
 import { message } from 'antd'
 import { CANCEL_REQUEST_MESSAGE } from 'utils/constant'
-import qs from 'qs'
 
 const { CancelToken } = axios
 window.cancelRequest = new Map()
@@ -20,8 +19,8 @@ export default function request(options) {
       url = url.slice(domain.length)
     }
 
-    const match = pathToRegexp.parse(url)
-    url = pathToRegexp.compile(url)(data)
+    const match = parse(url)
+    url = compile(url)(data)
 
     for (const item of match) {
       if (item instanceof Object && item.name in cloneData) {