Главная Обзор Помощь
Регистрация Вход
yf_nkx
/
agmp_iot_jetlinks_ui
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

migrate to umi@2-beta

chencheng 7 лет назад
Родитель
29640ca048
Сommit
5c2df04b5e
3 измененных файлов с 16 добавлено и 21 удалено
Единый вид Показать статистику Diff
  1. 11 11
      config/config.js
  2. 3 6
      package.json
  3. 2 4
      src/pages/document.ejs

+ 11 - 11
config/config.js
Просмотреть файл 

@@ -7,8 +7,17 @@ const path = require('path');
 
 export default {
 
 export default {
 
   // add for transfer to umi
 
   // add for transfer to umi
 
   plugins: [
 
   plugins: [
 
-    'umi-plugin-dva',
 
-    'umi-plugin-locale',
 
+    [
 
+      'umi-plugin-react',
 
+      {
 
+        dva: true,
 
+        antd: true,
 
+        locale: {
 
+          default: 'zh-CN', // default zh-CN
 
+          baseNavigator: true, // default true, when it is true, will use `navigator.language` overwrite default
 
+        },
 
+      },
 
+    ],
 
     // TODO 决定是否使用约定路由，如果使用配置路由那么 umi-plugin-routes 可以去掉了
 
     // TODO 决定是否使用约定路由，如果使用配置路由那么 umi-plugin-routes 可以去掉了
 
     // [
 
     // [
 
     //   'umi-plugin-routes',
 
     //   'umi-plugin-routes',
 
@@ -20,20 +29,12 @@ export default {
 
     //   },
 
     //   },
 
     // ],
 
     // ],
 
   ],
 
   ],
 
-  locale: {
 
-    enable: true, // default false
 
-    default: 'zh-CN', // default zh-CN
 
-    baseNavigator: true, // default true, when it is true, will use `navigator.language` overwrite default
 
-    antd: true, // use antd, default is true
 
-  },
 
   // 路由配置
 
   // 路由配置
 
   routes: pageRoutes,
 
   routes: pageRoutes,
 
 
 
   theme: {
 
   theme: {
 
     'card-actions-background': '#f5f8fa',
 
     'card-actions-background': '#f5f8fa',
 
   },
 
   },
 
-  // entry: 'src/index.js', // TODO remove
 
-  extraBabelPlugins: [['import', { libraryName: 'antd', libraryDirectory: 'es', style: true }]],
 
   env: {
 
   env: {
 
     development: {
 
     development: {
 
       extraBabelPlugins: ['dva-hmr'],
 
       extraBabelPlugins: ['dva-hmr'],
 
@@ -70,7 +71,6 @@ export default {
 
       return `antd-pro${arr.join('-')}-${localName}`.replace(/--/g, '-');
 
       return `antd-pro${arr.join('-')}-${localName}`.replace(/--/g, '-');
 
     },
 
     },
 
   },
 
   },
 
-  disableFastClick: true,
 
   manifest: {
 
   manifest: {
 
     name: 'ant-design-pro',
 
     name: 'ant-design-pro',
 
     background_color: '#FFF',
 
     background_color: '#FFF',

+ 3 - 6
package.json
Просмотреть файл 

@@ -44,6 +44,7 @@
 
     "react-fittext": "^1.0.0",
 
     "react-fittext": "^1.0.0",
 
     "rollbar": "^2.4.2",
 
     "rollbar": "^2.4.2",
 
     "setprototypeof": "^1.1.0",
 
     "setprototypeof": "^1.1.0",
 
+    "umi-plugin-react": "^1.0.0-beta.1",
 
     "url-polyfill": "^1.0.13"
 
     "url-polyfill": "^1.0.13"
 
   },
 
   },
 
   "devDependencies": {
 
   "devDependencies": {
 
@@ -54,7 +55,6 @@
 
     "antd-theme-webpack-plugin": "^1.0.8",
 
     "antd-theme-webpack-plugin": "^1.0.8",
 
     "babel-eslint": "^8.2.6",
 
     "babel-eslint": "^8.2.6",
 
     "babel-plugin-dva-hmr": "^0.4.1",
 
     "babel-plugin-dva-hmr": "^0.4.1",
 
-    "babel-plugin-import": "^1.8.0",
 
     "babel-plugin-module-resolver": "^3.1.1",
 
     "babel-plugin-module-resolver": "^3.1.1",
 
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
 
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
 
     "babel-runtime": "^6.9.2",
 
     "babel-runtime": "^6.9.2",
 
@@ -75,8 +75,8 @@
 
     "gh-pages": "^1.2.0",
 
     "gh-pages": "^1.2.0",
 
     "husky": "^0.14.3",
 
     "husky": "^0.14.3",
 
     "lint-staged": "^7.2.0",
 
     "lint-staged": "^7.2.0",
 
-    "mockjs": "^1.0.1-beta3",
 
     "merge-umi-mock-data": "^0.0.2",
 
     "merge-umi-mock-data": "^0.0.2",
 
+    "mockjs": "^1.0.1-beta3",
 
     "prettier": "1.13.7",
 
     "prettier": "1.13.7",
 
     "pro-download": "^1.0.1",
 
     "pro-download": "^1.0.1",
 
     "redbox-react": "^1.5.0",
 
     "redbox-react": "^1.5.0",
 
@@ -84,10 +84,7 @@
 
     "stylelint": "^9.2.1",
 
     "stylelint": "^9.2.1",
 
     "stylelint-config-prettier": "^3.0.4",
 
     "stylelint-config-prettier": "^3.0.4",
 
     "stylelint-config-standard": "^18.0.0",
 
     "stylelint-config-standard": "^18.0.0",
 
-    "umi": "^1.3.15",
 
-    "umi-plugin-dva": "^0.9.1",
 
-    "umi-plugin-routes": "^0.1.5",
 
-    "umi-plugin-locale": "^1.0.1"
 
+    "umi": "^2.0.0-beta.1"
 
   },
 
   },
 
   "optionalDependencies": {
 
   "optionalDependencies": {
 
     "puppeteer": "^1.6.0"
 
     "puppeteer": "^1.6.0"

+ 2 - 4
src/pages/document.ejs
Просмотреть файл 

@@ -6,11 +6,10 @@
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>Ant Design Pro</title>
 
   <title>Ant Design Pro</title>
 
-  <link rel="manifest" href="/static/manifest.json">
 
+  <link rel="manifest" href="/asset-manifest.json">
 
   <link rel="icon" href="/favicon.png" type="image/x-icon">
 
   <link rel="icon" href="/favicon.png" type="image/x-icon">
 
   <script src="https://cdn.bootcss.com/rollbar.js/2.4.0/rollbar.min.js"></script>
 
   <script src="https://cdn.bootcss.com/rollbar.js/2.4.0/rollbar.min.js"></script>
 
   <script src="https://gw.alipayobjects.com/os/antv/assets/data-set/0.8.7/data-set.min.js"></script>
 
   <script src="https://gw.alipayobjects.com/os/antv/assets/data-set/0.8.7/data-set.min.js"></script>
 
-  <script src="/service-worker.js"></script>
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
@@ -25,5 +24,4 @@
 
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.min.js"></script>
 
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.min.js"></script>
 
 </body>
 
 </body>
 
 
 
-
 
-</html>
 
+</html>