fix 基于umi v3 升级

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "eslint-config-umi"
+}

.gitignore

@@ -1,10 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-#idea
-.idea
-.idea/**.*
-
 # dependencies
 /node_modules
 /npm-debug.log*
@@ -21,10 +16,3 @@
 # umi
 .umi
 .umi-production
-
-
-# 部署目录
-/dist
-
-# 测试覆盖率统计
-/coverage

.prettierrc

@@ -1,6 +1,6 @@
 {
   "singleQuote": true,
-  "trailingComma": "es5",
+  "trailingComma": "all",
   "printWidth": 100,
   "overrides": [
     {

config/config.ts

@@ -1,136 +1,55 @@
-// https://umijs.org/config/
-import os from 'os';
-import path from 'path';
-import { IPlugin, IConfig } from 'umi-types';
-import pxToViewPort from 'postcss-px-to-viewport';
-import defaultSettings from './defaultSettings';
+import { IConfig } from 'umi-types';
 import pageRoutes from './router.config';
-const { pwa, primaryColor } = defaultSettings;
 
-const { TEST, NODE_ENV } = process.env;
-const plugins: IPlugin[] = [
-  [
-    'umi-plugin-react',
-    {
+// ref: https://umijs.org/config/
+const config: IConfig = {
+  treeShaking: true,
+  routes: pageRoutes,
+  plugins: [
+    // ref: https://umijs.org/plugin/umi-plugin-react.html
+    ['umi-plugin-react', {
       antd: true,
       dva: true,
-      fastClick: true,
-      autoprefixer:'',
-      // hd: true,
-      dll: true,
-      hardSource: false,
-      locale: {
-        // default false
-        enable: true,
-        // default zh-CN
-        default: 'zh-CN',
-        // default true, when it is true, will use `navigator.language` overwrite default
-        baseNavigator: true,
-      },
       dynamicImport: {
         loadingComponent: './components/PageLoading/index',
         webpackChunkName: true,
         level: 3,
       },
-      library: 'react',
-      metas: [{ charset: 'utf-8' }],
-      pwa: pwa
-        ? {
-            workboxPluginMode: 'InjectManifest',
-            workboxOptions: {
-              importWorkboxFrom: 'local',
-            },
-          }
-        : false,
-      ...(!TEST && os.platform() === 'darwin'
-        ? {
-            dll: {
-              include: ['dva', 'dva/router', 'dva/saga', 'dva/fetch'],
-              exclude: ['@babel/runtime'],
-            },
-            hardSource: false,
-          }
-        : {}),
-    },
+      title: 'umi-dva-antd-mobile',
+      dll: true,
+      hd: true,
+      locale: {
+        enable: true,
+        default: 'en-US',
+      },
+      routes: {
+        exclude: [
+          /models\//,
+          /services\//,
+          /model\.(t|j)sx?$/,
+          /service\.(t|j)sx?$/,
+          /components\//,
+        ],
+      },
+    }],
   ],
-];
-
-const uglifyJSOptions =
-  NODE_ENV === 'production'
-    ? {
-        uglifyOptions: {
-          // remove console.* except console.error
-          compress: {
-            drop_console: true,
-            pure_funcs: ['console.error'],
-          },
-        },
-      }
-    : {};
-export default {
-  // add for transfer to umi
-  base: '',
-  publicPath: '',
-  history: 'hash', // 默认是 browser
-  plugins,
   define: {
     APP_TYPE: process.env.APP_TYPE || '',
   },
-  treeShaking: true,
-  targets: {
-    ie: 11,
-    android: 5,
-    ios: 7,
-    chrome: 58,
-  },
-  devtool: false,
-  // 路由配置
-  routes: pageRoutes,
-  // Theme for antd
-  // https://ant.design/docs/react/customize-theme-cn
-  theme: {
-    'primary-color': primaryColor,
-  },
-  proxy: {
-    '/server/api/': {
-      changeOrigin: true,
-      pathRewrite: { '^/server': '' },
-      target: 'https://preview.pro.ant.design/',
-    },
-    '/wx/api/': {
-      changeOrigin: true,
-      pathRewrite: { '^/wx/api': '' },
-      target: 'https://games.parsec.com.cn/',
-    },
-  },
+  history: 'hash', // 默认是 browser
   ignoreMomentLocale: true,
   lessLoaderOptions: {
     javascriptEnabled: true,
   },
   disableRedirectHoist: true,
-  cssLoaderOptions: {
-    modules: true,
-  },
+  outputPath: './dist',
+  hash: true,
   manifest: {
     basePath: '/',
   },
-  uglifyJSOptions,
-  alias: {
-    '@': path.resolve(__dirname, 'src'),
-  },
-  chainWebpack: config => {},
   extraBabelPlugins:[
     ['import', { libraryName: 'antd-mobile', style: true }]  //按需加载antd-mobile样式文件
   ],
-  extraPostCSSPlugins: [
-    pxToViewPort({
-      viewportWidth: 375,
-      viewportHeight: 667,
-      unitPrecision: 5,
-      viewportUnit: 'vw',
-      selectorBlackList: [],
-      minPixelValue: 1,
-      mediaQuery: false,
-    }),
-  ],
-} as IConfig;
+};
+
+export default config;

config/router.config.ts

@@ -1,78 +1,12 @@
 export default [
-  // user
-  {
-    path: '/user',
-    component: '../layouts/UserLayout',
-    routes: [
-      { path: '/user', redirect: '/user/login' },
-      { path: '/user/login', component: './User/Login' },
-    ],
-  },
-  // TabBar
-  {
-    path: '/tabbar',
-    component: '../layouts/TabBarLayout',
-    routes: [
-      { path: '/tabbar', redirect: '/tabbar/index' },
-      {
-        path: '/tabbar/index',
-        title: 'index',
-        component: './tabbar/index',
-        iconName: 'alipay',
-      },
-      {
-        path: '/tabbar/koubei',
-        title: 'Koubei',
-        component: './tabbar/Koubei',
-        iconName: 'koubei',
-      },
-      {
-        path: '/tabbar/friend',
-        title: 'Friend',
-        component: './tabbar/Friend',
-        iconName: 'friend',
-      },
-      {
-        path: '/tabbar/my',
-        title: 'My',
-        component: './tabbar/Koubei',
-        iconName: 'my',
-      },
-    ],
-  },
-  // H5
   {
     path: '/',
-    component: '../layouts/BasicLayout',
-    Routes: ['src/pages/Authorized'],
-    authority: ['user', 'admin'],
+    component: '../layouts/index',
+    // Routes: ['src/pages/Authorized'],
+    // authority: ['user', 'admin'],
     routes: [
-      { path: '/', component: './home/index', title: '首页' },
-      { path: '/entrance', component: './entrance/index', title: '主入口' },
-      { path: '/paper/:type', component: './paper/index', title: '试题页面' },
-      { path: '/result', component: './result/index', title: '结果页' },
-      {
-        title: 'exception',
-        path: '/exception',
-        routes: [
-          // Exception
-          {
-            path: '/exception/403',
-            title: 'not-permission',
-            component: './exception/403',
-          },
-          {
-            path: '/exception/404',
-            title: 'not-find',
-            component: './exception/404',
-          },
-          {
-            path: '/exception/500',
-            title: 'server-error',
-            component: './exception/500',
-          },
-        ],
-      },
+      { path: '/', component: './index', title: '首页' },
+      { path: '/me', component: './me', title: '个人中心' },
       { path: '/404', component: '404' },
     ],
   },