Merge branch 'master' into release/1.0

@@ -6,4 +6,4 @@ node_modules/
 *.log
 *.log
 .eslintcache
 .eslintcache
 app/bundle
 app/bundle
-server/public/*.html
+public/

@@ -11,7 +11,7 @@ var webpackConfig = require('./webpack.prod.conf')
 var spinner = ora('building for production...')
 var spinner = ora('building for production...')
 spinner.start()
 spinner.start()
 
 
-rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+rm(path.join(config.build.assetsRoot), err => {
   if (err) throw err
   if (err) throw err
   webpack(webpackConfig, function (err, stats) {
   webpack(webpackConfig, function (err, stats) {
     spinner.stop()
     spinner.stop()

@@ -6,10 +6,10 @@ module.exports = {
         env: {
         env: {
             NODE_ENV: '"production"'
             NODE_ENV: '"production"'
         },
         },
-        index: path.resolve(__dirname, `./bundle/${pkg.version}/index.html`),
-        assetsRoot: path.resolve(__dirname, './bundle'),
+        index: path.resolve(__dirname, `../../public/dist/${pkg.name}/${pkg.version}/index.html`),
+        assetsRoot: path.resolve(__dirname, `../../public/dist/${pkg.name}/`),
         assetsSubDirectory: 'static',
         assetsSubDirectory: 'static',
-        assetsPublicPath: 'https://cdn.yoho.cn/yoho-shop-manage/',
+        assetsPublicPath: '//cdn.yoho.cn/yoho-shop-manage/',
         productionSourceMap: true,
         productionSourceMap: true,
         productionGzip: false,
         productionGzip: false,
         productionGzipExtensions: ['js', 'css'],
         productionGzipExtensions: ['js', 'css'],

@@ -17,7 +17,6 @@ var webpackConfig = merge(baseConfig, {
     },
     },
     devtool: config.build.productionSourceMap ? '#source-map' : false,
     devtool: config.build.productionSourceMap ? '#source-map' : false,
     output: {
     output: {
-        path: config.build.assetsRoot,
         filename: utils.assetsPath('js/[name].[chunkhash:7].js'),
         filename: utils.assetsPath('js/[name].[chunkhash:7].js'),
         chunkFilename: utils.assetsPath('js/[name].[chunkhash:7].js')
         chunkFilename: utils.assetsPath('js/[name].[chunkhash:7].js')
     },
     },

 {
 {
   "name": "yoho-shop-manage",
   "name": "yoho-shop-manage",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "description": "",
   "main": "app.js",
   "main": "app.js",
   "scripts": {
   "scripts": {