refact config files and package.json

.babelrc

@@ -0,0 +1,22 @@
+{
+  "presets": [
+    "umi/babel"
+  ],
+  "plugins": [
+    [
+      "babel-plugin-module-resolver",
+      {
+        "alias": {
+          "components": "./src/components",
+          "utils": "./src/utils",
+          "config": "./src/utils/config",
+          "enums": "./src/utils/enums",
+          "services": "./src/services",
+          "models": "./src/models",
+          "routes": "./src/routes",
+          "themes": "./src/themes"
+        }
+      }
+    ]
+  ]
+}

.gitignore

@@ -2,6 +2,7 @@ dist
 node_modules
 yarn.lock
 npm-debug.log
+
 # ide
 .idea
 
@@ -9,3 +10,7 @@ npm-debug.log
 .DS_Store
 .AppleDouble
 .LSOverride
+
+# umi
+.umi
+.umi-production

.roadhogrc.js

@@ -1,57 +0,0 @@
-const path = require('path')
-const { version } = require('./package.json')
-
-const svgSpriteDirs = [
-  path.resolve(__dirname, 'src/svg/'),
-  require.resolve('antd').replace(/index\.js$/, '')
-]
-
-export default {
-  entry: 'src/index.js',
-  svgSpriteLoaderDirs: svgSpriteDirs,
-  theme: "./theme.config.js",
-  publicPath: `/${version}/`,
-  outputPath: `./dist/${version}`,
-  // 接口代理示例
-  proxy: {
-    "/api/v1/weather": {
-      "target": "https://api.seniverse.com/",
-      "changeOrigin": true,
-      "pathRewrite": { "^/api/v1/weather": "/v3/weather" }
-    },
-    // "/api/v2": {
-    //   "target": "http://192.168.0.110",
-    //   "changeOrigin": true,
-    //   "pathRewrite": { "^/api/v2" : "/api/v2" }
-    // }
-  },
-  env: {
-    development: {
-      extraBabelPlugins: [
-        "dva-hmr",
-        "transform-runtime",
-        [
-          "import", {
-            "libraryName": "antd",
-            "style": true
-          }
-        ]
-      ]
-    },
-    production: {
-      extraBabelPlugins: [
-        "transform-runtime",
-        [
-          "import", {
-            "libraryName": "antd",
-            "style": true
-          }
-        ]
-      ]
-    }
-  },
-  dllPlugin: {
-    exclude: ["babel-runtime", "roadhog", "cross-env"],
-    include: ["dva/router", "dva/saga", "dva/fetch"]
-  }
-}

.roadhogrc.mock.js

@@ -1,5 +0,0 @@
-const mock = {}
-require('fs').readdirSync(require('path').join(__dirname + '/src/mock')).forEach(function(file) {
-	Object.assign(mock, require('./src/mock/' + file))
-})
-module.exports = mock

.umirc.mock.js

@@ -0,0 +1,5 @@
+const mock = {}
+require('fs').readdirSync(require('path').join(__dirname + '/mock')).forEach(function(file) {
+	Object.assign(mock, require('./mock/' + file))
+})
+module.exports = mock

.webpackrc.js

@@ -0,0 +1,16 @@
+export default {
+  theme: "./theme.config.js",
+  // 接口代理示例
+  proxy: {
+    "/api/v1/weather": {
+      "target": "https://api.seniverse.com/",
+      "changeOrigin": true,
+      "pathRewrite": { "^/api/v1/weather": "/v3/weather" }
+    },
+    // "/api/v2": {
+    //   "target": "http://192.168.0.110",
+    //   "changeOrigin": true,
+    //   "pathRewrite": { "^/api/v2" : "/api/v2" }
+    // }
+  },
+}

package.json

