diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..710f153
--- /dev/null
+++ b/.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"
+ }
+ }
+ ]
+ ]
+}
diff --git a/.gitignore b/.gitignore
index 4666114..d1c78d1 100644
--- a/.gitignore
+++ b/.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
diff --git a/.roadhogrc.js b/.roadhogrc.js
deleted file mode 100644
index 9b76d6f..0000000
--- a/.roadhogrc.js
+++ /dev/null
@@ -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"]
- }
-}
diff --git a/.roadhogrc.mock.js b/.roadhogrc.mock.js
deleted file mode 100644
index fc068f0..0000000
--- a/.roadhogrc.mock.js
+++ /dev/null
@@ -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
diff --git a/.umirc.mock.js b/.umirc.mock.js
new file mode 100644
index 0000000..08feb11
--- /dev/null
+++ b/.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
diff --git a/.webpackrc.js b/.webpackrc.js
new file mode 100644
index 0000000..4249e0a
--- /dev/null
+++ b/.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" }
+ // }
+ },
+}
diff --git a/src/mock/common.js b/mock/common.js
similarity index 100%
rename from src/mock/common.js
rename to mock/common.js
diff --git a/src/mock/dashboard.js b/mock/dashboard.js
similarity index 100%
rename from src/mock/dashboard.js
rename to mock/dashboard.js
diff --git a/src/mock/menu.js b/mock/menu.js
similarity index 100%
rename from src/mock/menu.js
rename to mock/menu.js
diff --git a/src/mock/post.js b/mock/post.js
similarity index 100%
rename from src/mock/post.js
rename to mock/post.js
diff --git a/src/mock/user.js b/mock/user.js
similarity index 100%
rename from src/mock/user.js
rename to mock/user.js
diff --git a/package.json b/package.json
index 3c274c6..150a917 100644
--- a/package.json
+++ b/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"
}
}
diff --git a/src/public/antd/iconfont.eot b/public/antd/iconfont.eot
similarity index 100%
rename from src/public/antd/iconfont.eot
rename to public/antd/iconfont.eot
diff --git a/src/public/antd/iconfont.svg b/public/antd/iconfont.svg
similarity index 100%
rename from src/public/antd/iconfont.svg
rename to public/antd/iconfont.svg
diff --git a/src/public/antd/iconfont.ttf b/public/antd/iconfont.ttf
similarity index 100%
rename from src/public/antd/iconfont.ttf
rename to public/antd/iconfont.ttf
diff --git a/src/public/antd/iconfont.woff b/public/antd/iconfont.woff
similarity index 100%
rename from src/public/antd/iconfont.woff
rename to public/antd/iconfont.woff
diff --git a/src/public/assets/data-1491837999815-H1_44Qtal.jpg b/public/assets/data-1491837999815-H1_44Qtal.jpg
similarity index 100%
rename from src/public/assets/data-1491837999815-H1_44Qtal.jpg
rename to public/assets/data-1491837999815-H1_44Qtal.jpg
diff --git a/src/public/assets/data-1493804606544-r1PBU7D1W.jpg b/public/assets/data-1493804606544-r1PBU7D1W.jpg
similarity index 100%
rename from src/public/assets/data-1493804606544-r1PBU7D1W.jpg
rename to public/assets/data-1493804606544-r1PBU7D1W.jpg
diff --git a/src/public/assets/data-1493804610896-SJoBIXPkW.jpg b/public/assets/data-1493804610896-SJoBIXPkW.jpg
similarity index 100%
rename from src/public/assets/data-1493804610896-SJoBIXPkW.jpg
rename to public/assets/data-1493804610896-SJoBIXPkW.jpg
diff --git a/src/public/iconfont.css b/public/iconfont.css
similarity index 100%
rename from src/public/iconfont.css
rename to public/iconfont.css
diff --git a/src/public/iconfont.eot b/public/iconfont.eot
similarity index 100%
rename from src/public/iconfont.eot
rename to public/iconfont.eot
diff --git a/src/public/iconfont.js b/public/iconfont.js
similarity index 100%
rename from src/public/iconfont.js
rename to public/iconfont.js
diff --git a/src/public/iconfont.svg b/public/iconfont.svg
similarity index 100%
rename from src/public/iconfont.svg
rename to public/iconfont.svg
diff --git a/src/public/iconfont.ttf b/public/iconfont.ttf
similarity index 100%
rename from src/public/iconfont.ttf
rename to public/iconfont.ttf
diff --git a/src/public/iconfont.woff b/public/iconfont.woff
similarity index 100%
rename from src/public/iconfont.woff
rename to public/iconfont.woff
diff --git a/src/public/logo.svg b/public/logo.svg
similarity index 100%
rename from src/public/logo.svg
rename to public/logo.svg
diff --git a/src/entry.ejs b/src/document.ejs
similarity index 71%
rename from src/entry.ejs
rename to src/document.ejs
index 2e149a9..de5e243 100644
--- a/src/entry.ejs
+++ b/src/document.ejs
@@ -1,25 +1,19 @@
-<% htmlWebpackPlugin.options.headScripts = htmlWebpackPlugin.options.headScripts || [] %>
-
-
-
-
-
-
-
-
- antd admin
-
- <% for (item of htmlWebpackPlugin.options.headScripts) { %>
-
- <% } %>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ antd admin
+
+
+
+
+
+
+
+
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 2abc96f..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -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
-}