sync build/ with vue2-scaffold, also update docs

Author: Ken Berkeley

build/config/ENV.js

@@ -0,0 +1,8 @@
+var env = (process.env.NODE_ENV || 'development').trim();
+console.log('[Current environment]', env);
+
+module.exports = {
+  __ENV__: env,
+  __DEV__: env === 'development',
+  __PROD__: env === 'production'
+};

build/config/style-rules.js

@@ -0,0 +1,33 @@
+var extract = require('extract-text-webpack-plugin').extract,
+  ENV = require('./ENV');
+
+var basicLoaders = ['css'];
+var LOADERS = {
+  css: basicLoaders,
+  less: basicLoaders.concat('less'),
+  sass: basicLoaders.concat('sass?indentedSyntax=true'),
+  scss: basicLoaders.concat('sass')
+};
+
+function ruleGen(ext, isForVueLoader) {
+  var useLoaders = LOADERS[ext];
+  if (isForVueLoader) return extract('vue-style', useLoaders.join('!'));
+
+  // 开发环境下直接内嵌 CSS 以支持热替换
+  if (ENV.__DEV__) return ['style'].concat(useLoaders).join('!');
+  // 生产环境下分离出 CSS 文件
+  return extract('style', useLoaders.join('!'));
+}
+
+function styleRulesGen(isForVueLoader) {
+  var rules = isForVueLoader ? {} : [];
+  Object.keys(LOADERS).forEach(function (ext) {
+    isForVueLoader ?
+      rules[ext] = ruleGen(ext, true) :
+      rules.push({ test: new RegExp('\\.' + ext + '$'), loader: ruleGen(ext) });
+  });
+  return rules;
+}
+
+exports.basic = styleRulesGen();
+exports.vueLoader = styleRulesGen(true);

build/webpack.base.conf.js

@@ -1,21 +1,15 @@
 var webpack = require('webpack'),
+  ENV = require('./config/ENV'),
   PATHS = require('./config/PATHS'),
-  env = (process.env.NODE_ENV || 'development').trim(),
-  ExtractTextPlugin = require('extract-text-webpack-plugin'),
+  styleRules = require('./config/style-rules'),
   NyanProgressPlugin = require('nyan-progress-webpack-plugin');
 
 module.exports = {
   entry: {
-    app: PATHS.SRC.join('app.js'),
-
-    // 框架 / 类库 单独打包
-    vendor: [
-      'es6-shim',
-      'query-string',
-      'vue',
-      'vue-router'
-    ]
+    app: PATHS.SRC.join('app.js')
   },
+  // devtool - source map 配置详见 http://webpack.github.io/docs/configuration.html#devtool
+  devtools: false,
   output: {
     path: PATHS.DIST.join('static'),
     publicPath: 'static/'
@@ -25,14 +19,7 @@ module.exports = {
     alias: {
       // 自定义路径别名
       MOCK: PATHS.MOCK,
-      ASSET: PATHS.SRC.join('assets'),
-      COMPONENT: PATHS.SRC.join('components'),
-      FILTER: PATHS.SRC.join('filters'),
-      MIXIN: PATHS.SRC.join('mixins'),
-      ROUTE: PATHS.SRC.join('routes'),
-      SERVICE: PATHS.SRC.join('services'),
-      UTIL: PATHS.SRC.join('utils'),
-      VIEW: PATHS.SRC.join('views')
+      '@': PATHS.SRC
     }
   },
   resolveLoader: {
@@ -63,26 +50,26 @@ module.exports = {
     }, {
       test: /\.(woff2?|eot|ttf|otf)$/,
       loader: 'url-loader?limit=10240&name=fonts/[name]-[hash:6].[ext]'
-    }]
+    }].concat(styleRules.basic)
   },
   vue: {
-    loaders: {
-      js: 'babel!eslint',
-      css: ExtractTextPlugin.extract('vue-style', 'css'),
-      less: ExtractTextPlugin.extract('vue-style', 'css!less'),
-      sass: ExtractTextPlugin.extract('vue-style', 'css!sass')
-    }
+    loaders: Object.assign({
+      js: 'babel!eslint'
+    }, styleRules.vueLoader)
   },
   eslint: {
     formatter: require('eslint-friendly-formatter')
   },
   plugins: [
     new NyanProgressPlugin(), // 进度条
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(env),
-      // 配置开发全局常量
-      __DEV__: env === 'development',
-      __PROD__: env === 'production'
+    new webpack.DefinePlugin(Object.assign({
+      'process.env.NODE_ENV': JSON.stringify(ENV.__ENV__)
+    }, ENV)),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks: function (module) {
+        return module.context && module.context.indexOf('node_modules') !== -1;
+      }
     })
   ]
 };