@@ -3,72 +3,47 @@
   "name": "antd-admin",
   "version": "4.3.9",
   "dependencies": {
-    "antd": "3.2.2",
     "axios": "^0.17.1",
-    "babel-polyfill": "^6.23.0",
     "classnames": "^2.2.5",
-    "cross-env": "^5.0.5",
     "d3-shape": "^1.2.0",
     "draftjs-to-markdown": "^0.5.0",
-    "dva": "2.1.0",
-    "dva-loading": "^1.0.4",
+    "dva-model-extend": "^0.1.1",
     "echarts": "^4.0.0",
     "echarts-for-react": "^2.0.0",
     "echarts-gl": "^1.0.0-beta.5",
     "echarts-liquidfill": "^1.1.0",
-    "ejs-loader": "^0.3.0",
     "highcharts-exporting": "^0.1.2",
     "highcharts-more": "^0.1.2",
     "history": "^4.7.2",
     "js-beautify": "^1.6.14",
     "jsonp": "^0.2.1",
-    "less-vars-to-js": "^1.1.2",
     "lodash": "^4.17.4",
     "mockjs": "^1.0.1-beta3",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^2.1.0",
     "prop-types": "^15.5.10",
     "qs": "^6.5.0",
-    "query-string": "^5.0.0",
     "rc-tween-one": "^1.3.1",
-    "react": "^16.2.0",
     "react-countup": "^3.0.2",
-    "react-dom": "^16.2.0",
     "react-draft-wysiwyg": "^1.10.0",
     "react-helmet": "^5.1.3",
     "react-highcharts": "^15.0.0",
     "recharts": "^1.0.0-beta.0"
   },
   "devDependencies": {
-    "babel-eslint": "^8.1.0",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-dva-hmr": "^0.4.0",
-    "babel-plugin-import": "^1.1.1",
-    "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-runtime": "^6.9.2",
-    "copy-webpack-plugin": "^4.0.1",
+    "babel-plugin-module-resolver": "^3.1.0",
+    "cross-env": "^5.0.5",
     "draftjs-to-html": "^0.8.1",
-    "dva-model-extend": "^0.1.1",
-    "eslint": "^4.1.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-import-resolver-node": "^0.3.1",
-    "eslint-loader": "^1.9.0",
-    "eslint-plugin-import": "^2.6.1",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.1.0",
-    "html-webpack-plugin": "^2.29.0",
-    "redbox-react": "^1.2.10",
-    "roadhog": "1.3.1"
+    "less-vars-to-js": "^1.1.2"
   },
   "pre-commit": [
     "lint"
   ],
   "scripts": {
-    "dev": "cross-env BROWSER=none HOST=0.0.0.0 roadhog server",
-    "start": "roadhog buildDll && cross-env BROWSER=none HOST=0.0.0.0 roadhog server",
+    "start": "cross-env BABELRC=1 BROWSER=none HOST=0.0.0.0 umi dev",
     "lint": "eslint --fix --ext .js src",
-    "build": "roadhog build",
-    "build:dll": "roadhog buildDll",
-    "build:new": "node version && roadhog build"
+    "build": "umi build",
+    "test": "umi test"
   }
 }

src/document.ejs

@@ -1,25 +1,19 @@
-<% htmlWebpackPlugin.options.headScripts = htmlWebpackPlugin.options.headScripts || [] %>
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="description" content="A admin dashboard application demo built upon Ant Design and Dva.js">
-  <title>antd admin</title>
-  <!--[if lte IE 10]>
-      <script
-        src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
-  <![endif]-->
-  <% for (item of htmlWebpackPlugin.options.headScripts) { %>
-    <script src="<%= item %>"></script>
-  <% } %>
-</head>
-
-<body>
-  <div id="root"></div>
-</body>
-
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="description" content="A admin dashboard application demo built upon Ant Design and Dva.js">
+  <title>antd admin</title>
+  <!--[if lte IE 10]>
+      <script
+        src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
+  <![endif]-->
+</head>
+
+<body>
+  <div id="root"></div>
+</body>
+
+</html>

webpack.config.js

@@ -1,59 +0,0 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const webpack = require('webpack')
-
-module.exports = (webpackConfig, env) => {
-  const production = env === 'production'
-  // FilenameHash
-  webpackConfig.output.chunkFilename = '[name].[chunkhash].js'
-
-  if (production) {
-    if (webpackConfig.module) {
-    // ClassnameHash
-      webpackConfig.module.rules.map((item) => {
-        if (String(item.test) === '/\\.less$/' || String(item.test) === '/\\.css/') {
-          item.use.filter(iitem => iitem.loader === 'css')[0].options.localIdentName = '[hash:base64:5]'
-        }
-        return item
-      })
-    }
-    webpackConfig.plugins.push(
-      new webpack.LoaderOptionsPlugin({
-        minimize: true,
-        debug: false,
-      })
-    )
-  }
-
-  webpackConfig.plugins = webpackConfig.plugins.concat([
-    new CopyWebpackPlugin([
-      {
-        from: 'src/public',
-        to: production ? '../' : webpackConfig.output.outputPath,
-      },
-    ]),
-    new HtmlWebpackPlugin({
-      template: `${__dirname}/src/entry.ejs`,
-      filename: production ? '../index.html' : 'index.html',
-      minify: production ? {
-        collapseWhitespace: true,
-      } : null,
-      hash: true,
-      headScripts: production ? null : ['/roadhog.dll.js'],
-    }),
-  ])
-
-  // Alias
-  webpackConfig.resolve.alias = {
-    components: `${__dirname}/src/components`,
-    utils: `${__dirname}/src/utils`,
-    config: `${__dirname}/src/utils/config`,
-    enums: `${__dirname}/src/utils/enums`,
-    services: `${__dirname}/src/services`,
-    models: `${__dirname}/src/models`,
-    routes: `${__dirname}/src/routes`,
-    themes: `${__dirname}/src/themes`,
-  }
-
-  return webpackConfig
-}