merge src/xhr/config.js into src/xhr/jquery.js; make built docs withi…

…n docs/

README.md

@@ -2,6 +2,6 @@
 
 > ### Vue2 脚手架已出！戳[这里](https://github.com/kenberkeley/vue2-scaffold)!
 
-[在线 Demo](https://kenberkeley.github.io/vue-demo/dist) | [在线文档](https://kenberkeley.github.io/vue-demo/dist/docs)
+[在线 Demo](https://kenberkeley.github.io/vue-demo/dist) | [在线文档](https://kenberkeley.github.io/vue-demo/docs/_book)
 
 ![截图](./screenshot.png)

build/prod.js

@@ -6,7 +6,6 @@ var fs = require('fs-extra'),
 
 fs.emptyDirSync(PATHS.DIST); // 清空 build 目录
 fs.copySync(PATHS.STATIC, PATHS.DIST.join('static')); // 复制高度静态资源
-fs.moveSync(PATHS.DOCS, PATHS.DIST.join('docs')); // 移动文档
 
 webpack(config, function(err, stats) {
   // show build info to console

build/webpack.base.conf.js

@@ -2,6 +2,7 @@ var webpack = require('webpack'),
   ENV = require('./config/ENV'),
   PATHS = require('./config/PATHS'),
   styleRules = require('./config/style-rules'),
+  HtmlWebpackPlugin = require('html-webpack-plugin'),
   NyanProgressPlugin = require('nyan-progress-webpack-plugin');
 
 module.exports = {
@@ -11,8 +12,8 @@ module.exports = {
   // devtool - source map 配置详见 http://webpack.github.io/docs/configuration.html#devtool
   devtools: false,
   output: {
-    path: PATHS.DIST.join('static'),
-    publicPath: 'static/'
+    path: PATHS.DIST,
+    publicPath: ''
   },
   resolve: {
     extensions: ['', '.js', '.vue'],
@@ -70,6 +71,10 @@ module.exports = {
       minChunks: function (module) {
         return module.context && module.context.indexOf('node_modules') !== -1;
       }
+    }),
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: PATHS.SRC.join('index.html')
     })
   ]
 };

build/webpack.dev.conf.js

@@ -2,7 +2,6 @@ var webpack = require('webpack'),
   PATHS = require('./config/PATHS'),
   PORTS = require('./config/PORTS'),
   config = require('./webpack.base.conf'),
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
   ExtractTextPlugin = require('extract-text-webpack-plugin'),
   BrowserSyncPlugin = require('browser-sync-webpack-plugin');
 
@@ -16,16 +15,10 @@ config.entry.app = [
   config.entry.app
 ];
 
-config.output.publicPath = '';
-
 config.plugins.push(
   new webpack.HotModuleReplacementPlugin(),
   new webpack.NoErrorsPlugin(),
   new ExtractTextPlugin('[name].css'),
-  new HtmlWebpackPlugin({
-    filename: 'index.html',
-    template: PATHS.SRC.join('index.html')
-  }),
   new BrowserSyncPlugin({
     host: 'localhost',
     port: PORTS.BROWSER_SYNC,

build/webpack.prod.conf.js

@@ -1,7 +1,6 @@
 var webpack = require('webpack'),
   PATHS = require('./config/PATHS'),
   config = require('./webpack.base.conf'),
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
   ExtractTextPlugin = require('extract-text-webpack-plugin'),
   OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
@@ -25,12 +24,7 @@ config.plugins.push(
   new ExtractTextPlugin('css/[name].[contenthash:6].css', {
     allChunks : true // 若要按需加载 CSS 则请注释掉该行
   }),
-  new OptimizeCssAssetsPlugin(), // 优化 CSS（去重/压缩）
-  new HtmlWebpackPlugin({
-    filename: '../index.html',
-    template: PATHS.SRC.join('index.html'),
-    chunksSortMode: 'none'
-  })
+  new OptimizeCssAssetsPlugin() // 优化 CSS（去重/压缩）
 );
 
 module.exports = config;