diff --git a/.roadhogrc.js b/.roadhogrc.js index d88e232..c8bfc50 100644 --- a/.roadhogrc.js +++ b/.roadhogrc.js @@ -11,7 +11,7 @@ export default { svgSpriteLoaderDirs : svgSpriteDirs, theme : "./theme.config.js", publicPath : `/${version}/`, - outputPath : `./dist/${version}/`, + outputPath : `./dist/${version}`, // 接口代理示例 // "proxy": { // "/api/v1": { diff --git a/package.json b/package.json index 4dadd1e..c4dbb9c 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "axios": "^0.16.2", "babel-polyfill": "^6.23.0", "classnames": "^2.2.5", + "copy-webpack-plugin": "^4.0.1", "d3-shape": "^1.2.0", "draftjs-to-markdown": "^0.4.0", "dva": "^1.2.0", diff --git a/public/antd/iconfont.eot b/src/public/antd/iconfont.eot similarity index 100% rename from public/antd/iconfont.eot rename to src/public/antd/iconfont.eot diff --git a/public/antd/iconfont.svg b/src/public/antd/iconfont.svg similarity index 100% rename from public/antd/iconfont.svg rename to src/public/antd/iconfont.svg diff --git a/public/antd/iconfont.ttf b/src/public/antd/iconfont.ttf similarity index 100% rename from public/antd/iconfont.ttf rename to src/public/antd/iconfont.ttf diff --git a/public/antd/iconfont.woff b/src/public/antd/iconfont.woff similarity index 100% rename from public/antd/iconfont.woff rename to src/public/antd/iconfont.woff diff --git a/public/iconfont.css b/src/public/iconfont.css similarity index 100% rename from public/iconfont.css rename to src/public/iconfont.css diff --git a/public/iconfont.eot b/src/public/iconfont.eot similarity index 100% rename from public/iconfont.eot rename to src/public/iconfont.eot diff --git a/public/iconfont.js b/src/public/iconfont.js similarity index 100% rename from public/iconfont.js rename to src/public/iconfont.js diff --git a/public/iconfont.svg b/src/public/iconfont.svg similarity index 100% rename from public/iconfont.svg rename to src/public/iconfont.svg diff --git a/public/iconfont.ttf b/src/public/iconfont.ttf similarity index 100% rename from public/iconfont.ttf rename to src/public/iconfont.ttf diff --git a/public/iconfont.woff b/src/public/iconfont.woff similarity index 100% rename from public/iconfont.woff rename to src/public/iconfont.woff diff --git a/public/logo.png b/src/public/logo.png similarity index 100% rename from public/logo.png rename to src/public/logo.png diff --git a/src/routes/UIElement/iconfont/index.js b/src/routes/UIElement/iconfont/index.js index d3af033..93fc43f 100644 --- a/src/routes/UIElement/iconfont/index.js +++ b/src/routes/UIElement/iconfont/index.js @@ -49,9 +49,9 @@ const IcoPage = () => (

Local Require SVG

API

diff --git a/webpack.config.js b/webpack.config.js index 22765c2..91eee0f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin') const HtmlWebpackTemplate = require('html-webpack-template') +const CopyWebpackPlugin = require('copy-webpack-plugin') module.exports = (webpackConfig, env) => { // FilenameHash @@ -27,8 +28,13 @@ module.exports = (webpackConfig, env) => { // loader: 'eslint', // }] - webpackConfig.plugins = webpackConfig.plugins.concat([ + new CopyWebpackPlugin([ + { + from: 'src/public', + to: env === 'production' ? '../' : webpackConfig.output.outputPath, + }, + ]), new HtmlWebpackPlugin({ hash: true, mobile: true, @@ -40,15 +46,12 @@ module.exports = (webpackConfig, env) => { minify: { collapseWhitespace: true, }, - scripts: env === 'production' ? null : [ - 'roadhog.dll.js', - ], + scripts: env === 'production' ? null : ['roadhog.dll.js'], meta: [ { name: 'description', content: 'A admin dashboard application demo built upon Ant Design and Dva.js', - }, - { + }, { name: 'viewport', content: 'width=device-width, initial-scale=1.0', },