build/webpack.dev.conf.js

@@ -4,40 +4,21 @@ var webpack = require('webpack'),
   config = require('./webpack.base.conf'),
   HtmlWebpackPlugin = require('html-webpack-plugin'),
   ExtractTextPlugin = require('extract-text-webpack-plugin'),
-  BrowserSyncPlugin = require('browser-sync-webpack-plugin'),
-  // SOURCE_MAP = true; // 大多数情况下用不到
-  SOURCE_MAP = false;
+  BrowserSyncPlugin = require('browser-sync-webpack-plugin');
 
 config.output.filename = '[name].js';
 config.output.chunkFilename = '[id].js';
 
-config.devtool = SOURCE_MAP ? 'eval-source-map' : false;
-
 // add hot-reload related code to entry chunk
 config.entry.app = [
   'eventsource-polyfill',
   'webpack-hot-middleware/client?reload=true',
   config.entry.app
 ];
 
-config.output.publicPath = '/';
-
-// 开发环境下直接内嵌 CSS 以支持热替换
-config.module.loaders.push({
-  test: /\.css$/,
-  loader: 'style!css'
-}, {
-  test: /\.less$/,
-  loader: 'style!css!less'
-}, {
-  test: /\.scss$/,
-  loader: 'style!css!sass'
-});
+config.output.publicPath = '';
 
 config.plugins.push(
-  new webpack.optimize.CommonsChunkPlugin({
-    name: 'vendor'
-  }),
   new webpack.HotModuleReplacementPlugin(),
   new webpack.NoErrorsPlugin(),
   new ExtractTextPlugin('[name].css'),

build/webpack.prod.conf.js

@@ -3,26 +3,10 @@ var webpack = require('webpack'),
   config = require('./webpack.base.conf'),
   HtmlWebpackPlugin = require('html-webpack-plugin'),
   ExtractTextPlugin = require('extract-text-webpack-plugin'),
-  OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'),
-  // SOURCE_MAP = true; // 大多数情况下用不到
-  SOURCE_MAP = false;
+  OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
-config.output.filename = '[name].[chunkhash:6].js';
-config.output.chunkFilename = '[id].[chunkhash:6].js';
-
-config.devtool = SOURCE_MAP ? 'source-map' : false;
-
-// 生产环境下分离出 CSS 文件
-config.module.loaders.push({
-  test: /\.css$/,
-  loader: ExtractTextPlugin.extract('style', 'css')
-}, {
-  test: /\.less$/,
-  loader: ExtractTextPlugin.extract('style', 'css!less')
-}, {
-  test: /\.scss$/,
-  loader: ExtractTextPlugin.extract('style', 'css!sass')
-});
+config.output.filename = 'js/[name].[chunkhash:6].js';
+config.output.chunkFilename = 'js/[id].[chunkhash:6].js';
 
 config.plugins.push(
   new webpack.optimize.DedupePlugin(),
@@ -31,20 +15,21 @@ config.plugins.push(
     compress: { warnings: false }
   }),
   new webpack.optimize.CommonsChunkPlugin({
-    // 公共代码分离打包
-    names: ['vendor', 'mainifest']
+    name: 'manifest',
+    minChunks: Infinity
   }),
   new webpack.optimize.AggressiveMergingPlugin(),
   new webpack.optimize.MinChunkSizePlugin({
     minChunkSize: 30000
   }),
-  new ExtractTextPlugin('[name].[contenthash:6].css', {
+  new ExtractTextPlugin('css/[name].[contenthash:6].css', {
     allChunks : true // 若要按需加载 CSS 则请注释掉该行
   }),
   new OptimizeCssAssetsPlugin(), // 优化 CSS（去重/压缩）
   new HtmlWebpackPlugin({
     filename: '../index.html',
-    template: PATHS.SRC.join('index.html')
+    template: PATHS.SRC.join('index.html'),
+    chunksSortMode: 'none'
   })
 );
 

dist/docs/search_index.json

@@ -251,7 +251,20 @@
 
         </li>
 
-        <li class="chapter " data-level="1.6" >
+        <li class="chapter " data-level="1.6" data-path="Reference.html">
+            
+                <a href="Reference.html">
+            
+                    
+                    参考
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7" >
 
                 <a target="_blank" href="https://github.com/kenberkeley/vue-demo/issues">
 
@@ -264,7 +277,7 @@
 
         </li>
 
-        <li class="chapter " data-level="1.7" >
+        <li class="chapter " data-level="1.8" >
 
                 <a target="_blank" href="https://github.com/kenberkeley/vue-demo/releases">
 
@@ -345,7 +358,7 @@ <h4 id="&#x6CE8;&#x610F;&#xFF1A;">&#x6CE8;&#x610F;&#xFF1A;</h4>
 <ul>
 <li><a href="https://github.com/GitbookIO/gitbook-cli" target="_blank"><code>gitbook-cli</code></a></li>
 </ul>
-<p>&#x4EC5;&#x4E3A;&#x6587;&#x6863;&#x64B0;&#x5199;&#x6240;&#x9700;<br>&#x60A8;&#x5F80;&#x540E;&#x7684;&#x5F00;&#x53D1;&#x4E2D;&#xFF0C;&#x53EF;&#x4EE5;&#x5220;&#x6389;&#x4E0A;&#x8FF0;&#x56DB;&#x4E2A;&#x4F9D;&#x8D56;&#x4E0E; <code>mock/</code>&#x3001;<code>docs/</code> &#x76EE;&#x5F55;<br>&#x4EE5;&#x53CA; <code>package.json</code> &#x4E2D;&#x7684; <code>scripts: docs</code> &#x4E0E; <code>build/prod.js</code> &#x4E2D;&#x7684; <em>&#x590D;&#x5236;&#x6587;&#x6863;</em></p>
+<p>&#x4EC5;&#x4E3A;&#x6587;&#x6863;&#x64B0;&#x5199;&#x6240;&#x9700;<br>&#x60A8;&#x5F80;&#x540E;&#x7684;&#x5F00;&#x53D1;&#x4E2D;&#xFF0C;&#x53EF;&#x4EE5;&#x5220;&#x6389;&#x4E0A;&#x8FF0;&#x56DB;&#x4E2A;&#x4F9D;&#x8D56;&#x4E0E; <code>mock/</code>&#x3001;<code>docs/</code> &#x76EE;&#x5F55;<br>&#x4EE5;&#x53CA; <code>package.json</code> &#x4E2D;&#x7684; <code>scripts: docs</code> &#x4E0E; <code>build/prod.js</code> &#x4E2D;&#x7684; <em>&#x590D;&#x5236;&#x6587;&#x6863;</em> &#x4EE3;&#x7801;</p>
 </blockquote>
 
 
@@ -390,7 +403,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"技术栈","level":"1.3","depth":1,"next":{"title":"目录结构","level":"1.4","depth":1,"path":"Structure.md","ref":"Structure.md","articles":[]},"previous":{"title":"开始","level":"1.2","depth":1,"path":"Getting-started.md","ref":"Getting-started.md","articles":[]},"dir":"ltr"},"config":{"plugins":[],"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"language":"zh-cn","gitbook":"*"},"file":{"path":"Features.md","mtime":"2017-03-22T02:44:48.363Z","type":"markdown"},"gitbook":{"version":"3.2.2","time":"2017-03-22T02:45:04.734Z"},"basePath":".","book":{"language":"zh-cn"}});
+            gitbook.page.hasChanged({"page":{"title":"技术栈","level":"1.3","depth":1,"next":{"title":"目录结构","level":"1.4","depth":1,"path":"Structure.md","ref":"Structure.md","articles":[]},"previous":{"title":"开始","level":"1.2","depth":1,"path":"Getting-started.md","ref":"Getting-started.md","articles":[]},"dir":"ltr"},"config":{"plugins":[],"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"language":"zh-cn","gitbook":"*"},"file":{"path":"Features.md","mtime":"2017-04-20T05:21:28.820Z","type":"markdown"},"gitbook":{"version":"3.2.2","time":"2017-04-20T05:54:19.512Z"},"basePath":".","book":{"language":"zh-cn"}});
         });
     </script>
 </div>

dist/docs/zh-cn/Features.html

@@ -251,7 +251,20 @@
 
         </li>
 
-        <li class="chapter " data-level="1.6" >
+        <li class="chapter " data-level="1.6" data-path="Reference.html">
+            
+                <a href="Reference.html">
+            
+                    
+                    参考
+            
+                </a>
+            
+
+            
+        </li>
+    
+        <li class="chapter " data-level="1.7" >
 
                 <a target="_blank" href="https://github.com/kenberkeley/vue-demo/issues">
 
@@ -264,7 +277,7 @@
 
         </li>
 
-        <li class="chapter " data-level="1.7" >
+        <li class="chapter " data-level="1.8" >
 
                 <a target="_blank" href="https://github.com/kenberkeley/vue-demo/releases">
 
@@ -341,11 +354,11 @@ <h3 id="&#x2299;-&#x5B89;&#x88C5;">&#x2299; &#x5B89;&#x88C5;</h3>
 <p><strong>&#x5F3A;&#x70C8;&#x5EFA;&#x8BAE;</strong>&#x5347;&#x7EA7;&#x5230; <code>node &#x2265; 6.x / npm &#x2265; 3.x</code> &#x73AF;&#x5883;<br><strong>&#x5F3A;&#x70C8;&#x63A8;&#x8350;</strong>&#x5F80;&#x540E;&#x4F7F;&#x7528; <code>cnpm</code> &#x66FF;&#x4EE3; <code>npm</code> &#x5B89;&#x88C5;&#x4F9D;&#x8D56;  </p>
 <p>&#x8FD0;&#x884C; <code>npm set registry https://registry.npm.taobao.org</code> &#x6362;&#x6E90;<br>&#x5E76;&#x4E0D;&#x80FD;&#x89E3;&#x51B3; <code>node-sass</code> &#x7684;&#x4E8C;&#x8FDB;&#x5236;&#x6E90;&#x7801;&#x5305;&#x4E0B;&#x8F7D;&#x6781;&#x6162;&#x7684;&#x95EE;&#x9898;</p>
 </blockquote>
-<pre><code>$ npm i cnpm -g       // &#x5168;&#x5C40;&#x5B89;&#x88C5; cnpm
+<pre><code>$ npm install -g cnpm --registry=https://registry.npm.taobao.org # &#x5168;&#x5C40;&#x5B89;&#x88C5; cnpm
 
 $ git clone https://github.com/kenberkeley/vue-demo.git
 $ cd vue-demo
-$ cnpm i              // &#x5B89;&#x88C5;&#x672C;&#x9879;&#x76EE;&#x4F9D;&#x8D56;
+$ cnpm i
 </code></pre><h3 id="&#x2299;-&#x547D;&#x4EE4;">&#x2299; &#x547D;&#x4EE4;</h3>
 <h4 id="&#x5F00;&#x53D1;">&#x5F00;&#x53D1;</h4>
 <pre><code>$ npm start
@@ -396,7 +409,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"开始","level":"1.2","depth":1,"next":{"title":"技术栈","level":"1.3","depth":1,"path":"Features.md","ref":"Features.md","articles":[]},"previous":{"title":"总览","level":"1.1","depth":1,"path":"README.md","ref":"README.md","articles":[]},"dir":"ltr"},"config":{"plugins":[],"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"language":"zh-cn","gitbook":"*"},"file":{"path":"Getting-started.md","mtime":"2017-01-09T03:04:49.097Z","type":"markdown"},"gitbook":{"version":"3.2.2","time":"2017-03-22T02:45:04.734Z"},"basePath":".","book":{"language":"zh-cn"}});
+            gitbook.page.hasChanged({"page":{"title":"开始","level":"1.2","depth":1,"next":{"title":"技术栈","level":"1.3","depth":1,"path":"Features.md","ref":"Features.md","articles":[]},"previous":{"title":"总览","level":"1.1","depth":1,"path":"README.md","ref":"README.md","articles":[]},"dir":"ltr"},"config":{"plugins":[],"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"language":"zh-cn","gitbook":"*"},"file":{"path":"Getting-started.md","mtime":"2017-04-20T04:36:57.205Z","type":"markdown"},"gitbook":{"version":"3.2.2","time":"2017-04-20T05:54:19.512Z"},"basePath":".","book":{"language":"zh-cn"}});
         });
     </script>
 </div>